aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linden/indra/llmessage/llpartdata.cpp28
-rw-r--r--linden/indra/newview/app_settings/cloud.xml100
-rw-r--r--linden/indra/newview/gpu_table.txt147
-rw-r--r--linden/indra/newview/llvoavatar.cpp10
4 files changed, 161 insertions, 124 deletions
diff --git a/linden/indra/llmessage/llpartdata.cpp b/linden/indra/llmessage/llpartdata.cpp
index a2811ab..4012d2c 100644
--- a/linden/indra/llmessage/llpartdata.cpp
+++ b/linden/indra/llmessage/llpartdata.cpp
@@ -363,14 +363,14 @@ LLSD LLPartSysData::asLLSD() const
363 sd["LL_PART_EMISSIVE_MASK"] = (LLPartData::LL_PART_EMISSIVE_MASK & mPartData.mFlags) ? 1 : 0; 363 sd["LL_PART_EMISSIVE_MASK"] = (LLPartData::LL_PART_EMISSIVE_MASK & mPartData.mFlags) ? 1 : 0;
364 sd["LL_PART_BEAM_MASK"] = (LLPartData::LL_PART_BEAM_MASK & mPartData.mFlags) ? 1 : 0; 364 sd["LL_PART_BEAM_MASK"] = (LLPartData::LL_PART_BEAM_MASK & mPartData.mFlags) ? 1 : 0;
365 365
366 sd["SourceMaxage"] = mPartData.mMaxAge; 366 sd["ParticleMaxAge"] = mPartData.mMaxAge;
367 sd["Startcolor"] = ll_sd_from_color4(mPartData.mStartColor); 367 sd["StartColor"] = ll_sd_from_color4(mPartData.mStartColor);
368 sd["Endcolor"] = ll_sd_from_color4(mPartData.mEndColor); 368 sd["EndColor"] = ll_sd_from_color4(mPartData.mEndColor);
369 sd["Startscale"] = ll_sd_from_vector2(mPartData.mStartScale); 369 sd["StartScale"] = ll_sd_from_vector2(mPartData.mStartScale);
370 sd["Endscale"] = ll_sd_from_vector2(mPartData.mEndScale); 370 sd["EndScale"] = ll_sd_from_vector2(mPartData.mEndScale);
371 371
372 sd["ParticleMaxAge"] = mMaxAge; 372 sd["SourceMaxAge"] = mMaxAge;
373 sd["ParticleStartAge"] = mStartAge; 373 sd["SourceStartAge"] = mStartAge;
374 374
375 375
376 sd["LL_PART_SRC_PATTERN_DROP"] = ( mPattern & LL_PART_SRC_PATTERN_DROP) ? 1 : 0; 376 sd["LL_PART_SRC_PATTERN_DROP"] = ( mPattern & LL_PART_SRC_PATTERN_DROP) ? 1 : 0;
@@ -406,14 +406,14 @@ bool LLPartSysData::fromLLSD(LLSD& sd)
406 if (sd["LL_PART_EMISSIVE_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_EMISSIVE_MASK; 406 if (sd["LL_PART_EMISSIVE_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_EMISSIVE_MASK;
407 if (sd["LL_PART_BEAM_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_BEAM_MASK; 407 if (sd["LL_PART_BEAM_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_BEAM_MASK;
408 408
409 mPartData.mMaxAge = (F32)sd["SourceMaxage"].asReal(); 409 mPartData.mMaxAge = (F32)sd["ParticleMaxAge"].asReal();
410 mPartData.mStartColor = ll_color4_from_sd(sd["Startcolor"]); 410 mPartData.mStartColor = ll_color4_from_sd(sd["StartColor"]);
411 mPartData.mEndColor = ll_color4_from_sd(sd["Endcolor"]); 411 mPartData.mEndColor = ll_color4_from_sd(sd["EndColor"]);
412 mPartData.mStartScale = ll_vector2_from_sd(sd["Startscale"]); 412 mPartData.mStartScale = ll_vector2_from_sd(sd["StartScale"]);
413 mPartData.mEndScale = ll_vector2_from_sd(sd["Endscale"]); 413 mPartData.mEndScale = ll_vector2_from_sd(sd["EndScale"]);
414 414
415 mMaxAge = (F32)sd["ParticleMaxAge"].asReal(); 415 mMaxAge = (F32)sd["SourceMaxAge"].asReal();
416 mStartAge = (F32)sd["ParticleStartAge"].asReal(); 416 mStartAge = (F32)sd["SourceStartAge"].asReal();
417 417
418 mPattern = 0; 418 mPattern = 0;
419 if (sd["LL_PART_SRC_PATTERN_DROP"]) mPattern |= LL_PART_SRC_PATTERN_DROP; 419 if (sd["LL_PART_SRC_PATTERN_DROP"]) mPattern |= LL_PART_SRC_PATTERN_DROP;
diff --git a/linden/indra/newview/app_settings/cloud.xml b/linden/indra/newview/app_settings/cloud.xml
index ff9492b..e62bcf1 100644
--- a/linden/indra/newview/app_settings/cloud.xml
+++ b/linden/indra/newview/app_settings/cloud.xml
@@ -1,33 +1,87 @@
1<llsd> 1<llsd>
2 <map> 2 <map>
3
4
5<!-- Settings for the whole particle system -->
6
7 <key>SourceMaxAge</key><!-- how long the source can live with 0 forever -->
8 <real>0</real>
9 <key>SourceStartAge</key>
10 <real>0</real>
11
3 <key>AngularVelocity</key> 12 <key>AngularVelocity</key>
4 <array> 13 <array>
5 <real>0</real> 14 <real>0</real>
6 <real>0</real> 15 <real>0</real>
7 <real>0</real> 16 <real>0</real>
8 </array> 17 </array>
18 <key>InnerAngle</key>
19 <real>3.1415927410125732421875</real>
20 <key>OuterAngle</key>
21 <real>0</real>
22
9 <key>BurstPartCount</key> 23 <key>BurstPartCount</key>
10 <integer>1</integer> 24 <integer>1</integer>
11 <key>BurstRadius</key> 25 <key>BurstRadius</key>
12 <real>0.3</real> 26 <real>0.3</real>
13 <key>BurstRate</key> 27 <key>BurstRate</key>
14 <real>0.02</real> 28 <real>0.02</real>
29 <key>BurstSpeedMin</key>
30 <real>0.1</real>
15 <key>BurstSpeedMax</key> 31 <key>BurstSpeedMax</key>
16 <real>1</real> 32 <real>1</real>
17 <key>Endcolor</key> 33
34 <!-- pattern flags set to 1 for true and 0 for false -->
35 <key>LL_PART_SRC_PATTERN_ANGLE</key>
36 <integer>0</integer>
37 <key>LL_PART_SRC_PATTERN_ANGLE_CONE</key>
38 <integer>1</integer>
39 <key>LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY</key>
40 <integer>0</integer>
41 <key>LL_PART_SRC_PATTERN_DROP</key>
42 <integer>0</integer>
43 <key>LL_PART_SRC_PATTERN_EXPLODE</key>
44 <integer>0</integer>
45 <!-- end of pattern flags -->
46
47<!-- Settings for single particles within the system -->
48
49 <key>ParticleMaxAge</key><!-- how long a single particle can live with 0 forever -->
50 <real>4</real>
51
52 <key>PartImageID</key> <!--This setting is ignored for the cloud, used instead for now is the hardcoded -->
53 <string>0000000000000-0000-0000-000000000000</string><!-- skins/default/textures/cloud-particle.j2c -->
54
55 <key>StartColor</key><!-- RGBA -->
56 <array>
57 <real>0.9</real>
58 <real>0.0</real>
59 <real>0.8</real>
60 <real>0.7</real>
61 </array>
62 <key>EndColor</key><!-- RGBA -->
18 <array> 63 <array>
19 <real>0.75</real> 64 <real>0.75</real>
20 <real>0.47</real> 65 <real>0.47</real>
21 <real>0.81</real> 66 <real>0.81</real>
22 <real>0</real> 67 <real>0</real>
23 </array> 68 </array>
24 <key>Endscale</key> 69
70 <key>StartScale</key>
71 <array>
72 <real>0.8</real>
73 <real>0.8</real>
74 </array>
75 <key>EndScale</key>
25 <array> 76 <array>
26 <real>0.02</real> 77 <real>0.02</real>
27 <real>0.02</real> 78 <real>0.02</real>
28 </array> 79 </array>
29 <key>InnerAngle</key> 80
30 <real>3.1415927410125732421875</real> 81 <key>TargetId</key><!-- This setting is ignored for the cloud -->
82 <string>00000000-0000-0000-0000-000000000000</string>
83
84 <!-- masks flags set to 1 for true and 0 for false-->
31 <key>LL_PART_BEAM_MASK</key> 85 <key>LL_PART_BEAM_MASK</key>
32 <integer>0</integer> 86 <integer>0</integer>
33 <key>LL_PART_BOUNCE_MASK</key> 87 <key>LL_PART_BOUNCE_MASK</key>
@@ -42,47 +96,13 @@
42 <integer>1</integer> 96 <integer>1</integer>
43 <key>LL_PART_INTERP_SCALE_MASK</key> 97 <key>LL_PART_INTERP_SCALE_MASK</key>
44 <integer>1</integer> 98 <integer>1</integer>
45 <key>LL_PART_SRC_PATTERN_ANGLE</key>
46 <integer>0</integer>
47 <key>LL_PART_SRC_PATTERN_ANGLE_CONE</key>
48 <integer>1</integer>
49 <key>LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY</key>
50 <integer>0</integer>
51 <key>LL_PART_SRC_PATTERN_DROP</key>
52 <integer>0</integer>
53 <key>LL_PART_SRC_PATTERN_EXPLODE</key>
54 <integer>0</integer>
55 <key>LL_PART_TARGET_LINEAR_MASK</key> 99 <key>LL_PART_TARGET_LINEAR_MASK</key>
56 <integer>0</integer> 100 <integer>0</integer>
57 <key>LL_PART_TARGET_POS_MASK</key> 101 <key>LL_PART_TARGET_POS_MASK</key>
58 <integer>1</integer> 102 <integer>1</integer>
59 <key>LL_PART_WIND_MASK</key> 103 <key>LL_PART_WIND_MASK</key>
60 <integer>0</integer> 104 <integer>0</integer>
61 <key>OuterAngle</key> 105 <!-- end of mask flags -->
62 <real>0</real> 106
63 <key>PartImageID</key>
64 <string>0000000000000-0000-0000-000000000000</string>
65 <key>ParticleMaxAge</key>
66 <real>0</real>
67 <key>ParticleStartAge</key>
68 <real>0</real>
69 <key>SourceMaxage</key>
70 <real>4</real>
71 <key>Startcolor</key>
72 <array>
73 <real>0.9</real>
74 <real>0.0</real>
75 <real>0.8</real>
76 <real>0.7</real>
77 </array>
78 <key>Startscale</key>
79 <array>
80 <real>0.8</real>
81 <real>0.8</real>
82 </array>
83 <key>TargetId</key>
84 <string>00000000-0000-0000-0000-000000000000</string>
85 <key>BurstSpeedMin</key>
86 <real>0.1</real>
87 </map> 107 </map>
88</llsd> 108</llsd>
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index d2092c5..51bc0f2 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -73,51 +73,54 @@ ATI M71 .*ATI.*M71.* 1 1
73ATI M72 .*ATI.*M72.* 1 1 73ATI M72 .*ATI.*M72.* 1 1
74ATI M76 .*ATI.*M76.* 3 1 74ATI M76 .*ATI.*M76.* 3 1
75ATI Mobility Radeon 4100 .*ATI.*Mobility *41.* 0 1 75ATI Mobility Radeon 4100 .*ATI.*Mobility *41.* 0 1
76ATI Mobility Radeon 7xxx .*ATI.*Mobility *Radeon 7.* 0 1 76ATI Mobility Radeon 7xxx .*ATI.*Mobility.*Radeon 7.* 0 1
77ATI Mobility Radeon 8xxx .*ATI.*Mobility *Radeon 8.* 0 1 77ATI Mobility Radeon 8xxx .*ATI.*Mobility.*Radeon 8.* 0 1
78ATI Mobility Radeon 9800 .*ATI.*Mobility *98.* 0 1 78ATI Mobility Radeon 9800 .*ATI.*Mobility.*98.* 1 1
79ATI Mobility Radeon 9700 .*ATI.*Mobility *97.* 0 1 79ATI Mobility Radeon 9700 .*ATI.*Mobility.*97.* 1 1
80ATI Mobility Radeon 9600 .*ATI.*Mobility *96.* 0 1 80ATI Mobility Radeon 9600 .*ATI.*Mobility.*96.* 0 1
81ATI Mobility Radeon HD 2300 .*ATI.*Mobility *HD *23.* 1 1 81ATI Mobility Radeon HD 2300 .*ATI.*Mobility.*HD.*23.* 1 1
82ATI Mobility Radeon HD 2400 .*ATI.*Mobility *HD *24.* 1 1 82ATI Mobility Radeon HD 2400 .*ATI.*Mobility.*HD.*24.* 1 1
83ATI Mobility Radeon HD 2600 .*ATI.*Mobility *HD *26.* 3 1 83ATI Mobility Radeon HD 2600 .*ATI.*Mobility.*HD.*26.* 3 1
84ATI Mobility Radeon HD 3400 .*ATI.*Mobility *HD *34.* 1 1 84ATI Mobility Radeon HD 3400 .*ATI.*Mobility.*HD.*34.* 1 1
85ATI Mobility Radeon HD 3600 .*ATI.*Mobility *HD *36.* 3 1 85ATI Mobility Radeon HD 3600 .*ATI.*Mobility.*HD.*36.* 3 1
86ATI Mobility Radeon HD 3800 .*ATI.*Mobility *HD *38.* 3 1 86ATI Mobility Radeon HD 3800 .*ATI.*Mobility.*HD.*38.* 3 1
87ATI Mobility Radeon HD 4200 .*ATI.*Mobility.*HD.*42.* 3 1
87ATI Mobility Radeon HD 5400 .*ATI.*Mobility *HD *54.* 1 1 88ATI Mobility Radeon HD 5400 .*ATI.*Mobility *HD *54.* 1 1
88ATI Mobility Radeon HD 5500 .*ATI.*Mobility *HD *55.* 1 1 89ATI Mobility Radeon HD 5500 .*ATI.*Mobility *HD *55.* 1 1
89ATI Mobility Radeon X1xxx .*ATI.*Mobility *X1.* 0 1 90ATI Mobility Radeon X1xxx .*ATI.*Mobility.*X1.* 0 1
90ATI Mobility Radeon X2xxx .*ATI.*Mobility *X2.* 0 1 91ATI Mobility Radeon X2xxx .*ATI.*Mobility.*X2.* 0 1
91ATI Mobility Radeon X3xx .*ATI.*Mobility *X3.* 1 1 92ATI Mobility Radeon X3xx .*ATI.*Mobility.*X3.* 1 1
92ATI Mobility Radeon X6xx .*ATI.*Mobility *X6.* 1 1 93ATI Mobility Radeon X6xx .*ATI.*Mobility.*X6.* 1 1
93ATI Mobility Radeon X7xx .*ATI.*Mobility *X7.* 1 1 94ATI Mobility Radeon X7xx .*ATI.*Mobility.*X7.* 1 1
94ATI Mobility Radeon Xxxx .*ATI.*Mobility *X.* 0 1 95ATI Mobility Radeon Xxxx .*ATI.*Mobility.*X.* 0 1
95ATI Mobility Radeon .*ATI.*Mobility.* 0 1 96ATI Mobility Radeon .*ATI.*Mobility.* 0 1
96ATI Radeon HD 2300 .*ATI.*Radeon HD *23.* 0 1 97ATI Radeon HD 2300 .*ATI.*Radeon HD 23.* 0 1
97ATI Radeon HD 2400 .*ATI.*Radeon HD *24.* 1 1 98ATI Radeon HD 2400 .*ATI.*Radeon HD.*24.* 1 1
98ATI Radeon HD 2600 .*ATI.*Radeon HD *26.* 2 1 99ATI Radeon HD 2600 .*ATI.*Radeon HD 26.* 2 1
99ATI Radeon HD 2900 .*ATI.*Radeon HD *29.* 3 1 100ATI Radeon HD 2900 .*ATI.*Radeon HD 29.* 3 1
100ATI Radeon HD 3200 .*ATI.*Radeon *HD *32.* 0 1 101ATI Radeon HD 3200 .*ATI.*Radeon.*HD.*32.* 1 1
101ATI Radeon HD 3300 .*ATI.*Radeon HD *33.* 1 1 102ATI Radeon HD 3300 .*ATI.*Radeon HD.*33.* 1 1
102ATI Radeon HD 3400 .*ATI.*Radeon HD *34.* 1 1 103ATI Radeon HD 3400 .*ATI.*Radeon HD.*34.* 1 1
103ATI Radeon HD 3600 .*ATI.*Radeon HD *36.* 3 1 104ATI Radeon HD 3600 .*ATI.*Radeon HD.*36.* 3 1
104ATI Radeon HD 3800 .*ATI.*Radeon HD *38.* 3 1 105ATI Radeon HD 3800 .*ATI.*Radeon HD.*38.* 3 1
105ATI Radeon HD 4200 .*ATI.*Radeon HD *42.* 1 1 106ATI Radeon HD 4200 .*ATI.*Radeon HD *42.* 1 1
106ATI Radeon HD 4300 .*ATI.*Radeon HD *43.* 1 1 107ATI Radeon HD 4300 .*ATI.*Radeon HD 43.* 1 1
107ATI Radeon HD 4500 .*ATI.*Radeon HD *45.* 2 1 108ATI Radeon HD 4500 .*ATI.*Radeon HD 45.* 2 1
108ATI Radeon HD 4600 .*ATI.*Radeon HD *46.* 3 1 109ATI Radeon HD 4600 .*ATI.*Radeon HD 46.* 3 1
109ATI Radeon HD 4700 .*ATI.*Radeon HD *47.* 3 1 110ATI Radeon HD 4700 .*ATI.*Radeon HD *47.* 3 1
110ATI Radeon HD 4800 .*ATI.*Radeon.*HD *48.* 3 1 111ATI Radeon HD 4800 .*ATI.*Radeon.*HD.*48.* 3 1
111ATI Radeon HD 5400 .*ATI.*Radeon.*HD *54.* 3 1 112ATI Radeon HD 5400 .*ATI.*Radeon.*HD.*54.* 2 1
112ATI Radeon HD 5500 .*ATI.*Radeon.*HD *55.* 3 1 113ATI Radeon HD 5500 .*ATI.*Radeon.*HD.*55.* 2 1
113ATI Radeon HD 5600 .*ATI.*Radeon.*HD *56.* 3 1 114ATI Radeon HD 5600 .*ATI.*Radeon.*HD.*56.* 3 1
114ATI Radeon HD 5700 .*ATI.*Radeon.*HD *57.* 3 1 115ATI Radeon HD 5700 .*ATI.*Radeon.*HD.*57.* 3 1
115ATI Radeon HD 5800 .*ATI.*Radeon.*HD *58.* 3 1 116ATI Radeon HD 5800 .*ATI.*Radeon.*HD.*58.* 3 1
116ATI Radeon HD 5900 .*ATI.*Radeon.*HD *59.* 3 1 117ATI Radeon HD 5900 .*ATI.*Radeon.*HD.*59.* 3 1
118ATI Radeon HD 6800 .*ATI.*Radeon.*HD.*68.* 3 1
119ATI Radeon HD 6900 .*ATI.*Radeon.*HD.*69.* 3 1
117ATI Radeon OpenGL .*ATI.*Radeon OpenGL.* 0 0 120ATI Radeon OpenGL .*ATI.*Radeon OpenGL.* 0 0
118ATI Radeon 2100 .*ATI.*Radeon 21.* 0 1 121ATI Radeon 2100 .*ATI.*Radeon 21.* 0 1
119ATI Radeon 3000 .*ATI.*Radeon 30.* 0 1 122ATI Radeon 3000 .*ATI.*Radeon 30.* 0 1
120ATI Radeon 3100 .*ATI.*Radeon 31.* 0 1 123ATI Radeon 3100 .*ATI.*Radeon 31.* 1 1
121ATI Radeon 7xxx .*ATI.*Radeon 7.* 0 1 124ATI Radeon 7xxx .*ATI.*Radeon 7.* 0 1
122ATI Radeon 8xxx .*ATI.*Radeon 8.* 0 1 125ATI Radeon 8xxx .*ATI.*Radeon 8.* 0 1
123ATI Radeon 9000 .*ATI.*Radeon 90.* 0 1 126ATI Radeon 9000 .*ATI.*Radeon 90.* 0 1
@@ -136,12 +139,12 @@ ATI Radeon VE .*ATI.*Radeon.*VE.* 0 0
136ATI Radeon X1000 .*ATI.*Radeon *X10.* 0 1 139ATI Radeon X1000 .*ATI.*Radeon *X10.* 0 1
137ATI Radeon X1200 .*ATI.*Radeon *X12.* 0 1 140ATI Radeon X1200 .*ATI.*Radeon *X12.* 0 1
138ATI Radeon X1300 .*ATI.*Radeon *X13.* 1 1 141ATI Radeon X1300 .*ATI.*Radeon *X13.* 1 1
139ATI Radeon X1400 .*ATI.*Radeon *X14.* 1 1 142ATI Radeon X1400 .*ATI.*Radeon X14.* 1 1
140ATI Radeon X1500 .*ATI.*Radeon *X15.* 1 1 143ATI Radeon X1500 .*ATI.*Radeon X15.* 1 1
141ATI Radeon X1600 .*ATI.*Radeon *X16.* 1 1 144ATI Radeon X1600 .*ATI.*Radeon *X16.* 1 1
142ATI Radeon X1700 .*ATI.*Radeon *X17.* 1 1 145ATI Radeon X1700 .*ATI.*Radeon X17.* 1 1
143ATI Radeon X1800 .*ATI.*Radeon *X18.* 3 1 146ATI Radeon X1800 .*ATI.*Radeon X18.* 3 1
144ATI Radeon X1900 .*ATI.*Radeon *X19.* 3 1 147ATI Radeon X1900 .*ATI.*Radeon X19.* 3 1
145ATI Radeon X300 .*ATI.*Radeon *X3.* 0 1 148ATI Radeon X300 .*ATI.*Radeon *X3.* 0 1
146ATI Radeon X400 .*ATI.*Radeon X4.* 0 1 149ATI Radeon X400 .*ATI.*Radeon X4.* 0 1
147ATI Radeon X500 .*ATI.*Radeon X5.* 0 1 150ATI Radeon X500 .*ATI.*Radeon X5.* 0 1
@@ -184,10 +187,7 @@ Intel Pineview .*Intel.*Pineview.* 0 1
184Intel Springdale .*Intel.*Springdale.* 0 0 187Intel Springdale .*Intel.*Springdale.* 0 0
185Matrox .*Matrox.* 0 0 188Matrox .*Matrox.* 0 0
186Mesa .*Mesa.* 0 0 189Mesa .*Mesa.* 0 0
187NVIDIA 210 .*NVIDIA.*GeForce.*210.* 3 1 190NVIDIA 210 .*NVIDIA.*GeForce.*21.* 2 1
188NVIDIA 310 .*NVIDIA.*GeForce.*310.* 3 1
189NVIDIA 315 .*NVIDIA.*GeForce.*315.* 3 1
190NVIDIA G100 .*NVIDIA.*GeForce G *100.* 2 1
191NVIDIA 310M .*NVIDIA.*GeForce 310M.* 0 1 191NVIDIA 310M .*NVIDIA.*GeForce 310M.* 0 1
192NVIDIA 310 .*NVIDIA.*GeForce 310.* 0 1 192NVIDIA 310 .*NVIDIA.*GeForce 310.* 0 1
193NVIDIA 320M .*NVIDIA.*GeForce 320M.* 0 1 193NVIDIA 320M .*NVIDIA.*GeForce 320M.* 0 1
@@ -196,27 +196,33 @@ NVIDIA G102M .*NVIDIA.*GeForce G *102M.* 0 1
196NVIDIA G103M .*NVIDIA.*GeForce G *103M.* 0 1 196NVIDIA G103M .*NVIDIA.*GeForce G *103M.* 0 1
197NVIDIA G105M .*NVIDIA.*GeForce G *105M.* 0 1 197NVIDIA G105M .*NVIDIA.*GeForce G *105M.* 0 1
198NVIDIA G210M .*NVIDIA.*GeForce G210M.* 0 1 198NVIDIA G210M .*NVIDIA.*GeForce G210M.* 0 1
199NVIDIA GT 120 .*NVIDIA.*GeForce GT 12.* 0 1 199NVIDIA GT 120 .*NVIDIA.*GeForce.*GT.*12.* 2 1
200NVIDIA GT 130 .*NVIDIA.*GeForce GT 13.* 1 1 200NVIDIA GT 130 .*NVIDIA.*GeForce.*GT.*13.* 2 1
201NVIDIA GT 220 .*NVIDIA.*GeForce GT 22.* 0 1 201NVIDIA GT 220 .*NVIDIA.*GeForce.*GT.*22.* 2 1
202NVIDIA GT 230 .*NVIDIA.*GeForce GT 23.* 1 1 202NVIDIA GT 230 .*NVIDIA.*GeForce.*GT.*23.* 2 1
203NVIDIA GT 240 .*NVIDIA.*GeForce GT 24.* 1 1 203NVIDIA GT 240 .*NVIDIA.*GeForce.*GT.*24.* 2 1
204NVIDIA GT 320 .*NVIDIA.*GeForce GT 32.* 0 1 204NVIDIA GT 320 .*NVIDIA.*GeForce GT 32.* 0 1
205NVIDIA GT 330 .*NVIDIA.*GeForce GT 33.* 3 1
206NVIDIA GT 340 .*NVIDIA.*GeForce GT 34.* 3 1
207NVIDIA GT 330M .*NVIDIA.*GeForce GT 330M.* 1 1 205NVIDIA GT 330M .*NVIDIA.*GeForce GT 330M.* 1 1
208NVIDIA GTS 150 .*NVIDIA.*GeForce GTS 15.* 3 1 206NVIDIA GT 430 .*NVIDIA.*GeForce.*GT.*43.* 3 1
209NVIDIA GTS 205 .*NVIDIA.*GeForce GTS 10.* 3 1 207NVIDIA GT 520 .*NVIDIA.*GeForce.*GT.*52.* 2 1
210NVIDIA GTS 240 .*NVIDIA.*GeForce GTS 24.* 1 1 208NVIDIA GT 540 .*NVIDIA.*GeForce.*GT.*54.* 3 1
211NVIDIA GTS 250 .*NVIDIA.*GeForce GTS 25.* 3 1 209NVIDIA GTS 240 .*NVIDIA.*GeForce *GTS.*24.* 3 1
210NVIDIA GTS 250 .*NVIDIA.*GeForce.*GTS.*25.* 3 1
211NVIDIA GTS 450 .*NVIDIA.*GeForce.*GTS.*45.* 3 1
212NVIDIA GTX 260 .*NVIDIA.*GeForce.*GTX.*26.* 3 1
213NVIDIA GTX 270 .*NVIDIA.*GeForce.*GTX.*27.* 3 1
214NVIDIA GTX 280 .*NVIDIA.*GeForce.*GTX.*28.* 3 1
215NVIDIA GTX 285 .*NVIDIA.*GeForce.*GTX.*28.* 3 1
216NVIDIA GTX 290 .*NVIDIA.*GeForce.*GTX.*29.* 3 1
217NVIDIA GTX 295 .*NVIDIA.*GeForce.*GTX.*29.* 3 1
212NVIDIA GTS 360M .*NVIDIA.*GeForce GTS 360M.* 3 1 218NVIDIA GTS 360M .*NVIDIA.*GeForce GTS 360M.* 3 1
213NVIDIA GTX 260 .*NVIDIA.*GeForce GTX 26.* 3 1 219NVIDIA GTX 460 .*NVIDIA.*GeForce.*GTX.*46.* 3 1
214NVIDIA GTX 270 .*NVIDIA.*GeForce GTX 27.* 3 1 220NVIDIA GTX 465 .*NVIDIA.*GeForce.*GTX.*46.* 3 1
215NVIDIA GTX 280 .*NVIDIA.*GeForce GTX 28.* 3 1 221NVIDIA GTX 470 .*NVIDIA.*GeForce.*GTX.*47.* 3 1
216NVIDIA GTX 290 .*NVIDIA.*GeForce GTX 29.* 3 1 222NVIDIA GTX 480 .*NVIDIA.*GeForce.*GTX.*48.* 3 1
217NVIDIA GTX 465 .*NVIDIA.*GeForce GTX 46.* 3 1 223NVIDIA GTX 560 .*NVIDIA.*GeForce.*GTX.*56.* 3 1
218NVIDIA GTX 470 .*NVIDIA.*GeForce GTX 47.* 3 1 224NVIDIA GTX 570 .*NVIDIA.*GeForce.*GTX.*57.* 3 1
219NVIDIA GTX 480 .*NVIDIA.*GeForce GTX 48.* 3 1 225NVIDIA GTX 580 .*NVIDIA.*GeForce.*GTX.*58.* 3 1
220NVIDIA C51 .*NVIDIA.*C51.* 0 1 226NVIDIA C51 .*NVIDIA.*C51.* 0 1
221NVIDIA G72 .*NVIDIA.*G72.* 1 1 227NVIDIA G72 .*NVIDIA.*G72.* 1 1
222NVIDIA G73 .*NVIDIA.*G73.* 1 1 228NVIDIA G73 .*NVIDIA.*G73.* 1 1
@@ -240,29 +246,31 @@ NVIDIA GeForce 7100 .*NVIDIA.*GeForce 71.* 0 1
240NVIDIA GeForce 7200 .*NVIDIA.*GeForce 72.* 1 1 246NVIDIA GeForce 7200 .*NVIDIA.*GeForce 72.* 1 1
241NVIDIA GeForce 7300 .*NVIDIA.*GeForce 73.* 1 1 247NVIDIA GeForce 7300 .*NVIDIA.*GeForce 73.* 1 1
242NVIDIA GeForce 7500 .*NVIDIA.*GeForce 75.* 1 1 248NVIDIA GeForce 7500 .*NVIDIA.*GeForce 75.* 1 1
243NVIDIA GeForce 7600 .*NVIDIA.*GeForce 76.* 1 1 249NVIDIA GeForce 7600 .*NVIDIA.*GeForce 76.* 2 1
244NVIDIA GeForce 7800 .*NVIDIA.*GeForce 78.* 1 1 250NVIDIA GeForce 7800 .*NVIDIA.*GeForce.*78.* 2 1
245NVIDIA GeForce 7900 .*NVIDIA.*GeForce 79.* 1 1 251NVIDIA GeForce 7900 .*NVIDIA.*GeForce.*79.* 2 1
246NVIDIA GeForce 8100 .*NVIDIA.*GeForce 81.* 1 1 252NVIDIA GeForce 8100 .*NVIDIA.*GeForce 81.* 1 1
247NVIDIA GeForce 8200 .*NVIDIA.*GeForce 82.* 1 1 253NVIDIA GeForce 8200 .*NVIDIA.*GeForce 82.* 1 1
248NVIDIA GeForce 8300 .*NVIDIA.*GeForce 83.* 1 1 254NVIDIA GeForce 8300 .*NVIDIA.*GeForce 83.* 1 1
249NVIDIA GeForce 8400 .*NVIDIA.*GeForce 84.* 1 1 255NVIDIA GeForce 8400 .*NVIDIA.*GeForce 84.* 1 1
250NVIDIA GeForce 8500 .*GeForce 85.* 1 1 256NVIDIA GeForce 8500 .*GeForce 85.* 3 1
251NVIDIA GeForce 8600M .*NVIDIA.*GeForce.*8600M.* 1 1 257NVIDIA GeForce 8600M .*NVIDIA.*GeForce.*8600M.* 1 1
252NVIDIA GeForce 8600 .*NVIDIA.*GeForce 86.* 3 1 258NVIDIA GeForce 8600 .*NVIDIA.*GeForce 86.* 3 1
253NVIDIA GeForce 8700 .*NVIDIA.*GeForce 87.* 3 1 259NVIDIA GeForce 8700 .*NVIDIA.*GeForce 87.* 3 1
254NVIDIA GeForce 8800 .*NVIDIA.*GeForce 88.* 3 1 260NVIDIA GeForce 8800 .*NVIDIA.*GeForce 88.* 3 1
255NVIDIA GeForce 9100 .*NVIDIA.*GeForce 9100.* 0 1 261NVIDIA GeForce 9100 .*NVIDIA.*GeForce 9100.* 0 1
256NVIDIA GeForce 9200 .*NVIDIA.*GeForce 9200.* 0 1 262NVIDIA GeForce 9200 .*NVIDIA.*GeForce 9200.* 0 1
263NVIDIA GeForce 9200M .*NVIDIA.*GeForce 9200M.* 1 1
257NVIDIA GeForce 9300M .*NVIDIA.*GeForce 9300M.* 1 1 264NVIDIA GeForce 9300M .*NVIDIA.*GeForce 9300M.* 1 1
258NVIDIA GeForce 9400M .*NVIDIA.*GeForce 9400M.* 1 1 265NVIDIA GeForce 9400M .*NVIDIA.*GeForce 9400M.* 1 1
259NVIDIA GeForce 9500M .*NVIDIA.*GeForce 9500M.* 2 1 266NVIDIA GeForce 9500M .*NVIDIA.*GeForce 9500M.* 2 1
260NVIDIA GeForce 9600M .*NVIDIA.*GeForce 9600M.* 2 1 267NVIDIA GeForce 9600M .*NVIDIA.*GeForce 9600M.* 2 1
261NVIDIA GeForce 9700M .*NVIDIA.*GeForce 9700M.* 2 1 268NVIDIA GeForce 9700M .*NVIDIA.*GeForce 9700M.* 2 1
269NVIDIA GeForce 9200 .*NVIDIA.*GeForce 92.* 1 1
262NVIDIA GeForce 9300 .*NVIDIA.*GeForce 93.* 1 1 270NVIDIA GeForce 9300 .*NVIDIA.*GeForce 93.* 1 1
263NVIDIA GeForce 9400 .*GeForce 94.* 1 1 271NVIDIA GeForce 9400 .*GeForce 94.* 1 1
264NVIDIA GeForce 9500 .*NVIDIA.*GeForce 95.* 2 1 272NVIDIA GeForce 9500 .*NVIDIA.*GeForce 95.* 2 1
265NVIDIA GeForce 9600 .*NVIDIA.*GeForce.*96.* 3 1 273NVIDIA GeForce 9600 .*NVIDIA.*GeForce.*96.* 2 1
266NVIDIA GeForce 9800 .*NVIDIA.*GeForce.*98.* 3 1 274NVIDIA GeForce 9800 .*NVIDIA.*GeForce.*98.* 3 1
267NVIDIA GeForce FX 5100 .*NVIDIA.*GeForce FX 51.* 0 1 275NVIDIA GeForce FX 5100 .*NVIDIA.*GeForce FX 51.* 0 1
268NVIDIA GeForce FX 5200 .*NVIDIA.*GeForce FX 52.* 0 1 276NVIDIA GeForce FX 5200 .*NVIDIA.*GeForce FX 52.* 0 1
@@ -299,6 +307,7 @@ NVIDIA G92 .*G92.* 3 1
299NVIDIA G94 .*G94.* 3 1 307NVIDIA G94 .*G94.* 3 1
300NVIDIA GeForce Go 6 .*GeForce Go 6.* 1 1 308NVIDIA GeForce Go 6 .*GeForce Go 6.* 1 1
301NVIDIA ION .*NVIDIA ION.* 1 1 309NVIDIA ION .*NVIDIA ION.* 1 1
310NVIDIA ION 2 .*NVIDIA ION 2.* 1 1
302NVIDIA NB9M .*GeForce NB9M.* 1 1 311NVIDIA NB9M .*GeForce NB9M.* 1 1
303NVIDIA NB9P .*GeForce NB9P.* 1 1 312NVIDIA NB9P .*GeForce NB9P.* 1 1
304NVIDIA GeForce PCX .*GeForce PCX.* 0 1 313NVIDIA GeForce PCX .*GeForce PCX.* 0 1
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 204357f..c0ddac5 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -1496,8 +1496,16 @@ LLPartSysData LLVOAvatar::sCloud;
1496void LLVOAvatar::initCloud() 1496void LLVOAvatar::initCloud()
1497{ 1497{
1498 // fancy particle cloud designed by Brent 1498 // fancy particle cloud designed by Brent
1499 std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "cloud.xml");
1500 if(!gDirUtilp->fileExists(filename))
1501 {
1502 filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "cloud.xml");
1503 }
1504 if(!gDirUtilp->fileExists(filename))
1505 {
1506 filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
1507 }
1499 1508
1500 std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
1501 LLSD cloud; 1509 LLSD cloud;
1502 llifstream in_file(filename); 1510 llifstream in_file(filename);
1503 LLSDSerialize::fromXMLDocument(cloud, in_file); 1511 LLSDSerialize::fromXMLDocument(cloud, in_file);
generated by cgit v1.1 at 2025-01-25 18:25:10 +0000