From 605511d6738817c7df3a85da873ef72c2471c642 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 25 Jan 2013 15:17:36 -0800
Subject: MAINT-2287 : WIP : Add a InventoryOutboxMakeVisible setting for
 maintenance and debugging

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7deb1284b9..a9073d619d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4337,6 +4337,17 @@
 		<key>Value</key>
 		<integer>0</integer>
 	</map>
+	<key>InventoryOutboxMakeVisible</key>
+	<map>
+		<key>Comment</key>
+		<string>Enable making the Merchant Outbox and Inbox visible in the inventory for debug purposes.</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+	</map>
     <key>InventoryOutboxMaxFolderCount</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From be01ac2a365662360c6f64ac6cb8b4ea083291cb Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 17 Oct 2013 15:20:34 -0700
Subject: BUG-4185 : Fix glsl compilation error on Mac

---
 indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
index 3df4d333ce..9a8dbeab58 100755
--- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
@@ -34,8 +34,8 @@ mat4 getSkinnedTransform()
 	
 	float x = fract(weight.x);
 	int i = int(floor(weight.x));
-		i = min(i, 15);
-		i = max(i, 0);
+    i = int(min(i, 15));
+    i = int(max(i, 0));
 	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);
-- 
cgit v1.2.3


From 22a3b0bd7baf132a90ddf02d5eb965b71451b757 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 19 Nov 2013 20:27:25 -0800
Subject: MAINT-2287 : Fix merge errors when merging viewer-release

---
 indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
index 9a8dbeab58..bc63d07d72 100755
--- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
@@ -31,12 +31,10 @@ uniform vec4 matrixPalette[45];
 mat4 getSkinnedTransform()
 {
 	mat4 ret;
-	
-	float x = fract(weight.x);
 	int i = int(floor(weight.x));
-    i = int(min(i, 15));
-    i = int(max(i, 0));
-	ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1],  x);
+	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);
 	ret[3] = vec4(0,0,0,1);
-- 
cgit v1.2.3