From 970ee73e9a9cd1c94c295c9decb4d632886c19e6 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 25 Oct 2013 11:48:43 -0700
Subject: Fix release merge issues (included upstream changes not yet in
 release from bear)

---
 indra/newview/app_settings/commands.xml                     |  7 -------
 indra/newview/app_settings/settings.xml                     | 13 +------------
 indra/newview/app_settings/settings_per_account.xml         | 11 -----------
 .../app_settings/shaders/class1/avatar/avatarSkinV.glsl     |  6 ++----
 .../app_settings/shaders/class1/avatar/objectSkinV.glsl     |  3 ---
 5 files changed, 3 insertions(+), 37 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 6a33ce105d..60c942094a 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -13,7 +13,6 @@
   <command name="appearance"  
            available_in_toybox="true"
            icon="Command_Appearance_Icon"
-           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Appearance_Label"
            tooltip_ref="Command_Appearance_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -24,7 +23,6 @@
   <command name="avatar"
            available_in_toybox="true"
            icon="Command_Avatar_Icon"
-           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Avatar_Label"
            tooltip_ref="Command_Avatar_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -96,7 +94,6 @@
   <command name="inventory"
            available_in_toybox="true"
            icon="Command_Inventory_Icon"
-           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Inventory_Label"
            tooltip_ref="Command_Inventory_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -124,7 +121,6 @@
   <command name="minimap"
            available_in_toybox="true"
            icon="Command_MiniMap_Icon"
-           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_MiniMap_Label"
            tooltip_ref="Command_MiniMap_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -175,7 +171,6 @@
   <command name="places"
            available_in_toybox="true"
            icon="Command_Places_Icon"
-           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Places_Label"
            tooltip_ref="Command_Places_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -204,7 +199,6 @@
   <command name="search"
            available_in_toybox="true"
            icon="Command_Search_Icon"
-           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Search_Label"
            tooltip_ref="Command_Search_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -215,7 +209,6 @@
   <command name="snapshot"
            available_in_toybox="true"
            icon="Command_Snapshot_Icon"
-           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Snapshot_Label"
            tooltip_ref="Command_Snapshot_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1c532e957e..41aac583d7 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5942,17 +5942,6 @@
       <key>Value</key>
       <real>1.6</real>
     </map>
-    <key>MaxPersistentNotifications</key>
-    <map>
-      <key>Comment</key>
-      <string>Maximum amount of persistent notifications</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <real>250</real>
-    </map>
     <key>MaxSelectDistance</key>
     <map>
       <key>Comment</key>
@@ -13345,7 +13334,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>0</string>
+      <string>-1</string>
     </map>
     <key>VivoxDebugSIPURIHostName</key>
     <map>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 500151c935..636caf5ef3 100755
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -77,17 +77,6 @@
         <key>Value</key>
             <integer>412</integer>
     </map>
-    <key>ConversationsParticipantListCollapsed</key>
-    <map>
-        <key>Comment</key>
-            <string>Stores the expanded/collapsed state of Nearby chat participant list</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>true</integer>
-    </map>   
     <key>InstantMessageLogPath</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
index 3df4d333ce..c98e7d1cd3 100755
--- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
@@ -31,11 +31,9 @@ uniform vec4 matrixPalette[45];
 mat4 getSkinnedTransform()
 {
 	mat4 ret;
-	
-	float x = fract(weight.x);
 	int i = int(floor(weight.x));
-		i = min(i, 15);
-		i = max(i, 0);
+	float x = fract(weight.x);
+	
 	ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1],  x);
 	ret[1] = mix(matrixPalette[i+15],matrixPalette[i+16], x);
 	ret[2] = mix(matrixPalette[i+30],matrixPalette[i+31], x);
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index 12996cf0d6..271947b2dd 100755
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -35,9 +35,6 @@ mat4 getObjectSkinnedTransform()
 	vec4 w = fract(weight4);
 	vec4 index = floor(weight4);
 
-		 index = min(index, vec4(31.0));
-		 index = max(index, vec4( 0.0));
-
 	float scale = 1.0/(w.x+w.y+w.z+w.w);
 	w *= scale;
 
-- 
cgit v1.2.3