merge release@83343 skinning-1-merge@83714 -> release

QAR-424

3 files changed, 48 insertions, 21 deletions

diff --git a/indra/newview/app_settings/grass.xml b/indra/newview/app_settings/grass.xml
index 7cc29fa771..4fc3b798af 100644
--- a/indra/newview/app_settings/grass.xml
+++ b/indra/newview/app_settings/grass.xml
@@ -3,35 +3,35 @@
   <grass
     name="Grass 0"
 	species_id="0"
- 	texture_name="grass_texture_2.tga"
+ 	texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"
 	blade_size_x="1.35"
 	blade_size_y="1.35"
      />
   <grass
     name="Grass 1"
 	species_id="1"
- 	texture_name="grass_texture_1.tga"
+ 	texture_id="79504bf5-c3ec-0763-6563-d843de66d0a1"
 	blade_size_x="1.0"
 	blade_size_y="0.66"
      />
   <grass
     name="Grass 2"
 	species_id="2"
- 	texture_name="grass_texture_2.tga"
+ 	texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"
 	blade_size_x="1.8"
 	blade_size_y="1.8"
      />
   <grass
     name="Grass 3"
 	species_id="3"
- 	texture_name="grass_texture_3.tga"
+ 	texture_id="99bd60a2-3250-efc9-2e39-2fbcadefbecc"
 	blade_size_x="1.0"
 	blade_size_y="1.0"
      />
   <grass
     name="Grass 4"
 	species_id="4"
- 	texture_name="grass_texture_4.tga"
+ 	texture_id="7a2b3a4a-53c2-53ac-5716-aac7d743c020"
 	blade_size_x="2.25"
 	blade_size_y="2.25"
      />
@@ -44,4 +44,4 @@
      />
 
 
-</grass_defs>
+</grass_defs>
\ No newline at end of file
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 40e9b01b45..7e687a5e64 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -38,6 +38,22 @@
                 <real>1</real>
             </array>
         </map>
+    <key>IMChatColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of instant messages from other residents</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
     <key>AllowIdleAFK</key>
         <map>
         <key>Comment</key>
@@ -8992,6 +9008,17 @@
         <key>Value</key>
             <integer>1</integer>
         </map>
+    <key>WarnFirstMedia</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstMedia warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
     <key>WarnFirstAttach</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/app_settings/std_bump.ini b/indra/newview/app_settings/std_bump.ini
index 9509c357ff..f34e21ce32 100644
--- a/indra/newview/app_settings/std_bump.ini
+++ b/indra/newview/app_settings/std_bump.ini
@@ -1,18 +1,18 @@
 LLStandardBumpmap version 1
 
 
-woodgrain		bump_woodgrain.tga		
-bark			bump_bark.tga			
-bricks			bump_bricks.tga			
-checker			bump_checker.tga		
-concrete		bump_concrete.tga		
-crustytile		bump_crustytile.tga		
-cutstone		bump_cutstone.tga		
-discs			bump_discs.tga			
-gravel			bump_gravel.tga			
-petridish		bump_petridish.tga		
-siding			bump_siding.tga			
-stonetile		bump_stonetile.tga		
-stucco			bump_stucco.tga			
-suction			bump_suction.tga		
-weave			bump_weave.tga			
+woodgrain		058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c		
+bark			6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c		
+bricks			b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c		
+checker			9deab416-9c63-78d6-d558-9a156f12044c.j2c	
+concrete		db9d39ec-a896-c287-1ced-64566217021e.j2c	
+crustytile		f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c
+cutstone		d9258671-868f-7511-c321-7baef9e948a4.j2c	
+discs			d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c		
+gravel			4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c		
+petridish		e569711a-27c2-aad4-9246-0c910239a179.j2c	
+siding			073c9723-540c-5449-cdd4-0e87fdc159e3.j2c		
+stonetile		ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c	
+stucco			92e66e00-f56f-598a-7997-048aa64cde18.j2c		
+suction			83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c
+weave			735198cf-6ea0-2550-e222-21d3c6a341ae.j2c