aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelatto%20.xml1
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Arrakissed%20variation.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist%202.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Bayouette.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Chivandria%20clair.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Coral%20reef.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Crosshatched%20plans.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Eyeballin%27.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Fantastuck.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Featuresque.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Freak%2DA%2Ddermia.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Glaznost.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Grantamount.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Hpmod.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Ice%2Dlike.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Impure.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Linear%20puddles.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Listeryne.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Liz%20Taylor.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Maldives.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Meridian%20verde.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Negative%20ultraspace.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Placida%20brite.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Pretty%20placid.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Raw%20sewage.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Showing%20age.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Soldier%27s%20legacy.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Subtleties.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Trandshan.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Watermelon%20juice.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Waterslides.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20What%27s%20on%20TV.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Wickedly.xml43
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20You%27re%20in%20luck.xml41
-rw-r--r--linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Yung%20buk.xml43
-rw-r--r--linden/indra/newview/llfloatersnapshot.cpp17
-rw-r--r--linden/indra/newview/llnetmap.cpp10
-rw-r--r--linden/indra/newview/llpanelavatar.cpp61
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml2
42 files changed, 1555 insertions, 44 deletions
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelatto%20.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelatto%20.xml
deleted file mode 100644
index 7d1fd35..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelatto%20.xml
+++ /dev/null
@@ -1 +0,0 @@
1<llsd><map><key>ambient</key><array><real>0</real><real>0.15999999642372131</real><real>0</real><real>0.15999999642372131</real></array><key>blue_density</key><array><real>0.019999999552965164</real><real>0.22999770939350128</real><real>0.45999997854232788</real><real>0.55000001192092896</real></array><key>blue_horizon</key><array><real>0</real><real>0.6319204568862915</real><real>0.74000000953674316</real><real>0.84999996423721313</real></array><key>cloud_color</key><array><real>1</real><real>0</real><real>0</real><real>1</real></array><key>cloud_pos_density1</key><array><real>0.53999996185302734</real><real>0.50999999046325684</real><real>0.23999999463558197</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.5</real><real>0.5</real><real>0.059999998658895493</real><real>1</real></array><key>cloud_scale</key><array><real>0.2800000011920929</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>20</real><real>20</real></array><key>cloud_shadow</key><array><real>0.32999998331069946</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00016999999934341758</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>8.1000003814697266</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>3.7699110507965088</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.5399999618530273</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>0.39999961853027344</real><real>0.0010000000474974513</real><real>-0.49999997019767761</real><real>1</real></array><key>haze_density</key><array><real>3.2599999904632568</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.4699999988079071</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>0.58749508857727051</real><real>-0.031410761177539825</real><real>-0.80861788988113403</real><real>0</real></array><key>max_y</key><array><real>1267.5999755859375</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0</real><key>sun_angle</key><real>-0.031415928155183792</real><key>sunlight_color</key><array><real>0.75</real><real>0.71999996900558472</real><real>0.37800011038780212</real><real>0.80999994277954102</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Arrakissed%20variation.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Arrakissed%20variation.xml
new file mode 100644
index 0000000..138b9c3
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Arrakissed%20variation.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0</real>
5 <key>fresnelOffset</key>
6 <real>0.44999998807907104</real>
7 <key>fresnelScale</key>
8 <real>0.29999998211860657</real>
9 <key>normScale</key>
10 <array>
11 <real>4.2000002861022949</real>
12 <real>3.2000000476837158</real>
13 <real>5</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>d0512dd3-2d6f-8970-1d16-3829d8f8299d</uuid>
17 <key>scaleAbove</key>
18 <real>0.39999997615814209</real>
19 <key>scaleBelow</key>
20 <real>0.2800000011920929</real>
21 <key>underWaterFogMod</key>
22 <real>0.98999994993209839</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0</real>
26 <real>0</real>
27 <real>0.5</real>
28 <real>1</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>29.857057571411133</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>1.2199999094009399</real>
35 <real>-0.22000008821487427</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>-2.7200000286102295</real>
40 <real>-0.67000001668930054</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist%202.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist%202.xml
new file mode 100644
index 0000000..c0c422b
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist%202.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.010000000707805157</real>
5 <key>fresnelOffset</key>
6 <real>0.87000000476837158</real>
7 <key>fresnelScale</key>
8 <real>0.70999997854232788</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>0.30000001192092896</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>d727239c-056f-cce0-0681-e190ba7d9e50</uuid>
17 <key>scaleAbove</key>
18 <real>0.099999994039535522</real>
19 <key>scaleBelow</key>
20 <real>0.20000000298023224</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0</real>
24 <real>0.25</real>
25 <real>0.5</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>0.57434922456741333</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.10000008344650269</real>
33 <real>-0.11000008881092072</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-0.12000008672475815</real>
38 <real>0.23999990522861481</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist.xml
new file mode 100644
index 0000000..49aa4e1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.0020000000949949026</real>
5 <key>fresnelOffset</key>
6 <real>0.87999999523162842</real>
7 <key>fresnelScale</key>
8 <real>1</real>
9 <key>normScale</key>
10 <array>
11 <real>0.30000001192092896</real>
12 <real>0.60000002384185791</real>
13 <real>1.2000000476837158</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.099999994039535522</real>
19 <key>scaleBelow</key>
20 <real>0.20000000298023224</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0</real>
24 <real>0.25</real>
25 <real>0.5</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>0.088388346135616302</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.10000008344650269</real>
33 <real>-0.11000008881092072</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-0.12000008672475815</real>
38 <real>0.23999990522861481</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Bayouette.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Bayouette.xml
new file mode 100644
index 0000000..2ab6743
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Bayouette.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.024000000208616257</real>
5 <key>fresnelOffset</key>
6 <real>0.42999997735023499</real>
7 <key>fresnelScale</key>
8 <real>0.17000000178813934</real>
9 <key>normScale</key>
10 <array>
11 <real>1.8999999761581421</real>
12 <real>1.1000000238418579</real>
13 <real>0.69999998807907104</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.039999999105930328</real>
19 <key>scaleBelow</key>
20 <real>0.15999999642372131</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.79999995231628418</real>
24 <real>0.40000015497207642</real>
25 <real>0</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>18.379177093505859</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.58000010251998901</real>
33 <real>-0.21000008285045624</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>0.46999990940093994</real>
38 <real>-0.16000008583068848</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Chivandria%20clair.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Chivandria%20clair.xml
new file mode 100644
index 0000000..6f4ac78
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Chivandria%20clair.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0</real>
5 <key>fresnelOffset</key>
6 <real>0.65999996662139893</real>
7 <key>fresnelScale</key>
8 <real>0.059999998658895493</real>
9 <key>normScale</key>
10 <array>
11 <real>1</real>
12 <real>1</real>
13 <real>1</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>1a29d128-f6cb-874f-b39a-bbb68605f950</uuid>
17 <key>scaleAbove</key>
18 <real>1</real>
19 <key>scaleBelow</key>
20 <real>0.099999994039535522</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.5</real>
24 <real>0</real>
25 <real>1</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>0.5</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.260000079870224</real>
33 <real>-0.260000079870224</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-0.260000079870224</real>
38 <real>-0.260000079870224</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml
new file mode 100644
index 0000000..d6476dd
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.017000000923871994</real>
5 <key>fresnelOffset</key>
6 <real>0.69999998807907104</real>
7 <key>fresnelScale</key>
8 <real>0.59999996423721313</real>
9 <key>normScale</key>
10 <array>
11 <real>2</real>
12 <real>1</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.049999997019767761</real>
19 <key>scaleBelow</key>
20 <real>0.099999994039535522</real>
21 <key>underWaterFogMod</key>
22 <real>0</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0.059999998658895493</real>
26 <real>0.37999999523162842</real>
27 <real>0.52999997138977051</real>
28 <real>0.52999997138977051</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>1</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-1.3300000429153442</real>
35 <real>-1.8799999952316284</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>-1.8100000619888306</real>
40 <real>-1.3300000429153442</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Coral%20reef.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Coral%20reef.xml
new file mode 100644
index 0000000..0da3e52
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Coral%20reef.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.0080000003799796104</real>
5 <key>fresnelOffset</key>
6 <real>1</real>
7 <key>fresnelScale</key>
8 <real>1</real>
9 <key>normScale</key>
10 <array>
11 <real>10</real>
12 <real>5</real>
13 <real>2.5</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>2211e97d-e6ed-c592-3bac-c00cad2a86c0</uuid>
17 <key>scaleAbove</key>
18 <real>0.039999999105930328</real>
19 <key>scaleBelow</key>
20 <real>0.039999999105930328</real>
21 <key>underWaterFogMod</key>
22 <real>0.25</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>1</real>
26 <real>0.5</real>
27 <real>0</real>
28 <real>1</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>0.61557221412658691</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-0.20000007748603821</real>
35 <real>-0.25000008940696716</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>0.099999904632568359</real>
40 <real>0.14999990165233612</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Crosshatched%20plans.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Crosshatched%20plans.xml
new file mode 100644
index 0000000..cee0a26
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Crosshatched%20plans.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.0040000001899898052</real>
5 <key>fresnelOffset</key>
6 <real>0.5899999737739563</real>
7 <key>fresnelScale</key>
8 <real>0.17999999225139618</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>1.6000000238418579</real>
13 <real>0.5</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>22229d16-3871-7dee-2042-dbfa25cd8bce</uuid>
17 <key>scaleAbove</key>
18 <real>0.049999997019767761</real>
19 <key>scaleBelow</key>
20 <real>0.14999999105930328</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.39999997615814209</real>
24 <real>0.39999997615814209</real>
25 <real>1</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>4.9245781898498535</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-1.0500000715255737</real>
33 <real>-1.0500000715255737</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-1.0500000715255737</real>
38 <real>-0.95000004768371582</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Eyeballin%27.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Eyeballin%27.xml
new file mode 100644
index 0000000..d95bd6d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Eyeballin%27.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0</real>
5 <key>fresnelOffset</key>
6 <real>0.87999999523162842</real>
7 <key>fresnelScale</key>
8 <real>0.64999997615814209</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>0</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.0099999997764825821</real>
19 <key>scaleBelow</key>
20 <real>0.019999999552965164</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>1</real>
24 <real>1</real>
25 <real>1</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>3.2490098476409912</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>0.049999907612800598</real>
33 <real>0.10999990999698639</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>0.049999907612800598</real>
38 <real>0.11999990791082382</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Fantastuck.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Fantastuck.xml
new file mode 100644
index 0000000..652efdb
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Fantastuck.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.0070000002160668373</real>
5 <key>fresnelOffset</key>
6 <real>1</real>
7 <key>fresnelScale</key>
8 <real>0.26999998092651367</real>
9 <key>normScale</key>
10 <array>
11 <real>3.1000001430511475</real>
12 <real>2.6000001430511475</real>
13 <real>1.3999999761581421</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>5748decc-f629-461c-9a36-a35a221fe21f</uuid>
17 <key>scaleAbove</key>
18 <real>0.049999997019767761</real>
19 <key>scaleBelow</key>
20 <real>0</real>
21 <key>underWaterFogMod</key>
22 <real>0</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0</real>
26 <real>1</real>
27 <real>0.5</real>
28 <real>1</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>1</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-0.010000089183449745</real>
35 <real>-8.9406967163085938e-008</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>-8.9406967163085938e-008</real>
40 <real>0.009999910369515419</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Featuresque.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Featuresque.xml
new file mode 100644
index 0000000..98bec18
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Featuresque.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0</real>
5 <key>fresnelOffset</key>
6 <real>0.79999995231628418</real>
7 <key>fresnelScale</key>
8 <real>1</real>
9 <key>normScale</key>
10 <array>
11 <real>4.7000002861022949</real>
12 <real>0</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>f9df2fcd-4895-77ec-3fcd-4cb1cef21588</uuid>
17 <key>scaleAbove</key>
18 <real>0.039999999105930328</real>
19 <key>scaleBelow</key>
20 <real>0</real>
21 <key>underWaterFogMod</key>
22 <real>0.25</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0.79999995231628418</real>
26 <real>0.40000015497207642</real>
27 <real>0</real>
28 <real>1</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>18.379177093505859</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-0.58000010251998901</real>
35 <real>-0.21000008285045624</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>0.46999990940093994</real>
40 <real>-0.16000008583068848</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Freak%2DA%2Ddermia.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Freak%2DA%2Ddermia.xml
new file mode 100644
index 0000000..d9c715a
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Freak%2DA%2Ddermia.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0</real>
5 <key>fresnelOffset</key>
6 <real>1</real>
7 <key>fresnelScale</key>
8 <real>1</real>
9 <key>normScale</key>
10 <array>
11 <real>10</real>
12 <real>10</real>
13 <real>10</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>1a29d128-f6cb-874f-b39a-bbb68605f950</uuid>
17 <key>scaleAbove</key>
18 <real>1</real>
19 <key>scaleBelow</key>
20 <real>1</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>1</real>
24 <real>0</real>
25 <real>0.5</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>32</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>3.9999997615814209</real>
33 <real>3.9999997615814209</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>3.9999997615814209</real>
38 <real>3.9999997615814209</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Glaznost.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Glaznost.xml
new file mode 100644
index 0000000..267f786
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Glaznost.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.082000002264976501</real>
5 <key>fresnelOffset</key>
6 <real>0.66999995708465576</real>
7 <key>fresnelScale</key>
8 <real>0</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>0</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0</real>
19 <key>scaleBelow</key>
20 <real>0</real>
21 <key>underWaterFogMod</key>
22 <real>0</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0.049999997019767761</real>
26 <real>0.37999999523162842</real>
27 <real>0.52999997138977051</real>
28 <real>0.52999997138977051</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>1</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-8.9406967163085938e-008</real>
35 <real>-8.9406967163085938e-008</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>-8.9406967163085938e-008</real>
40 <real>-8.9406967163085938e-008</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Grantamount.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Grantamount.xml
new file mode 100644
index 0000000..4ec8b36
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Grantamount.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.16000001132488251</real>
5 <key>fresnelOffset</key>
6 <real>1</real>
7 <key>fresnelScale</key>
8 <real>1</real>
9 <key>normScale</key>
10 <array>
11 <real>10</real>
12 <real>10</real>
13 <real>10</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.88999998569488525</real>
19 <key>scaleBelow</key>
20 <real>1</real>
21 <key>underWaterFogMod</key>
22 <real>0.31999999284744263</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>1</real>
26 <real>0</real>
27 <real>0.5</real>
28 <real>1</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>1024</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-4</real>
35 <real>-3.8299999237060547</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>-4</real>
40 <real>-3.8299999237060547</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Hpmod.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Hpmod.xml
new file mode 100644
index 0000000..10994dc
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Hpmod.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.014000000432133675</real>
5 <key>fresnelOffset</key>
6 <real>0.65999996662139893</real>
7 <key>fresnelScale</key>
8 <real>0.070000000298023224</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>0</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0</real>
19 <key>scaleBelow</key>
20 <real>0</real>
21 <key>underWaterFogMod</key>
22 <real>0</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0.059999998658895493</real>
26 <real>0.37999999523162842</real>
27 <real>0.52999997138977051</real>
28 <real>0.52999997138977051</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>64</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-8.9406967163085938e-008</real>
35 <real>-8.9406967163085938e-008</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>-8.9406967163085938e-008</real>
40 <real>-8.9406967163085938e-008</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Ice%2Dlike.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Ice%2Dlike.xml
new file mode 100644
index 0000000..8489a2e
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Ice%2Dlike.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.040000002831220627</real>
5 <key>fresnelOffset</key>
6 <real>0.25</real>
7 <key>fresnelScale</key>
8 <real>0.5</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>0</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0</real>
19 <key>scaleBelow</key>
20 <real>0</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>1</real>
24 <real>1</real>
25 <real>1</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>64</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-8.9406967163085938e-008</real>
33 <real>-8.9406967163085938e-008</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-8.9406967163085938e-008</real>
38 <real>-8.9406967163085938e-008</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Impure.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Impure.xml
new file mode 100644
index 0000000..b118198
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Impure.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.01100000087171793</real>
5 <key>fresnelOffset</key>
6 <real>0.39999997615814209</real>
7 <key>fresnelScale</key>
8 <real>0.55000001192092896</real>
9 <key>normScale</key>
10 <array>
11 <real>10</real>
12 <real>10</real>
13 <real>10</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>0db3718c-49e9-ad61-b6c4-4e5b84d9e589</uuid>
17 <key>scaleAbove</key>
18 <real>0.15999999642372131</real>
19 <key>scaleBelow</key>
20 <real>0.34999999403953552</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.5</real>
24 <real>0.5</real>
25 <real>0.5</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>16</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.16000008583068848</real>
33 <real>-0.21000008285045624</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-0.32000008225440979</real>
38 <real>-0.32000008225440979</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Linear%20puddles.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Linear%20puddles.xml
new file mode 100644
index 0000000..08d82a6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Linear%20puddles.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.024000000208616257</real>
5 <key>fresnelOffset</key>
6 <real>0.50999999046325684</real>
7 <key>fresnelScale</key>
8 <real>0.81000000238418579</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>1</real>
13 <real>2</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>78b6ea66-f557-811f-dec7-b21552cc5c51</uuid>
17 <key>scaleAbove</key>
18 <real>0.039999999105930328</real>
19 <key>scaleBelow</key>
20 <real>0.029999999329447746</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0</real>
24 <real>0.43750005960464478</real>
25 <real>0.43749997019767761</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>8.574188232421875</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-1.0500000715255737</real>
33 <real>-1.0000001192092896</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-1.3200000524520874</real>
38 <real>-1.4200000762939453</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Listeryne.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Listeryne.xml
new file mode 100644
index 0000000..1036fe4
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Listeryne.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.018000001087784767</real>
5 <key>fresnelOffset</key>
6 <real>0.47999998927116394</real>
7 <key>fresnelScale</key>
8 <real>0.11999999731779099</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>1.6000000238418579</real>
13 <real>1.7000000476837158</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>2124abf0-8733-8e3e-ff9b-2245f11884f5</uuid>
17 <key>scaleAbove</key>
18 <real>0.049999997019767761</real>
19 <key>scaleBelow</key>
20 <real>0.099999994039535522</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0</real>
24 <real>0.5</real>
25 <real>0</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>1.4142136573791504</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>0.8899998664855957</real>
33 <real>0.52999991178512573</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-0.47000008821487427</real>
38 <real>-0.11000008881092072</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Liz%20Taylor.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Liz%20Taylor.xml
new file mode 100644
index 0000000..c36dd7f
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Liz%20Taylor.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.029000001028180122</real>
5 <key>fresnelOffset</key>
6 <real>0.37999999523162842</real>
7 <key>fresnelScale</key>
8 <real>0.23999999463558197</real>
9 <key>normScale</key>
10 <array>
11 <real>1</real>
12 <real>0.90000003576278687</real>
13 <real>0.60000002384185791</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>d727239c-056f-cce0-0681-e190ba7d9e50</uuid>
17 <key>scaleAbove</key>
18 <real>0.059999998658895493</real>
19 <key>scaleBelow</key>
20 <real>0.11999999731779099</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.47399908304214478</real>
24 <real>0.361328125</real>
25 <real>0.638671875</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>14.928528785705566</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.42000007629394531</real>
33 <real>-0.050000086426734924</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-0.050000086426734924</real>
38 <real>-0.050000086426734924</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Maldives.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Maldives.xml
new file mode 100644
index 0000000..6da53e8
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Maldives.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.0030000000260770321</real>
5 <key>fresnelOffset</key>
6 <real>0.50999999046325684</real>
7 <key>fresnelScale</key>
8 <real>0.19999998807907104</real>
9 <key>normScale</key>
10 <array>
11 <integer>2</integer>
12 <integer>2</integer>
13 <integer>2</integer>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.079999998211860657</real>
19 <key>scaleBelow</key>
20 <real>0.20000000298023224</real>
21 <key>underWaterFogMod</key>
22 <real>0.25</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0</real>
26 <real>0</real>
27 <real>0.5</real>
28 <real>1</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>21.112127304077148</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>0.5</real>
35 <real>-0.17000000178813934</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>0.57999998331069946</real>
40 <real>-0.67000001668930054</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Meridian%20verde.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Meridian%20verde.xml
new file mode 100644
index 0000000..6e52b20
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Meridian%20verde.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.01900000125169754</real>
5 <key>fresnelOffset</key>
6 <real>0.38999998569488525</real>
7 <key>fresnelScale</key>
8 <real>0.62999999523162842</real>
9 <key>normScale</key>
10 <array>
11 <real>3.2000000476837158</real>
12 <real>2.7000000476837158</real>
13 <real>1.8999999761581421</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>1a5348cb-7164-b03e-8a45-70ad4cabe682</uuid>
17 <key>scaleAbove</key>
18 <real>0.19999998807907104</real>
19 <key>scaleBelow</key>
20 <real>0.19999998807907104</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0</real>
24 <real>0.25</real>
25 <real>0.25</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>3.4822025299072266</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-1.0000001192092896</real>
33 <real>-0.90000009536743164</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-0.80000007152557373</real>
38 <real>-0.70000004768371582</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Negative%20ultraspace.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Negative%20ultraspace.xml
new file mode 100644
index 0000000..3cb1d07
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Negative%20ultraspace.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.0080000003799796104</real>
5 <key>fresnelOffset</key>
6 <real>1</real>
7 <key>fresnelScale</key>
8 <real>1</real>
9 <key>normScale</key>
10 <array>
11 <real>10</real>
12 <real>5</real>
13 <real>2.5</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>2211e97d-e6ed-c592-3bac-c00cad2a86c0</uuid>
17 <key>scaleAbove</key>
18 <real>0.039999999105930328</real>
19 <key>scaleBelow</key>
20 <real>0.039999999105930328</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>1</real>
24 <real>0.5</real>
25 <real>0</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>0.61557221412658691</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.20000007748603821</real>
33 <real>-0.25000008940696716</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>0.099999904632568359</real>
38 <real>0.14999990165233612</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Placida%20brite.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Placida%20brite.xml
new file mode 100644
index 0000000..b822322
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Placida%20brite.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.01100000087171793</real>
5 <key>fresnelOffset</key>
6 <real>0.65999996662139893</real>
7 <key>fresnelScale</key>
8 <real>0</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>0</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0</real>
19 <key>scaleBelow</key>
20 <real>0</real>
21 <key>underWaterFogMod</key>
22 <real>0</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0</real>
26 <real>0</real>
27 <real>0.5</real>
28 <real>1</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>1</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-0.010000089183449745</real>
35 <real>-8.9406967163085938e-008</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>-8.9406967163085938e-008</real>
40 <real>0.009999910369515419</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Pretty%20placid.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Pretty%20placid.xml
new file mode 100644
index 0000000..4f5a18b
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Pretty%20placid.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.013000000268220901</real>
5 <key>fresnelOffset</key>
6 <real>0.39999997615814209</real>
7 <key>fresnelScale</key>
8 <real>0.19999998807907104</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>0.20000000298023224</real>
13 <real>0.40000000596046448</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>0db3718c-49e9-ad61-b6c4-4e5b84d9e589</uuid>
17 <key>scaleAbove</key>
18 <real>0.049999997019767761</real>
19 <key>scaleBelow</key>
20 <real>0.10999999940395355</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.19013670086860657</real>
24 <real>0.2818920910358429</real>
25 <real>0.39986327290534973</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>4.5947937965393066</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.010000089183449745</real>
33 <real>-0.020000088959932327</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>0.24999991059303284</real>
38 <real>0.39999991655349731</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Raw%20sewage.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Raw%20sewage.xml
new file mode 100644
index 0000000..d072409
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Raw%20sewage.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0</real>
5 <key>fresnelOffset</key>
6 <real>0.19999998807907104</real>
7 <key>fresnelScale</key>
8 <real>0.79999995231628418</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>0</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>56b9a89e-6851-0ca6-6200-beddd03e08e0</uuid>
17 <key>scaleAbove</key>
18 <real>0</real>
19 <key>scaleBelow</key>
20 <real>0</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.15906250476837158</real>
24 <real>0.13064941763877869</real>
25 <real>0.00093749165534973145</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>16</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-8.9406967163085938e-008</real>
33 <real>-8.9406967163085938e-008</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-8.9406967163085938e-008</real>
38 <real>-8.9406967163085938e-008</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Showing%20age.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Showing%20age.xml
new file mode 100644
index 0000000..deb6638
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Showing%20age.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.02200000174343586</real>
5 <key>fresnelOffset</key>
6 <real>0.099999994039535522</real>
7 <key>fresnelScale</key>
8 <real>0.91999995708465576</real>
9 <key>normScale</key>
10 <array>
11 <real>10</real>
12 <real>0</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>56b9a89e-6851-0ca6-6200-beddd03e08e0</uuid>
17 <key>scaleAbove</key>
18 <real>0.31999999284744263</real>
19 <key>scaleBelow</key>
20 <real>0.15999999642372131</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.084000006318092346</real>
24 <real>0.1586667001247406</real>
25 <real>0.19599999487400055</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>29.857057571411133</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.32000008225440979</real>
33 <real>-0.260000079870224</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-0.260000079870224</real>
38 <real>-0.32000008225440979</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Soldier%27s%20legacy.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Soldier%27s%20legacy.xml
new file mode 100644
index 0000000..9b93f3a
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Soldier%27s%20legacy.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.040000002831220627</real>
5 <key>fresnelOffset</key>
6 <real>0.32999998331069946</real>
7 <key>fresnelScale</key>
8 <real>0.62999999523162842</real>
9 <key>normScale</key>
10 <array>
11 <real>3</real>
12 <real>3.1000001430511475</real>
13 <real>3.2000000476837158</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>0297ce61-77f8-581e-b19d-2509881463e8</uuid>
17 <key>scaleAbove</key>
18 <real>0.039999999105930328</real>
19 <key>scaleBelow</key>
20 <real>0.14999999105930328</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.1803436279296875</real>
24 <real>0.2337188720703125</real>
25 <real>0.19869136810302734</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>64</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-1.6800000667572021</real>
33 <real>-1.6800000667572021</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>0.46999990940093994</real>
38 <real>0.31999990344047546</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Subtleties.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Subtleties.xml
new file mode 100644
index 0000000..e8b730d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Subtleties.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.0040000001899898052</real>
5 <key>fresnelOffset</key>
6 <real>0.47999998927116394</real>
7 <key>fresnelScale</key>
8 <real>0.32999998331069946</real>
9 <key>normScale</key>
10 <array>
11 <real>1.2000000476837158</real>
12 <real>1.3000000715255737</real>
13 <real>1.3999999761581421</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.079999998211860657</real>
19 <key>scaleBelow</key>
20 <real>0.15999999642372131</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.065683603286743164</real>
24 <real>0.41682437062263489</real>
25 <real>0.52431637048721313</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>5.6568551063537598</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>0.45999988913536072</real>
33 <real>-0.18000008165836334</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-0.260000079870224</real>
38 <real>-0.69000005722045898</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Trandshan.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Trandshan.xml
new file mode 100644
index 0000000..d0211b6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Trandshan.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.069000005722045898</real>
5 <key>fresnelOffset</key>
6 <real>0.59999996423721313</real>
7 <key>fresnelScale</key>
8 <real>0.41999998688697815</real>
9 <key>normScale</key>
10 <array>
11 <real>2</real>
12 <real>1</real>
13 <real>2</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.11999999731779099</real>
19 <key>scaleBelow</key>
20 <real>0.28999999165534973</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0</real>
24 <real>0.5</real>
25 <real>1</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>12.125733375549316</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-0.84000009298324585</real>
33 <real>-0.95000004768371582</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-2</real>
38 <real>-1.0500000715255737</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Watermelon%20juice.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Watermelon%20juice.xml
new file mode 100644
index 0000000..b6413a9
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Watermelon%20juice.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.0050000003539025784</real>
5 <key>fresnelOffset</key>
6 <real>0.43999999761581421</real>
7 <key>fresnelScale</key>
8 <real>0.14000000059604645</real>
9 <key>normScale</key>
10 <array>
11 <real>3</real>
12 <real>3</real>
13 <real>3</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.14000000059604645</real>
19 <key>scaleBelow</key>
20 <real>0.2800000011920929</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>1</real>
24 <real>0</real>
25 <real>0.5</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>21.112127304077148</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>0.43999990820884705</real>
33 <real>0.43999990820884705</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>0.43999990820884705</real>
38 <real>0.43999990820884705</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Waterslides.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Waterslides.xml
new file mode 100644
index 0000000..097748d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Waterslides.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.0040000001899898052</real>
5 <key>fresnelOffset</key>
6 <real>0.59999996423721313</real>
7 <key>fresnelScale</key>
8 <real>0.64999997615814209</real>
9 <key>normScale</key>
10 <array>
11 <real>2</real>
12 <real>4</real>
13 <real>8</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.039999999105930328</real>
19 <key>scaleBelow</key>
20 <real>0.079999998211860657</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0</real>
24 <real>1</real>
25 <real>1</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>2.1435470581054687</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-2</real>
33 <real>-2</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>0.99999988079071045</real>
38 <real>0.99999988079071045</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20What%27s%20on%20TV.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20What%27s%20on%20TV.xml
new file mode 100644
index 0000000..beed3cc
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20What%27s%20on%20TV.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.040000002831220627</real>
5 <key>fresnelOffset</key>
6 <real>1</real>
7 <key>fresnelScale</key>
8 <real>1</real>
9 <key>normScale</key>
10 <array>
11 <real>10</real>
12 <real>5</real>
13 <real>2.5</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>22229d16-3871-7dee-2042-dbfa25cd8bce</uuid>
17 <key>scaleAbove</key>
18 <real>0.039999999105930328</real>
19 <key>scaleBelow</key>
20 <real>0.039999999105930328</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.5</real>
24 <real>0.5</real>
25 <real>1</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>0.26794338226318359</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>3.9999997615814209</real>
33 <real>-8.9406967163085938e-008</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>-4</real>
38 <real>-8.9406967163085938e-008</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Wickedly.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Wickedly.xml
new file mode 100644
index 0000000..510614c
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Wickedly.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0</real>
5 <key>fresnelOffset</key>
6 <real>1</real>
7 <key>fresnelScale</key>
8 <real>0</real>
9 <key>normScale</key>
10 <array>
11 <real>0</real>
12 <real>0</real>
13 <real>0</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>cb51029b-360b-81e6-a3e1-5620c44e0b71</uuid>
17 <key>scaleAbove</key>
18 <real>0.50999999046325684</real>
19 <key>scaleBelow</key>
20 <real>0.099999994039535522</real>
21 <key>underWaterFogMod</key>
22 <real>0</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0.5</real>
26 <real>0</real>
27 <real>1</real>
28 <real>1</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>25.992082595825195</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-2.3900001049041748</real>
35 <real>-1.8900001049041748</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>-1.3300000429153442</real>
40 <real>-1.0000001192092896</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20You%27re%20in%20luck.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20You%27re%20in%20luck.xml
new file mode 100644
index 0000000..72fe40d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20You%27re%20in%20luck.xml
@@ -0,0 +1,41 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0</real>
5 <key>fresnelOffset</key>
6 <real>0.50999999046325684</real>
7 <key>fresnelScale</key>
8 <real>0.48999997973442078</real>
9 <key>normScale</key>
10 <array>
11 <real>3</real>
12 <real>2.9000000953674316</real>
13 <real>2.7999999523162842</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
17 <key>scaleAbove</key>
18 <real>0.099999994039535522</real>
19 <key>scaleBelow</key>
20 <real>0.099999994039535522</real>
21 <key>waterFogColor</key>
22 <array>
23 <real>0.63937491178512573</real>
24 <real>0.65999996662139893</real>
25 <real>0</real>
26 <real>1</real>
27 </array>
28 <key>waterFogDensity</key>
29 <real>6.4980192184448242</real>
30 <key>wave1Dir</key>
31 <array>
32 <real>-8.9406967163085938e-008</real>
33 <real>0.099999904632568359</real>
34 </array>
35 <key>wave2Dir</key>
36 <array>
37 <real>0.19999989867210388</real>
38 <real>0.2999998927116394</real>
39 </array>
40 </map>
41</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Yung%20buk.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Yung%20buk.xml
new file mode 100644
index 0000000..2067b7c
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Yung%20buk.xml
@@ -0,0 +1,43 @@
1<llsd>
2 <map>
3 <key>blurMultiplier</key>
4 <real>0.048000000417232513</real>
5 <key>fresnelOffset</key>
6 <real>0.72999995946884155</real>
7 <key>fresnelScale</key>
8 <real>0.26999998092651367</real>
9 <key>normScale</key>
10 <array>
11 <real>3.1000001430511475</real>
12 <real>2.6000001430511475</real>
13 <real>2.7000000476837158</real>
14 </array>
15 <key>normalMap</key>
16 <uuid>5748decc-f629-461c-9a36-a35a221fe21f</uuid>
17 <key>scaleAbove</key>
18 <real>0</real>
19 <key>scaleBelow</key>
20 <real>0</real>
21 <key>underWaterFogMod</key>
22 <real>0</real>
23 <key>waterFogColor</key>
24 <array>
25 <real>0</real>
26 <real>1</real>
27 <real>0.5</real>
28 <real>1</real>
29 </array>
30 <key>waterFogDensity</key>
31 <real>4</real>
32 <key>wave1Dir</key>
33 <array>
34 <real>-0.010000089183449745</real>
35 <real>-8.9406967163085938e-008</real>
36 </array>
37 <key>wave2Dir</key>
38 <array>
39 <real>-8.9406967163085938e-008</real>
40 <real>0.009999910369515419</real>
41 </array>
42 </map>
43</llsd>
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 2cecd89..8e3d682 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -78,8 +78,8 @@
78///---------------------------------------------------------------------------- 78///----------------------------------------------------------------------------
79/// Local function declarations, constants, enums, and typedefs 79/// Local function declarations, constants, enums, and typedefs
80///---------------------------------------------------------------------------- 80///----------------------------------------------------------------------------
81S32 LLFloaterSnapshot::sUIWinHeightLong = 526 ; 81S32 LLFloaterSnapshot::sUIWinHeightLong = 546 ;
82S32 LLFloaterSnapshot::sUIWinHeightShort = LLFloaterSnapshot::sUIWinHeightLong - 230 ; 82S32 LLFloaterSnapshot::sUIWinHeightShort = LLFloaterSnapshot::sUIWinHeightLong - 250 ;
83S32 LLFloaterSnapshot::sUIWinWidth = 215 ; 83S32 LLFloaterSnapshot::sUIWinWidth = 215 ;
84 84
85LLSnapshotFloaterView* gSnapshotFloaterView = NULL; 85LLSnapshotFloaterView* gSnapshotFloaterView = NULL;
@@ -1255,9 +1255,6 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
1255 1255
1256 BOOL is_advance = gSavedSettings.getBOOL("AdvanceSnapshot"); 1256 BOOL is_advance = gSavedSettings.getBOOL("AdvanceSnapshot");
1257 BOOL is_local = shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL; 1257 BOOL is_local = shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL;
1258 BOOL show_slider =
1259 shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD
1260 || (is_local && shot_format == LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG);
1261 1258
1262 floater->childSetVisible("more_btn", !is_advance); // the only item hidden in advanced mode 1259 floater->childSetVisible("more_btn", !is_advance); // the only item hidden in advanced mode
1263 floater->childSetVisible("less_btn", is_advance); 1260 floater->childSetVisible("less_btn", is_advance);
@@ -1270,17 +1267,22 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
1270 floater->childSetVisible("snapshot_height", is_advance); 1267 floater->childSetVisible("snapshot_height", is_advance);
1271 floater->childSetVisible("keep_aspect_check", is_advance); 1268 floater->childSetVisible("keep_aspect_check", is_advance);
1272 floater->childSetVisible("ui_check", is_advance); 1269 floater->childSetVisible("ui_check", is_advance);
1273 floater->childSetVisible("high_res_check", is_advance && is_local); 1270 floater->childSetVisible("high_res_check", is_advance);
1274 floater->childSetVisible("hud_check", is_advance); 1271 floater->childSetVisible("hud_check", is_advance);
1275 floater->childSetVisible("keep_open_check", is_advance); 1272 floater->childSetVisible("keep_open_check", is_advance);
1276 floater->childSetVisible("freeze_frame_check", is_advance); 1273 floater->childSetVisible("freeze_frame_check", is_advance);
1277 floater->childSetVisible("auto_snapshot_check", is_advance); 1274 floater->childSetVisible("auto_snapshot_check", is_advance);
1278 floater->childSetVisible("image_quality_slider", is_advance && show_slider); 1275 floater->childSetVisible("image_quality_slider", is_advance);
1279 1276
1280 LLSnapshotLivePreview* previewp = getPreviewView(floater); 1277 LLSnapshotLivePreview* previewp = getPreviewView(floater);
1281 BOOL got_bytes = previewp && previewp->getDataSize() > 0; 1278 BOOL got_bytes = previewp && previewp->getDataSize() > 0;
1282 BOOL got_snap = previewp->getSnapshotUpToDate(); 1279 BOOL got_snap = previewp->getSnapshotUpToDate();
1283 1280
1281 BOOL show_slider =
1282 shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD
1283 || (is_local && shot_format == LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG);
1284 floater->childSetEnabled("image_quality_slider", show_slider);
1285
1284 floater->childSetEnabled("send_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_snap && previewp->getDataSize() <= MAX_POSTCARD_DATASIZE); 1286 floater->childSetEnabled("send_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_snap && previewp->getDataSize() <= MAX_POSTCARD_DATASIZE);
1285 floater->childSetEnabled("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE && got_snap); 1287 floater->childSetEnabled("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE && got_snap);
1286 floater->childSetEnabled("save_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL && got_snap); 1288 floater->childSetEnabled("save_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL && got_snap);
@@ -2111,6 +2113,7 @@ void LLFloaterSnapshot::draw()
2111 childSetTextArg("file_size_label", "[SIZE]", getString("unknown")); 2113 childSetTextArg("file_size_label", "[SIZE]", getString("unknown"));
2112 childSetColor("file_size_label", gColors.getColor( "LabelTextColor" )); 2114 childSetColor("file_size_label", gColors.getColor( "LabelTextColor" ));
2113 } 2115 }
2116
2114 childSetEnabled("upload_btn", previewp->getSnapshotUpToDate()); 2117 childSetEnabled("upload_btn", previewp->getSnapshotUpToDate());
2115 childSetEnabled("save_btn", previewp->getSnapshotUpToDate()); 2118 childSetEnabled("save_btn", previewp->getSnapshotUpToDate());
2116 2119
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index e848aeb..f055dbc 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -388,16 +388,6 @@ void LLNetMap::draw()
388 } 388 }
389// [/RLVa:KB] 389// [/RLVa:KB]
390 390
391// [RLVa:KB]
392 if ( !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
393 {
394 // User is not allowed to see who it is, or even if it's a friend,
395 // due to RLV settings.
396 glyph_color = avatar_color;
397 }
398// [/RLVa:KB]
399
400
401 LLWorldMapView::drawAvatar( 391 LLWorldMapView::drawAvatar(
402 pos_map.mV[VX], pos_map.mV[VY], 392 pos_map.mV[VX], pos_map.mV[VY],
403 glyph_color, 393 glyph_color,
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index e101ea2..5fed44c 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1318,14 +1318,6 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
1318 1318
1319 mPanelSecondLife->childSetVisible("online_yes", (online_status == ONLINE_STATUS_YES)); 1319 mPanelSecondLife->childSetVisible("online_yes", (online_status == ONLINE_STATUS_YES));
1320 1320
1321 // Since setOnlineStatus gets called after setAvatarID
1322 // need to make sure that "Offer Teleport" doesn't get set
1323 // to TRUE again for yourself
1324 if (mAvatarID != gAgent.getID())
1325 {
1326 childSetVisible("Offer Teleport...",TRUE);
1327 }
1328
1329 BOOL in_prelude = gAgent.inPrelude(); 1321 BOOL in_prelude = gAgent.inPrelude();
1330 if(gAgent.isGodlike()) 1322 if(gAgent.isGodlike())
1331 { 1323 {
@@ -1342,6 +1334,18 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
1342 childSetEnabled("Offer Teleport...", TRUE); 1334 childSetEnabled("Offer Teleport...", TRUE);
1343 childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString()); 1335 childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
1344 } 1336 }
1337
1338 // Since setOnlineStatus gets called after setAvatarID
1339 // need to make sure that "Offer Teleport" doesn't get set
1340 // to TRUE again for yourself
1341 if (mAvatarID != gAgent.getID())
1342 {
1343 childSetVisible("Offer Teleport...",TRUE);
1344 }
1345 else
1346 {
1347 childSetEnabled("Offer Teleport...", FALSE);
1348 }
1345} 1349}
1346 1350
1347void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name, 1351void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name,
@@ -1434,21 +1438,21 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
1434 childSetVisible("Cancel",FALSE); 1438 childSetVisible("Cancel",FALSE);
1435 childSetEnabled("Cancel",FALSE); 1439 childSetEnabled("Cancel",FALSE);
1436 } 1440 }
1437 childSetVisible("Instant Message...",FALSE); 1441 //childSetVisible("Instant Message...",FALSE);
1438 childSetEnabled("Instant Message...",FALSE); 1442 childSetEnabled("Instant Message...",FALSE);
1439 childSetVisible("Invite to Group...",FALSE); 1443 //childSetVisible("Invite to Group...",FALSE);
1440 childSetEnabled("Invite to Group...",FALSE); 1444 childSetEnabled("Invite to Group...",FALSE);
1441 childSetVisible("Mute",FALSE); 1445 //childSetVisible("Mute",FALSE);
1442 childSetEnabled("Mute",FALSE); 1446 childSetEnabled("Mute",FALSE);
1443 childSetVisible("Offer Teleport...",FALSE); 1447 //childSetVisible("Offer Teleport...",FALSE);
1444 childSetEnabled("Offer Teleport...",FALSE); 1448 childSetEnabled("Offer Teleport...",FALSE);
1445 childSetVisible("drop target",FALSE); 1449 //childSetVisible("drop target",FALSE);
1446 childSetEnabled("drop target",FALSE); 1450 childSetEnabled("drop target",FALSE);
1447 childSetVisible("Find on Map",FALSE); 1451 //childSetVisible("Find on Map",FALSE);
1448 childSetEnabled("Find on Map",FALSE); 1452 childSetEnabled("Find on Map",FALSE);
1449 childSetVisible("Add Friend...",FALSE); 1453 //childSetVisible("Add Friend...",FALSE);
1450 childSetEnabled("Add Friend...",FALSE); 1454 childSetEnabled("Add Friend...",FALSE);
1451 childSetVisible("Pay...",FALSE); 1455 //childSetVisible("Pay...",FALSE);
1452 childSetEnabled("Pay...",FALSE); 1456 childSetEnabled("Pay...",FALSE);
1453 childSetVisible("Kick",FALSE); 1457 childSetVisible("Kick",FALSE);
1454 childSetEnabled("Kick",FALSE); 1458 childSetEnabled("Kick",FALSE);
@@ -1819,12 +1823,27 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
1819 { 1823 {
1820 continue; 1824 continue;
1821 } 1825 }
1822 self->childSetEnabled("Instant Message...",TRUE);
1823 self->childSetEnabled("Invite to Group...",TRUE);
1824 self->childSetEnabled("Pay...",TRUE);
1825 self->childSetEnabled("Mute",TRUE);
1826 1826
1827 self->childSetEnabled("drop target",TRUE); 1827 if (self->mAvatarID == agent_id)
1828 {
1829 self->childSetEnabled("Instant Message...",FALSE);
1830 self->childSetEnabled("Invite to Group...",FALSE);
1831 self->childSetEnabled("Pay...",FALSE);
1832 self->childSetEnabled("Mute",FALSE);
1833
1834 self->childSetVisible("drop target",FALSE);
1835 self->childSetEnabled("drop target",FALSE);
1836 }
1837 else
1838 {
1839 self->childSetEnabled("Instant Message...",TRUE);
1840 self->childSetEnabled("Invite to Group...",TRUE);
1841 self->childSetEnabled("Pay...",TRUE);
1842 self->childSetEnabled("Mute",TRUE);
1843
1844 self->childSetVisible("drop target",TRUE);
1845 self->childSetEnabled("drop target",TRUE);
1846 }
1828 1847
1829 self->mHaveProperties = TRUE; 1848 self->mHaveProperties = TRUE;
1830 self->enableOKIfReady(); 1849 self->enableOKIfReady();
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index 9333153..0299100 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true" 2<floater bottom="-320" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" follows="left|top" height="526" name="Snapshot" 3 can_resize="false" follows="left|top" height="546" name="Snapshot"
4 rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215"> 4 rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
5 <text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label" 5 <text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
6 width="195"> 6 width="195">
@@ -140,9 +140,9 @@
140 <check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10" 140 <check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
141 name="keep_aspect_check" /> 141 name="keep_aspect_check" />
142 <slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15" 142 <slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
143 increment="1" initial_val="75" label="Image Quality" left="10" 143 increment="1" initial_val="75" label="Image Quality" left="10" label_width="80"
144 max_val="100" min_val="0" name="image_quality_slider" width="210" /> 144 max_val="100" min_val="0" name="image_quality_slider" width="210" />
145 <check_box bottom_delta="0" follows="left|top" label="High resolution snapshot" 145 <check_box bottom_delta="-20" follows="left|top" label="High resolution snapshot"
146 left="10" name="high_res_check" /> 146 left="10" name="high_res_check" />
147 <text bottom_delta="-28" follows="left|top" height="20" left="10" 147 <text bottom_delta="-28" follows="left|top" height="20" left="10"
148 name="layer_type_label" width="50"> 148 name="layer_type_label" width="50">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 2ea8890..6bcd7a5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -148,7 +148,7 @@
148 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 148 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
149 bottom_delta="40" drop_shadow_visible="true" follows="left|top" 149 bottom_delta="40" drop_shadow_visible="true" follows="left|top"
150 font="SansSerifSmall" h_pad="0" halign="center" height="16" right="-22" 150 font="SansSerifSmall" h_pad="0" halign="center" height="16" right="-22"
151 mouse_opaque="true" name="Give inventory" 151 mouse_opaque="true" name="drop target"
152 tool_tip="Drop inventory items here to give them to this resident." v_pad="2" 152 tool_tip="Drop inventory items here to give them to this resident." v_pad="2"
153 width="115"> 153 width="115">
154 Drop inventory here 154 Drop inventory here
generated by cgit v1.1 at 2025-02-02 13:04:03 +0000