From 940adfe4d02ab0ecf69635afe7f959abe1fe2c44 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 8 May 2015 11:16:51 -0400
Subject: WIP bvh diagnostics

---
 indra/newview/app_settings/logcontrol.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index de3732f339..6d5cf6e8f7 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -42,6 +42,7 @@
 						</array>
 					<key>tags</key>
 						<array>
+						     <string>BVH</string>
 						<!-- sample entry for debugging specific items	
 						     <string>Avatar</string>
 						     <string>Inventory</string>
-- 
cgit v1.2.3


From fd9df262d5885341281154f1c05063d21bc8d151 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 11 May 2015 18:13:59 -0400
Subject: SL-111 WIP - bug fixes and diagnostic output

---
 indra/newview/app_settings/logcontrol.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 6d5cf6e8f7..de3732f339 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -42,7 +42,6 @@
 						</array>
 					<key>tags</key>
 						<array>
-						     <string>BVH</string>
 						<!-- sample entry for debugging specific items	
 						     <string>Avatar</string>
 						     <string>Inventory</string>
-- 
cgit v1.2.3


From e8a196f5fff37a9f2aa2bd5b3a7500682aeb8ce7 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Sat, 16 May 2015 08:18:19 -0400
Subject: SL-111 WIP - animation dumping/logging

---
 indra/newview/app_settings/logcontrol.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index de3732f339..6d5cf6e8f7 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -42,6 +42,7 @@
 						</array>
 					<key>tags</key>
 						<array>
+						     <string>BVH</string>
 						<!-- sample entry for debugging specific items	
 						     <string>Avatar</string>
 						     <string>Inventory</string>
-- 
cgit v1.2.3


From 25c7e0114085a296eb3e2f7fba7cd2cb5b6177f8 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 28 May 2015 17:45:45 -0400
Subject: SL-109 WIP - disable BVH-tag debug logging by default.

---
 indra/newview/app_settings/logcontrol.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 6d5cf6e8f7..51d6799d71 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -42,8 +42,8 @@
 						</array>
 					<key>tags</key>
 						<array>
-						     <string>BVH</string>
 						<!-- sample entry for debugging specific items	
+						     <string>BVH</string>
 						     <string>Avatar</string>
 						     <string>Inventory</string>
 						     <string>SceneLoadTiming</string>
-- 
cgit v1.2.3


From 932412e1dbc2d684970a1398e140f7d2757e0440 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 12 Aug 2015 11:17:23 -0400
Subject: SL-109 WIP - code cleanup

---
 indra/newview/app_settings/logcontrol.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 51d6799d71..de3732f339 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -43,7 +43,6 @@
 					<key>tags</key>
 						<array>
 						<!-- sample entry for debugging specific items	
-						     <string>BVH</string>
 						     <string>Avatar</string>
 						     <string>Inventory</string>
 						     <string>SceneLoadTiming</string>
-- 
cgit v1.2.3


From 2a57da233423ca3531bfcec2e138023afead4c3f Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 14 Aug 2015 15:00:08 -0400
Subject: SL-125 WIP - updated base bento repo excluding dynamic skeleton.

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b4eb60c6a3..5e627abeac 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10589,6 +10589,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SkeletonFileName</key>
+    <map>
+      <key>Comment</key>
+      <string>Alternative skeleton file name</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>avatar_skeleton.xml</string>
+    </map>
+    <key>AvatarFileName</key>
+    <map>
+      <key>Comment</key>
+      <string>Alternative avatar file name</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>avatar_lad.xml</string>
+    </map>
     <key>ShowAdvancedGraphicsSettings</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 2ea8df0593d520b86bcf958263622218f76ac113 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 26 Aug 2015 10:49:02 -0400
Subject: SL-205 WIP - support for 152-joint rigged meshes with both hardware
 and software skinning.

---
 .../app_settings/shaders/class1/avatar/objectSkinV.glsl     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index 6cd38d8ef5..d3eed775bf 100755
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -24,8 +24,11 @@
 
 ATTRIBUTE vec4 weight4;  
 
-uniform mat3 matrixPalette[52];
-uniform vec3 translationPalette[52];
+/* BENTO JOINT COUNT LIMITS
+ * Note that the value in these two lines also needs to be updated to value-1 several places below.
+ */
+uniform mat3 matrixPalette[152];
+uniform vec3 translationPalette[152];
 
 mat4 getObjectSkinnedTransform()
 {
@@ -34,7 +37,7 @@ mat4 getObjectSkinnedTransform()
 	vec4 w = fract(weight4);
 	vec4 index = floor(weight4);
 	
-		 index = min(index, vec4(51.0));
+		 index = min(index, vec4(151.0));
 		 index = max(index, vec4( 0.0));
 
 	float scale = 1.0/(w.x+w.y+w.z+w.w);
@@ -68,8 +71,8 @@ mat4 getObjectSkinnedTransform()
    // If it's AMD make sure the GLSL compiler sees the arrays referenced once by static index. Otherwise it seems to optimise the storage awawy which leads to unfun crashes and artifacts.
    mat3 dummy1 = matrixPalette[0];
    vec3 dummy2 = translationPalette[0];
-   mat3 dummy3 = matrixPalette[51];
-   vec3 dummy4 = translationPalette[51];
+   mat3 dummy3 = matrixPalette[151];
+   vec3 dummy4 = translationPalette[151];
 #endif
 
 }
-- 
cgit v1.2.3


From 74b8a487646cccb3260d02910ab5b16e274ec9ab Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 7 Oct 2015 15:38:40 -0400
Subject: SL-234 WIP - adjust max mesh object joints at run-time, including
 rebuilding shaders

---
 indra/newview/app_settings/settings.xml                       | 11 +++++++++++
 .../app_settings/shaders/class1/avatar/objectSkinV.glsl       | 10 +++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6533344048..dcb2764fe7 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6112,6 +6112,17 @@
       <key>Value</key>
       <real>1.6</real>
     </map>
+    <key>MaxJointsPerMeshObject</key>
+    <map>
+      <key>Comment</key>
+      <string>Maximum joints per rigged mesh object</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <real>999</real>
+    </map>
     <key>MaxPersistentNotifications</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index b342abb7c1..8f754fe82b 100755
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -27,8 +27,8 @@ ATTRIBUTE vec4 weight4;
 /* BENTO JOINT COUNT LIMITS
  * Note that the value in these two lines also needs to be updated to value-1 several places below.
  */
-uniform mat3 matrixPalette[152];
-uniform vec3 translationPalette[152];
+uniform mat3 matrixPalette[MAX_JOINTS_PER_MESH_OBJECT];
+uniform vec3 translationPalette[MAX_JOINTS_PER_MESH_OBJECT];
 
 mat4 getObjectSkinnedTransform()
 {
@@ -37,7 +37,7 @@ mat4 getObjectSkinnedTransform()
 	vec4 w = fract(weight4);
 	vec4 index = floor(weight4);
 	
-		 index = min(index, vec4(151.0));
+		 index = min(index, vec4(MAX_JOINTS_PER_MESH_OBJECT-1));
 		 index = max(index, vec4( 0.0));
 
     w *= 1.0/(w.x+w.y+w.z+w.w);
@@ -70,8 +70,8 @@ mat4 getObjectSkinnedTransform()
    // If it's AMD make sure the GLSL compiler sees the arrays referenced once by static index. Otherwise it seems to optimise the storage awawy which leads to unfun crashes and artifacts.
    mat3 dummy1 = matrixPalette[0];
    vec3 dummy2 = translationPalette[0];
-   mat3 dummy3 = matrixPalette[151];
-   vec3 dummy4 = translationPalette[151];
+   mat3 dummy3 = matrixPalette[MAX_JOINTS_PER_MESH_OBJECT-1];
+   vec3 dummy4 = translationPalette[MAX_JOINTS_PER_MESH_OBJECT-1];
 #endif
 
 }
-- 
cgit v1.2.3


From 58992e2cb4ae2787b85cff63c3ed680cd99fa8ce Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 16 Oct 2015 15:05:29 -0400
Subject: SL-234 WIP - Track which joints are part of base skeleton, remap
 non-base ones when not being rendered.

---
 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 133e51b531..8bf91c0f1e 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3492,6 +3492,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>IncludeEnhancedSkeleton</key>
+    <map>
+      <key>Comment</key>
+      <string>Include extended skeleton joints when rendering skinned meshes.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>MinObjectsForUnlinkConfirm</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 146919fa764bed09bfa5e27bc30d02ce2afb6188 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Wed, 11 Nov 2015 13:44:51 -0800
Subject: animations and meshes will recognize all joint names in
 joint_aliases.xml

---
 indra/newview/app_settings/anim.ini          | 87 -------------------------
 indra/newview/app_settings/joint_aliases.xml | 97 ++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 87 deletions(-)
 delete mode 100755 indra/newview/app_settings/anim.ini
 create mode 100755 indra/newview/app_settings/joint_aliases.xml

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/anim.ini b/indra/newview/app_settings/anim.ini
deleted file mode 100755
index 63c84e544d..0000000000
--- a/indra/newview/app_settings/anim.ini
+++ /dev/null
@@ -1,87 +0,0 @@
-Translations 1.0
-
-[hip]
-	relativepos = firstkey
-	relativerot = firstkey
-	outname = mPelvis
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[abdomen]
-	outname = mTorso
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[chest]
-	outname = mChest
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[neckDummy]
-	ignore = true
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[neck]
-	outname = mNeck
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[head]
-	outname = mHead
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[figureHair]
-	ignore = true
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[lCollar]
-	outname = mCollarLeft
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[lShldr]
-	outname = mShoulderLeft
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[lForeArm]
-	outname = mElbowLeft
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[lHand]
-	outname = mWristLeft
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[rCollar]
-	outname = mCollarRight
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[rShldr]
-	outname = mShoulderRight
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[rForeArm]
-	outname = mElbowRight
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[rHand]
-	outname = mWristRight
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[lThigh]
-	outname = mHipLeft
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[lShin]
-	outname = mKneeLeft
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[lFoot]
-	outname = mAnkleLeft
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[rThigh]
-	outname = mHipRight
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[rShin]
-	outname = mKneeRight
-	frame = 0 1 0, 0 0 1, 1 0 0
-
-[rFoot]
-	outname = mAnkleRight
-	frame = 0 1 0, 0 0 1, 1 0 0
\ No newline at end of file
diff --git a/indra/newview/app_settings/joint_aliases.xml b/indra/newview/app_settings/joint_aliases.xml
new file mode 100755
index 0000000000..1e4a233837
--- /dev/null
+++ b/indra/newview/app_settings/joint_aliases.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<llsd>
+<map>
+    <key>avatar_mPelvis</key>
+    <string>mPelvis</string>
+    <key>avatar_mTorso</key>
+    <string>mTorso</string>
+    <key>avatar_mChest</key>
+    <string>mChest</string>
+    <key>avatar_mNeck</key>
+    <string>mNeck</string>
+    <key>avatar_mHead</key>
+    <string>mHead</string>
+    <key>avatar_mSkull</key>
+    <string>mSkull</string>
+    <key>avatar_mEyeRight</key>
+    <string>mEyeRight</string>
+    <key>avatar_mEyeLeft</key>
+    <string>mEyeLeft</string>
+    <key>avatar_mCollarLeft</key>
+    <string>mCollarLeft</string>
+    <key>avatar_mShoulderLeft</key>
+    <string>mShoulderLeft</string>
+    <key>avatar_mElbowLeft</key>
+    <string>mElbowLeft</string>
+    <key>avatar_mWristLeft</key>
+    <string>mWristLeft</string>
+    <key>avatar_mCollarRight</key>
+    <string>mCollarRight</string>
+    <key>avatar_mShoulderRight</key>
+    <string>mShoulderRight</string>
+    <key>avatar_mElbowRight</key>
+    <string>mElbowRight</string>
+    <key>avatar_mWristRight</key>
+    <string>mWristRight</string>
+    <key>avatar_mHipRight</key>
+    <string>mHipRight</string>
+    <key>avatar_mKneeRight</key>
+    <string>mKneeRight</string>
+    <key>avatar_mAnkleRight</key>
+    <string>mAnkleRight</string>
+    <key>avatar_mFootRight</key>
+    <string>mFootRight</string>
+    <key>avatar_mToeRight</key>
+    <string>mToeRight</string>
+    <key>avatar_mHipLeft</key>
+    <string>mHipLeft</string>
+    <key>avatar_mKneeLeft</key>
+    <string>mKneeLeft</string>
+    <key>avatar_mAnkleLeft</key>
+    <string>mAnkleLeft</string>
+    <key>avatar_mFootLeft</key>
+    <string>mFootLeft</string>
+    <key>avatar_mToeLeft</key>
+    <string>mToeLeft</string>
+    <key>hip</key>
+    <string>mPelvis</string>
+    <key>abdomen</key>
+    <string>mTorso</string>
+    <key>chest</key>
+    <string>mChest</string>
+    <key>neck</key>
+    <string>mNeck</string>
+    <key>head</key>
+    <string>mHead</string>
+    <key>figureHair</key>
+    <string>mSkull</string>
+    <key>lCollar</key>
+    <string>mCollarLeft</string>
+    <key>lShldr</key>
+    <string>mShoulderLeft</string>
+    <key>lForeArm</key>
+    <string>mElbowLeft</string>
+    <key>lHand</key>
+    <string>mWristLeft</string>
+    <key>rCollar</key>
+    <string>mCollarRight</string>
+    <key>rShldr</key>
+    <string>mShoulderRight</string>
+    <key>rForeArm</key>
+    <string>mElbowRight</string>
+    <key>rHand</key>
+    <string>mWristRight</string>
+    <key>rThigh</key>
+    <string>mHipRight</string>
+    <key>rShin</key>
+    <string>mKneeRight</string>
+    <key>rFoot</key>
+    <string>mFootRight</string>
+    <key>lThigh</key>
+    <string>mHipLeft</string>
+    <key>lShin</key>
+    <string>mKneeLeft</string>
+    <key>lFoot</key>
+    <string>mFootLeft</string>
+</map>
+</llsd>
-- 
cgit v1.2.3


From cdb96f8044fd609f92b9009450454e356008ca1c Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Fri, 13 Nov 2015 14:31:21 -0800
Subject: Post review changes.

---
 indra/newview/app_settings/anim.ini | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100755 indra/newview/app_settings/anim.ini

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/anim.ini b/indra/newview/app_settings/anim.ini
new file mode 100755
index 0000000000..c24d2749ef
--- /dev/null
+++ b/indra/newview/app_settings/anim.ini
@@ -0,0 +1,2 @@
+Translations 1.0
+
-- 
cgit v1.2.3


From 7b410df303d37a800ddd0024932729a574a00860 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 25 Nov 2015 15:07:26 -0500
Subject: SL-124 WIP - cleanup of comments and test code before going to
 project viewer.

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8bf91c0f1e..9a4def3be2 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6123,17 +6123,6 @@
       <key>Value</key>
       <real>1.6</real>
     </map>
-    <key>MaxJointsPerMeshObject</key>
-    <map>
-      <key>Comment</key>
-      <string>Maximum joints per rigged mesh object</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>U32</string>
-      <key>Value</key>
-      <real>999</real>
-    </map>
     <key>MaxPersistentNotifications</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From aac43b9227617a7d53a505bf69f1c3b3171e66e9 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 2 Dec 2015 09:46:34 -0500
Subject: SL-270 WIP - removed some debug settings.

---
 indra/newview/app_settings/settings.xml | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9a4def3be2..63b87bdbaa 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10644,28 +10644,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>SkeletonFileName</key>
-    <map>
-      <key>Comment</key>
-      <string>Alternative skeleton file name</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>avatar_skeleton.xml</string>
-    </map>
-    <key>AvatarFileName</key>
-    <map>
-      <key>Comment</key>
-      <string>Alternative avatar file name</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>avatar_lad.xml</string>
-    </map>
     <key>ShowAdvancedGraphicsSettings</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From e91a192301db37f99a4f5a817f3b4c47b448417a Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 26 Jan 2016 11:11:52 -0500
Subject: SL-315 WIP - added callstack info to joint debugging. Made joint
 debugging run-time configurable via debug setting DebugAvatarJoints

---
 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 32707e7653..e1f2ecff0c 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2182,6 +2182,17 @@
       <string>String</string>
       <key>Value</key>
       <string />
+    </map>
+    <key>DebugAvatarJoints</key>
+    <map>
+      <key>Comment</key>
+      <string>List of joints to emit additional debugging info about.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string />
     </map>
 	<key>DebugAvatarRezTime</key>
 	<map>
-- 
cgit v1.2.3


From e19c4098d4af38271549a8fbe697138b5acbbba1 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 23 Mar 2016 11:03:55 -0400
Subject: SL-344 - hook for debugging wearable contents during slider testing.

---
 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 5ea847599b..21ca2a86d0 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14406,6 +14406,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LogWearableAssetSave</key>
+    <map>
+      <key>Comment</key>
+      <string>Save copy of saved wearables to log dir</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>LogTextureDownloadsToViewerLog</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From e46ac9d1440da85238599fb11e1da1ae0386b428 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 2 Jun 2016 17:48:58 -0400
Subject: synchronize default lsl hints with authoritative server version (not
 required, but does not hurt)

---
 .../newview/app_settings/keywords_lsl_default.xml  | 477 ++++++++++++++++-----
 1 file changed, 360 insertions(+), 117 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml
index ddd287faf4..bb23ec04dc 100644
--- a/indra/newview/app_settings/keywords_lsl_default.xml
+++ b/indra/newview/app_settings/keywords_lsl_default.xml
@@ -528,7 +528,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>27</integer>
+            <integer>26</integer>
             <key>tooltip</key>
             <string>Attach to the avatar's lower upper leg.</string>
          </map>
@@ -678,6 +678,141 @@
             <key>tooltip</key>
             <string>Attach to the avatar's right upper leg.</string>
          </map>
+         <key>ATTACH_LHAND_RING1</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>41</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's left ring finger.</string>
+         </map>
+         <key>ATTACH_RHAND_RING1</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>42</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's right ring finger.</string>
+         </map>
+         <key>ATTACH_TAIL_BASE</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>43</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's tail base.</string>
+         </map>
+         <key>ATTACH_TAIL_TIP</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>44</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's tail tip.</string>
+         </map>
+         <key>ATTACH_LWING</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>45</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's left wing.</string>
+         </map>
+         <key>ATTACH_RWING</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>46</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's right wing.</string>
+         </map>
+         <key>ATTACH_FACE_JAW</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>47</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's jaw.</string>
+         </map>
+         <key>ATTACH_FACE_LEAR</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>48</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's left ear (extended).</string>
+         </map>
+         <key>ATTACH_FACE_REAR</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>49</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's right ear (extended).</string>
+         </map>
+         <key>ATTACH_FACE_LEYE</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>50</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's left eye (extended).</string>
+         </map>
+         <key>ATTACH_FACE_REYE</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>51</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's right eye (extended).</string>
+         </map>
+         <key>ATTACH_FACE_TONGUE</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>52</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's tongue.</string>
+         </map>
+         <key>ATTACH_GROIN</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>53</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's groin.</string>
+         </map>
+         <key>ATTACH_HIND_LFOOT</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>54</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's left hind foot.</string>
+         </map>
+         <key>ATTACH_HIND_RFOOT</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>55</integer>
+            <key>tooltip</key>
+            <string>Attach to the avatar's right hind foot.</string>
+         </map>
          <key>AVOID_CHARACTERS</key>
          <map>
             <key>type</key>
@@ -809,7 +944,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>6</integer>
+            <integer>5</integer>
             <key>tooltip</key>
             <string/>
          </map>
@@ -818,7 +953,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>22</integer>
+            <integer>21</integer>
             <key>tooltip</key>
             <string/>
          </map>
@@ -872,7 +1007,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>2048</integer>
+            <integer>0x800</integer>
             <key>tooltip</key>
             <string/>
          </map>
@@ -1463,9 +1598,9 @@
             <key>type</key>
             <string>float</string>
             <key>value</key>
-            <real>0.01745329</real>
+            <real>0.017453293</real>
             <key>tooltip</key>
-            <string>0.01745329 - Number of radians per degree.
+            <string>0.017453293 - Number of radians per degree.
 			You can use this to convert degrees to radians by multiplying the degrees by this number.</string>
          </map>
          <key>DENSITY</key>
@@ -2299,7 +2434,7 @@
          <key>NULL_KEY</key>
          <map>
             <key>type</key>
-            <string>key</string>
+            <string>string</string>
             <key>value</key>
             <uuid>00000000-0000-0000-0000-000000000000</uuid>
             <key>tooltip</key>
@@ -2395,6 +2530,15 @@
             <key>tooltip</key>
             <string>Gets the object's name.</string>
          </map>
+         <key>OBJECT_OMEGA</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>29</integer>
+            <key>tooltip</key>
+            <string>Gets an object's angular velocity.</string>
+         </map>
          <key>OBJECT_OWNER</key>
          <map>
             <key>type</key>
@@ -2404,6 +2548,15 @@
             <key>tooltip</key>
             <string>Gets an object's owner's key. If id is group owned, a NULL_KEY is returned.</string>
          </map>
+         <key>OBJECT_PRIM_COUNT</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>30</integer>
+            <key>tooltip</key>
+            <string>Gets the prim count of the object.  The script and target object  must be owned by the same owner</string>
+         </map>
          <key>OBJECT_PATHFINDING_TYPE</key>
          <map>
             <key>type</key>
@@ -2494,6 +2647,15 @@
             <key>tooltip</key>
             <string/>
          </map>
+         <key>OBJECT_REZZER_KEY</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>32</integer>
+            <key>tooltip</key>
+            <string/>
+         </map>
          <key>OBJECT_ROOT</key>
          <map>
             <key>type</key>
@@ -2566,6 +2728,15 @@
             <key>tooltip</key>
             <string>Returns boolean, detailing if temporary is enabled or disabled on the object.</string>
          </map>
+         <key>OBJECT_TOTAL_INVENTORY_COUNT</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>31</integer>
+            <key>tooltip</key>
+            <string>Gets the total inventory count of the object.  The script and target object must be owned by the same owner</string>
+         </map>
          <key>OBJECT_TOTAL_SCRIPT_COUNT</key>
          <map>
             <key>type</key>
@@ -3052,6 +3223,33 @@
             <key>tooltip</key>
             <string/>
          </map>
+         <key>PASS_ALWAYS</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <string>1</string>
+            <key>tooltip</key>
+            <string>Always pass the event.</string>
+         </map>
+         <key>PASS_NEVER</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <string>2</string>
+            <key>tooltip</key>
+            <string>Always pass the event.</string>
+         </map>
+         <key>PASS_IF_NOT_HANDLED</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <string>0</string>
+            <key>tooltip</key>
+            <string>Pass the event if there is no script handling the event in the prim.</string>
+         </map>
          <key>PASSIVE</key>
          <map>
             <key>type</key>
@@ -4387,6 +4585,24 @@
             <key>tooltip</key>
             <string/>
          </map>
+         <key>PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>5</integer>
+            <key>tooltip</key>
+            <string/>
+         </map>
+         <key>PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>9</integer>
+            <key>tooltip</key>
+            <string/>
+         </map>
          <key>PSYS_PART_BF_SOURCE_ALPHA</key>
          <map>
             <key>type</key>
@@ -4536,7 +4752,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>19</integer>
+            <integer>7</integer>
             <key>tooltip</key>
             <string>Age in seconds of a particle at which it dies.</string>
          </map>
@@ -5061,7 +5277,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>2</integer>
+            <integer>0</integer>
             <key>tooltip</key>
             <string/>
          </map>
@@ -5295,7 +5511,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>64</integer>
+            <integer>0x40</integer>
             <key>tooltip</key>
             <string>Controls whether the object can be grabbed.\nA grab is the default action when in third person, and is available as the hand tool in build mode. This is useful for physical objects that you don't want other people to be able to trivially disturb. The default is FALSE</string>
          </map>
@@ -5304,7 +5520,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>1024</integer>
+            <integer>0x400</integer>
             <key>tooltip</key>
             <string>Prevent click-and-drag movement on all prims in the object.</string>
          </map>
@@ -5500,7 +5716,7 @@
          <key>TEXTURE_BLANK</key>
          <map>
             <key>type</key>
-            <string>key</string>
+            <string>string</string>
             <key>value</key>
             <uuid>5748decc-f629-461c-9a36-a35a221fe21f</uuid>
             <key>tooltip</key>
@@ -5509,7 +5725,7 @@
          <key>TEXTURE_DEFAULT</key>
          <map>
             <key>type</key>
-            <string>key</string>
+            <string>string</string>
             <key>value</key>
             <uuid>89556747-24cb-43ed-920b-47caed15465f</uuid>
             <key>tooltip</key>
@@ -5518,7 +5734,7 @@
          <key>TEXTURE_MEDIA</key>
          <map>
             <key>type</key>
-            <string>key</string>
+            <string>string</string>
             <key>value</key>
             <uuid>8b5fec65-8d8d-9dc5-cda8-8fdf2716e361</uuid>
             <key>tooltip</key>
@@ -5527,7 +5743,7 @@
          <key>TEXTURE_PLYWOOD</key>
          <map>
             <key>type</key>
-            <string>key</string>
+            <string>string</string>
             <key>value</key>
             <uuid>89556747-24cb-43ed-920b-47caed15465f</uuid>
             <key>tooltip</key>
@@ -5536,7 +5752,7 @@
          <key>TEXTURE_TRANSPARENT</key>
          <map>
             <key>type</key>
-            <string>key</string>
+            <string>string</string>
             <key>value</key>
             <uuid>8dcd4a48-2d37-4909-9f78-f7a9eb4ef903</uuid>
             <key>tooltip</key>
@@ -5956,7 +6172,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>35</integer>
+            <integer>31</integer>
             <key>tooltip</key>
             <string>The timescale for exponential decay of the linear motors magnitude.</string>
          </map>
@@ -6204,15 +6420,6 @@
             <key>tooltip</key>
             <string>An attempted write data to the key-value store failed due to the data quota being met.</string>
          </map>
-         <key>LSL_XP_ERROR_REQUEST_PERM_TIMEOUT</key>
-         <map>
-            <key>type</key>
-            <string>integer</string>
-            <key>value</key>
-            <integer>18</integer>
-            <key>tooltip</key>
-            <string>The request for experience permissions was ignored and timed out.</string>
-         </map>
          <key>XP_ERROR_RETRY_UPDATE</key>
          <map>
             <key>type</key>
@@ -6562,30 +6769,43 @@
          <key>experience_permissions</key>
          <map>
             <key>arguments</key>
-            <map>
-               <key>agent_id</key>
-               <map>
+            <array>
+              <map>
+                <key>agent_id</key>
+                <map>
                   <key>type</key>
                   <string>key</string>
                   <key>tooltip</key>
                   <string>ID of the agent approving permission for the Experience.</string>
-               </map>
-            </map>
+                </map>
+              </map>
+            </array>
          </map>
          <key>experience_permissions_denied</key>
          <map>
             <key>arguments</key>
-            <map>
-               <key>agent_id</key>
-               <map>
+            <array>
+              <map>
+                <key>agent_id</key>
+                <map>
                   <key>type</key>
                   <string>key</string>
                   <key>tooltip</key>
                   <string>ID of the agent denying permission for the Experience.</string>
-               </map>
-            </map>
+                </map>
+              </map>
+              <map>
+                <key>Reason</key>
+                <map>
+                  <key>type</key>
+                  <string>integer</string>
+                  <key>tooltip</key>
+                  <string>One of the XP_ERROR_... constants describing the reason why the Experience permissions were denied for the agent.</string>
+                </map>
+              </map>
+            </array>
             <key>tooltip</key>
-            <string>One of the XP_ERROR_... constants describing the reason why the Experience permissions were denied for the agent.</string>
+            <string>Describes why the Experience permissions were denied for the agent.</string>
          </map>
          <key>http_request</key>
          <map>
@@ -7281,15 +7501,17 @@
             <key>return</key>
             <string>integer</string>
             <key>arguments</key>
-            <map>
-               <key>AgentID</key>
-               <map>
+            <array>
+              <map>
+                <key>AgentID</key>
+                <map>
                   <key>type</key>
                   <string>key</string>
                   <key>tooltip</key>
                   <string></string>
-               </map>
-            </map>
+                </map>
+              </map>
+            </array>
             <key>tooltip</key>
             <string>
                Returns TRUE if the agent is in the Experience and the Experience can run in the current location.
@@ -8035,7 +8257,8 @@
             <key>return</key>
             <string>key</string>
             <key>arguments</key>
-            <map>
+            <array>
+              <map>
                <key>Key</key>
                <map>
                   <key>type</key>
@@ -8043,6 +8266,8 @@
                   <key>tooltip</key>
                   <string></string>
                </map>
+              </map>
+              <map>
                <key>Value</key>
                <map>
                   <key>type</key>
@@ -8050,7 +8275,8 @@
                   <key>tooltip</key>
                   <string></string>
                </map>
-            </map>
+              </map>
+            </array>
             <key>tooltip</key>
             <string>
                Starts an asychronous transaction to create a key-value pair. Will fail with XP_ERROR_STORAGE_EXCEPTION if the key already exists. The dataserver callback will be executed with the key returned from this call and a string describing the result. The result is a two element commma-delimited list. The first item is an integer specifying if the transaction succeeded (1) or not (0). In the failure case, the second item will be an integer corresponding to one of the XP_ERROR_... constants. In the success case the second item will be the value passed to the function.
@@ -8148,15 +8374,17 @@
             <key>return</key>
             <string>key</string>
             <key>arguments</key>
-            <map>
-               <key>Key</key>
-               <map>
+            <array>
+              <map>
+                <key>Key</key>
+                <map>
                   <key>type</key>
                   <string>string</string>
                   <key>tooltip</key>
                   <string></string>
-               </map>
-            </map>
+                </map>
+              </map>
+            </array>
             <key>tooltip</key>
             <string>
                Starts an asychronous transaction to delete a key-value pair. The dataserver callback will be executed with the key returned from this call and a string describing the result. The result is a two element commma-delimited list. The first item is an integer specifying if the transaction succeeded (1) or not (0). In the failure case, the second item will be an integer corresponding to one of the XP_ERROR_... constants. In the success case the second item will be the value associated with the key.
@@ -9549,15 +9777,17 @@
             <key>return</key>
             <string>list</string>
             <key>arguments</key>
-            <map>
-               <key>ExperienceID</key>
-               <map>
+            <array>
+              <map>
+                <key>ExperienceID</key>
+                <map>
                   <key>type</key>
                   <string>key</string>
                   <key>tooltip</key>
                   <string>May be NULL_KEY to retrieve the details for the script's Experience</string>
-               </map>
-            </map>
+                </map>
+              </map>
+            </array>
             <key>tooltip</key>
             <string>
                Returns a list with the following Experience properties: [Experience Name, Owner ID, Group ID, Experience ID, State, State Message]. State is an integer corresponding to one of the constants XP_ERROR_... and State Message is the string returned by llGetExperienceErrorMessage for that integer.
@@ -10782,7 +11012,7 @@
             <key>sleep</key>
             <real>0.0</real>
             <key>return</key>
-            <string>void</string>
+            <string>float</string>
             <key>arguments</key>
             <undef/>
             <key>tooltip</key>
@@ -11390,7 +11620,7 @@
             <key>sleep</key>
             <real>0.0</real>
             <key>return</key>
-            <string>void</string>
+            <string>integer</string>
             <key>arguments</key>
             <array>
                <map>
@@ -11937,22 +12167,26 @@
             <key>return</key>
             <string>key</string>
             <key>arguments</key>
-            <map>
-               <key>First</key>
-               <map>
+            <array>
+              <map>
+                <key>First</key>
+                <map>
                   <key>type</key>
                   <string>string</string>
                   <key>tooltip</key>
                   <string>Index of the first key to return.</string>
-               </map>
-               <key>Count</key>
-               <map>
+                </map>
+              </map>
+              <map>
+                <key>Count</key>
+                <map>
                   <key>type</key>
                   <string>string</string>
                   <key>tooltip</key>
                   <string>The number of keys to return.</string>
-               </map>
-            </map>
+                </map>
+              </map>
+            </array>
             <key>tooltip</key>
             <string>
                Starts an asychronous transaction the request a number of keys from the data store. The dataserver callback will be executed with the key returned from this call and a string describing the result. The result is commma-delimited list. The first item is an integer specifying if the transaction succeeded (1) or not (0). In the failure case, the second item will be an integer corresponding to one of the XP_ERROR_... constants. The error XP_ERROR_KEY_NOT_FOUND is returned if First is greater than or equal to the number of keys in the data store. In the success case the subsequent items will be the keys requested. The number of keys returned may be less than requested if the return value is too large or if there is not enough keys remaining. The order keys are returned is not guaranteed but is stable between subsequent calls as long as no keys are added or removed. Because the keys are returned in a comma-delimited list it is not recommended to use commas in key names if this function is used.
@@ -11981,7 +12215,7 @@
                   <key>Rules</key>
                   <map>
                      <key>type</key>
-                     <string>integer</string>
+                     <string>list</string>
                      <key>tooltip</key>
                      <string>Particle system rules list in the format [ rule1, data1, rule2, data2 . . . ruleN, dataN ]</string>
                   </map>
@@ -13141,6 +13375,15 @@
                      <string/>
                   </map>
                </map>
+               <map>
+                  <key>Bounce</key>
+                  <map>
+                     <key>type</key>
+                     <string>integer</string>
+                     <key>tooltip</key>
+                     <string/>
+                  </map>
+               </map>
                <map>
                   <key>Texture</key>
                   <map>
@@ -13159,6 +13402,15 @@
                      <string/>
                   </map>
                </map>
+               <map>
+                  <key>Bounce_Offset</key>
+                  <map>
+                     <key>type</key>
+                     <string>float</string>
+                     <key>tooltip</key>
+                     <string/>
+                  </map>
+               </map>
             </array>
             <key>tooltip</key>
             <string>Make a fountain of particles. Deprecated: Use llParticleSystem instead.\nMake a fountain of particles using texture from the objects inventory. Deprecated: Use llParticleSystem instead.</string>
@@ -13959,7 +14211,7 @@
             <key>sleep</key>
             <real>0.0</real>
             <key>return</key>
-            <string>void</string>
+            <string>float</string>
             <key>arguments</key>
             <array>
                <map>
@@ -14098,7 +14350,8 @@
             <key>return</key>
             <string>key</string>
             <key>arguments</key>
-            <map>
+            <array>
+              <map>
                <key>Key</key>
                <map>
                   <key>type</key>
@@ -14106,7 +14359,8 @@
                   <key>tooltip</key>
                   <string></string>
                </map>
-            </map>
+              </map>
+            </array>
             <key>tooltip</key>
             <string>
                Starts an asychronous transaction to retrieve the value associated with the key given. Will fail with XP_ERROR_KEY_NOT_FOUND if the key does not exist. The dataserver callback will be executed with the key returned from this call and a string describing the result. The result is a two element commma-delimited list. The first item is an integer specifying if the transaction succeeded (1) or not (0). In the failure case, the second item will be an integer corresponding to one of the XP_ERROR_... constants. In the success case the second item will be the value associated with the key.
@@ -14148,7 +14402,7 @@
                   <key>Text</key>
                   <map>
                      <key>type</key>
-                     <string>integer</string>
+                     <string>string</string>
                      <key>tooltip</key>
                      <string>Message to be transmitted.</string>
                   </map>
@@ -14541,22 +14795,26 @@
             <key>return</key>
             <string>void</string>
             <key>arguments</key>
-            <map>
-               <key>AvatarID</key>
-               <map>
+            <array>
+              <map>
+                <key>AvatarID</key>
+                <map>
                   <key>type</key>
                   <string>key</string>
                   <key>tooltip</key>
                   <string/>
-               </map>
-               <key>unused</key>
-               <map>
+                </map>
+              </map>
+              <map>
+                <key>unused</key>
+                <map>
                   <key>type</key>
                   <string>string</string>
                   <key>tooltip</key>
                   <string>Not used, should be &quot;&quot;</string>
-               </map>
-            </map>
+                </map>
+              </map>
+            </array>
             <key>tooltip</key>
             <string>
                Ask the agent for permission to participate in an experience. This request is similar to llRequestPermissions with the following permissions: PERMISSION_TAKE_CONTROLS, PERMISSION_TRIGGER_ANIMATION, PERMISSION_ATTACH, PERMISSION_TRACK_CAMERA, PERMISSION_CONTROL_CAMERA and PERMISSION_TELEPORT. However, unlike llRequestPermissions the decision to allow or block the request is persistent and applies to all scripts using the experience grid wide. Subsequent calls to llRequestExperiencePermissions from scripts in the experience will receive the same response automatically with no user interaction. One of experience_permissions or experience_permissions_denied will be generated in response to this call. Outstanding permission requests will be lost if the script is derezzed, moved to another region or reset.
@@ -17363,7 +17621,7 @@
                   <key>ParameterValue</key>
                   <map>
                      <key>type</key>
-                     <string>float</string>
+                     <string>rotation</string>
                      <key>tooltip</key>
                      <string/>
                   </map>
@@ -17418,7 +17676,7 @@
                   <key>ParameterValue</key>
                   <map>
                      <key>type</key>
-                     <string>float</string>
+                     <string>vector</string>
                      <key>tooltip</key>
                      <string/>
                   </map>
@@ -18487,36 +18745,44 @@
             <key>return</key>
             <string>key</string>
             <key>arguments</key>
-            <map>
-               <key>Key</key>
-               <map>
+            <array>
+              <map>
+                <key>Key</key>
+                <map>
                   <key>type</key>
                   <string>string</string>
                   <key>tooltip</key>
                   <string></string>
-               </map>
-               <key>Value</key>
-               <map>
+                </map>
+              </map>
+              <map>
+                <key>Value</key>
+                <map>
                   <key>type</key>
                   <string>string</string>
                   <key>tooltip</key>
                   <string></string>
-               </map>
-               <key>Checked</key>
-               <map>
+                </map>
+              </map>
+              <map>
+                <key>Checked</key>
+                <map>
                   <key>type</key>
                   <string>integer</string>
                   <key>tooltip</key>
                   <string></string>
-               </map>
-               <key>OriginalValue</key>
-               <map>
+                </map>
+              </map>
+              <map>
+                <key>OriginalValue</key>
+                <map>
                   <key>type</key>
                   <string>string</string>
                   <key>tooltip</key>
                   <string></string>
-               </map>
-            </map>
+                </map>
+              </map>
+            </array>
             <key>tooltip</key>
             <string>
                Starts an asychronous transaction to update the value associated with the key given. The dataserver callback will be executed with the key returned from this call and a string describing the result. The result is a two element commma-delimited list. The first item is an integer specifying if the transaction succeeded (1) or not (0). In the failure case, the second item will be an integer corresponding to one of the XP_ERROR_... constants. In the success case the second item will be the value associated with the key. If Checked is 1 the existing value in the data store must match the OriginalValue passed or XP_ERROR_RETRY_UPDATE will be returned. If Checked is 0 the key will be created if necessary.
@@ -18868,31 +19134,8 @@
             <key>tooltip</key>
             <string>Returns the largest multiplicative uniform scale factor that can be successfully applied (via llScaleByFactor()) to the object without violating prim size or linkability rules.</string>
          </map>
-         <key>llScaleByFactor</key>
-         <map>
-            <key>energy</key>
-            <real>10.0</real>
-            <key>sleep</key>
-            <real>0.0</real>
-            <key>return</key>
-            <string>float</string>
-            <key>arguments</key>
-            <array>
-               <map>
-                  <key>Factor</key>
-                  <map>
-                     <key>type</key>
-                     <string>float</string>
-                     <key>tooltip</key>
-                     <string/>
-                  </map>
-               </map>
-            </array>
-            <key>tooltip</key>
-            <string>Tries to uniformly scale the object by a multiplicative factor.  Returns TRUE on success or FALSE on failure.</string>
-         </map>
       </map>
       <key>llsd-lsl-syntax-version</key>
-      <integer>2</integer>
+      <integer>2</integer><!-- increment only when the file format changes, not just the content -->
    </map>
 </llsd>
-- 
cgit v1.2.3


From 6fb759b4b5bf12d78013bf7cc97ee79d728c2cd4 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 12 Jul 2016 07:56:11 -0400
Subject: update default LSL hints file to match the server version

---
 .../newview/app_settings/keywords_lsl_default.xml  | 30 ++++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml
index bb23ec04dc..d641883d5a 100644
--- a/indra/newview/app_settings/keywords_lsl_default.xml
+++ b/indra/newview/app_settings/keywords_lsl_default.xml
@@ -1007,7 +1007,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>0x800</integer>
+            <string>0x800</string>
             <key>tooltip</key>
             <string/>
          </map>
@@ -1617,7 +1617,7 @@
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>0x0A0x0A0x0A</string>
+            <string>\\n\\n\\n</string>
             <key>tooltip</key>
             <string>Indicates the last line of a notecard was read.</string>
          </map>
@@ -5511,7 +5511,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>0x40</integer>
+            <string>0x40</string>
             <key>tooltip</key>
             <string>Controls whether the object can be grabbed.\nA grab is the default action when in third person, and is available as the hand tool in build mode. This is useful for physical objects that you don't want other people to be able to trivially disturb. The default is FALSE</string>
          </map>
@@ -5520,7 +5520,7 @@
             <key>type</key>
             <string>integer</string>
             <key>value</key>
-            <integer>0x400</integer>
+            <string>0x400</string>
             <key>tooltip</key>
             <string>Prevent click-and-drag movement on all prims in the object.</string>
          </map>
@@ -9802,15 +9802,17 @@
             <key>return</key>
             <string>string</string>
             <key>arguments</key>
-            <map>
-               <key>Error</key>
-               <map>
+            <array>
+              <map>
+                <key>Error</key>
+                <map>
                   <key>type</key>
                   <string>integer</string>
                   <key>tooltip</key>
                   <string>An Experience error code to translate.</string>
-               </map>
-            </map>
+                </map>
+              </map>
+            </array>
             <key>tooltip</key>
             <string>
                Returns a string describing the error code passed or the string corresponding with XP_ERROR_UNKNOWN_ERROR if the value is not a valid Experience error code.
@@ -10160,7 +10162,7 @@
                   <key>Parameters</key>
                   <map>
                      <key>type</key>
-                     <string>integer</string>
+                     <string>list</string>
                      <key>tooltip</key>
                      <string>A list of PRIM_* property constants to return values of.</string>
                   </map>
@@ -10251,7 +10253,7 @@
                   <key>Parameters</key>
                   <map>
                      <key>type</key>
-                     <string>integer</string>
+                     <string>list</string>
                      <key>tooltip</key>
                      <string>PRIM_* flags.</string>
                   </map>
@@ -12172,7 +12174,7 @@
                 <key>First</key>
                 <map>
                   <key>type</key>
-                  <string>string</string>
+                  <string>integer</string>
                   <key>tooltip</key>
                   <string>Index of the first key to return.</string>
                 </map>
@@ -12181,7 +12183,7 @@
                 <key>Count</key>
                 <map>
                   <key>type</key>
-                  <string>string</string>
+                  <string>integer</string>
                   <key>tooltip</key>
                   <string>The number of keys to return.</string>
                 </map>
@@ -14797,7 +14799,7 @@
             <key>arguments</key>
             <array>
               <map>
-                <key>AvatarID</key>
+                <key>AgentID</key>
                 <map>
                   <key>type</key>
                   <string>key</string>
-- 
cgit v1.2.3


From 1e6d9ba4be8333293841fa35e7650f59adcc245d Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 18 Aug 2016 11:31:16 -0400
Subject: MAINT-6647 - make SLM files even more dead.

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8735ca6026..0a9f1a44f0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6440,7 +6440,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
   <key>MeshUploadLogXML</key>
   <map>
-- 
cgit v1.2.3


From 5fb30e5ad3615c0b0e9e67a94542dbb110e9ed95 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 11 Nov 2016 09:37:45 -0500
Subject: MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the
 skinned matrix and translation into a single mat3x4 for optimal data transfer
 to reduce uniform slot usage.

---
 .../shaders/class1/avatar/objectSkinV.glsl         | 34 +++++++++-------------
 1 file changed, 14 insertions(+), 20 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index 8f754fe82b..90bf2851c9 100644
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -24,11 +24,7 @@
 
 ATTRIBUTE vec4 weight4;  
 
-/* BENTO JOINT COUNT LIMITS
- * Note that the value in these two lines also needs to be updated to value-1 several places below.
- */
-uniform mat3 matrixPalette[MAX_JOINTS_PER_MESH_OBJECT];
-uniform vec3 translationPalette[MAX_JOINTS_PER_MESH_OBJECT];
+uniform mat3x4 matrixPalette[MAX_JOINTS_PER_MESH_OBJECT];
 
 mat4 getObjectSkinnedTransform()
 {
@@ -37,8 +33,8 @@ mat4 getObjectSkinnedTransform()
 	vec4 w = fract(weight4);
 	vec4 index = floor(weight4);
 	
-		 index = min(index, vec4(MAX_JOINTS_PER_MESH_OBJECT-1));
-		 index = max(index, vec4( 0.0));
+    index = min(index, vec4(MAX_JOINTS_PER_MESH_OBJECT-1));
+    index = max(index, vec4( 0.0));
 
     w *= 1.0/(w.x+w.y+w.z+w.w);
 	
@@ -46,16 +42,16 @@ mat4 getObjectSkinnedTransform()
 	int i2 = int(index.y);
 	int i3 = int(index.z);
 	int i4 = int(index.w);
-		
-	mat3 mat  = matrixPalette[i1]*w.x;
-		 mat += matrixPalette[i2]*w.y;
-		 mat += matrixPalette[i3]*w.z;
-		 mat += matrixPalette[i4]*w.w;
 
-	vec3 trans = translationPalette[i1]*w.x;
-	trans += translationPalette[i2]*w.y;
-	trans += translationPalette[i3]*w.z;
-	trans += translationPalette[i4]*w.w;
+	mat3 mat = mat3(matrixPalette[i1])*w.x;
+		 mat += mat3(matrixPalette[i2])*w.y;
+		 mat += mat3(matrixPalette[i3])*w.z;
+		 mat += mat3(matrixPalette[i4])*w.w;
+
+	vec3 trans = vec3(matrixPalette[i1][0].w,matrixPalette[i1][1].w,matrixPalette[i1][2].w)*w.x;
+		 trans += vec3(matrixPalette[i2][0].w,matrixPalette[i2][1].w,matrixPalette[i2][2].w)*w.y;
+		 trans += vec3(matrixPalette[i3][0].w,matrixPalette[i3][1].w,matrixPalette[i3][2].w)*w.z;
+		 trans += vec3(matrixPalette[i4][0].w,matrixPalette[i4][1].w,matrixPalette[i4][2].w)*w.w;
 
 	mat4 ret;
 
@@ -68,10 +64,8 @@ mat4 getObjectSkinnedTransform()
 
 #ifdef IS_AMD_CARD
    // If it's AMD make sure the GLSL compiler sees the arrays referenced once by static index. Otherwise it seems to optimise the storage awawy which leads to unfun crashes and artifacts.
-   mat3 dummy1 = matrixPalette[0];
-   vec3 dummy2 = translationPalette[0];
-   mat3 dummy3 = matrixPalette[MAX_JOINTS_PER_MESH_OBJECT-1];
-   vec3 dummy4 = translationPalette[MAX_JOINTS_PER_MESH_OBJECT-1];
+   mat3x4 dummy1 = matrixPalette[0];
+   mat3x4 dummy2 = matrixPalette[MAX_JOINTS_PER_MESH_OBJECT-1];
 #endif
 
 }
-- 
cgit v1.2.3