merge

5 files changed, 113 insertions, 85 deletions

diff --git a/indra/newview/app_settings/filters/BlackAndWhite.xml b/indra/newview/app_settings/filters/BlackAndWhite.xml
index 101ed8233a..7894628d29 100644
--- a/indra/newview/app_settings/filters/BlackAndWhite.xml
+++ b/indra/newview/app_settings/filters/BlackAndWhite.xml
@@ -1,20 +1,6 @@
 <llsd>
     <array>
         <array>
-            <string>linearize</string>
-            <real>0.01</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>contrast</string>
-            <real>0.8</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
             <string>grayscale</string>
         </array>
     </array>
diff --git a/indra/newview/app_settings/filters/Sepia.xml b/indra/newview/app_settings/filters/Sepia.xml
index 3d577b2998..81d7caf0eb 100644
--- a/indra/newview/app_settings/filters/Sepia.xml
+++ b/indra/newview/app_settings/filters/Sepia.xml
@@ -1,31 +1,6 @@
 <llsd>
     <array>
         <array>
-            <string>linearize</string>
-            <real>0.01</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>contrast</string>
-            <real>0.8</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>stencil</string>
-            <string>vignette</string>
-            <string>fade</string>
-            <real>0.5</real>
-            <real>1.0</real>
-            <real>0.0</real>
-            <real>0.0</real>
-            <real>1.0</real>
-            <real>4.0</real>
-        </array>
-        <array>
             <string>sepia</string>
         </array>
     </array>
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 17c70ef1c5..4972472f67 100755
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -628,22 +628,22 @@ RCERR_CAST_TIME_EXCEEDED    TODO: add documentation
 RCERR_SIM_PERF_LOW          TODO: add documentation
 RCERR_UNKNOWN               TODO: add documentation
 
-ESTATE_ACCESS_ALLOWED_AGENT_ADD    TODO: add documentation
-ESTATE_ACCESS_ALLOWED_AGENT_REMOVE TODO: add documentation
-ESTATE_ACCESS_ALLOWED_GROUP_ADD    TODO: add documentation
-ESTATE_ACCESS_ALLOWED_GROUP_REMOVE TODO: add documentation
-ESTATE_ACCESS_BANNED_AGENT_ADD     TODO: add documentation
-ESTATE_ACCESS_BANNED_AGENT_REMOVE  TODO: add documentation
+ESTATE_ACCESS_ALLOWED_AGENT_ADD    Passed to llManageEstateAccess to add the agent to this estate's Allowed Residents list
+ESTATE_ACCESS_ALLOWED_AGENT_REMOVE Passed to llManageEstateAccess to remove the agent from this estate's Allowed Residents list
+ESTATE_ACCESS_ALLOWED_GROUP_ADD    Passed to llManageEstateAccess to add the group to this estate's Allowed groups list
+ESTATE_ACCESS_ALLOWED_GROUP_REMOVE Passed to llManageEstateAccess to remove the group from this estate's Allowed groups list 
+ESTATE_ACCESS_BANNED_AGENT_ADD     Passed to llManageEstateAccess to add the agent to this estate's Banned residents list
+ESTATE_ACCESS_BANNED_AGENT_REMOVE  Passed to llManageEstateAccess to remove the agent from this estate's Banned residents list
 
 DENSITY 			TODO: add documentation
 FRICTION 			TODO: add documentation
 RESTITUTION 		TODO: add documentation
 GRAVITY_MULTIPLIER 	TODO: add documentation
 
-KFM_COMMAND			TODO: add documentation
-KFM_CMD_PLAY		TODO: add documentation
-KFM_CMD_STOP		TODO: add documentation
-KFM_CMD_PAUSE		TODO: add documentation
+KFM_COMMAND			Command used in the options parameter of llSetKeyframedMotion, followed by one of: KFM_CMD_STOP, KFM_CMD_PLAY, KFM_CMD_PAUSE to play, stop or pause the motion
+KFM_CMD_PLAY		Command used in the options parameter llSetKeyframedMotion. Resumes the animation previously stopped by KFM_CMD_STOP or KFM_CMD_PAUSE
+KFM_CMD_STOP		Command used in the options parameter llSetKeyframedMotion. Stops the animation and resets it at the start of motion
+KFM_CMD_PAUSE		Command used in the options parameter llSetKeyframedMotion. Stops the animation but doesn t reset it at the start of motion. 
 KFM_CMD_SET_MODE	TODO: add documentation
 KFM_MODE			TODO: add documentation
 KFM_FORWARD			TODO: add documentation
@@ -657,18 +657,18 @@ KFM_TRANSLATION		TODO: add documentation
 CHARACTER_CMD_STOP	TODO: add documentation
 CHARACTER_CMD_JUMP	TODO: add documentation
 
-CHARACTER_DESIRED_SPEED		TODO: add documentation
-CHARACTER_RADIUS			TODO: add documentation
-CHARACTER_LENGTH			TODO: add documentation
-CHARACTER_ORIENTATION		TODO: add documentation
-CHARACTER_AVOIDANCE_MODE	TODO: add documentation
+CHARACTER_DESIRED_SPEED		Constant used to indicate that the following argument is the desired speed for a Pathfinding character.
+CHARACTER_RADIUS			Constant used to indicate that the following argument is the radius of the capsule for a Pathfinding character. 
+CHARACTER_LENGTH			Constant used to indicate that the following argument is the length of the capsule for a Pathfinding character. 
+CHARACTER_ORIENTATION		Constant used to indicate that the following argument is the orientation of the capsule for a Pathfinding character. 
+CHARACTER_AVOIDANCE_MODE	Allows you to specify that a character should not try to avoid other characters, should not try to avoid dynamic obstacles, or both. Is combined with a mask bit flags
 PURSUIT_OFFSET				TODO: add documentation
 REQUIRE_LINE_OF_SIGHT		TODO: add documentation
 PURSUIT_FUZZ_FACTOR			TODO: add documentation
 PURSUIT_INTERCEPT			TODO: add documentation
 FORCE_DIRECT_PATH			TODO: add documentation
-VERTICAL					TODO: add documentation
-HORIZONTAL					TODO: add documentation
+VERTICAL					Constant to indicate that the orientation of the capsule for a Pathfinding character is vertical. 
+HORIZONTAL					Constant to indicate that the orientation of the capsule for a Pathfinding character is horizontal. 
 AVOID_CHARACTERS			TODO: add documentation
 AVOID_DYNAMIC_OBSTACLES		TODO: add documentation
 
@@ -683,12 +683,12 @@ PU_FAILURE_UNREACHABLE           Goal is no longer reachable for some reason - e
 PU_GOAL_REACHED                  Character has reached the goal and will stop or choose a new goal (if wandering).
 PU_SLOWDOWN_DISTANCE_REACHED     Character is near current goal.
 
-CHARACTER_TYPE			TODO: add documentation
-CHARACTER_TYPE_A		TODO: add documentation
-CHARACTER_TYPE_B		TODO: add documentation
-CHARACTER_TYPE_C		TODO: add documentation
-CHARACTER_TYPE_D		TODO: add documentation
-CHARACTER_TYPE_NONE		TODO: add documentation
+CHARACTER_TYPE			Specifies which walkability coefficient will be used by this character. Used in combination with one of the character type flags.
+CHARACTER_TYPE_A		Used for character types that you prefer move in a way consistent with humanoids. 
+CHARACTER_TYPE_B		Used for character types that you prefer move in a way consistent with wild animals or off road vehicles. 
+CHARACTER_TYPE_C		Used for mechanical character types or road going vehicles. 
+CHARACTER_TYPE_D		Used for character types that are not consistent with the A, B, or C type. 
+CHARACTER_TYPE_NONE		Used to set no specific character type. 
 
 TRAVERSAL_TYPE			TODO: add documentation
 TRAVERSAL_TYPE_SLOW		TODO: add documentation
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bd035899d0..dfd8e80361 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -80,7 +80,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AgentPause</key>
     <map>
@@ -4196,6 +4196,17 @@
       <key>Value</key>
       <integer>255</integer>
     </map>
+    <key>ForceLoginURL</key>
+    <map>
+      <key>Comment</key>
+      <string>Force a specified URL for login page content - used if exists</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string></string>
+    </map>
     <key>ForceShowGrid</key>
     <map>
       <key>Comment</key>
@@ -4471,6 +4482,28 @@
       <key>Value</key>
       <string />
     </map>
+    <key>HttpPipelining</key>
+    <map>
+      <key>Comment</key>
+      <string>If true, viewer will attempt to pipeline HTTP requests.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>HttpRangeRequestsDisable</key>
+    <map>
+      <key>Comment</key>
+      <string>If true, viewer will not issue GET requests with 'Range:' headers for meshes and textures.  May resolve problems with certain ISPs and networking gear.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>IMShowTimestamps</key>
     <map>
       <key>Comment</key>
@@ -5329,6 +5362,18 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+  <key>LoginContentVersion</key>
+  <map>
+    <key>Comment</key>
+    <string>Version of login page web based content to display</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>2</string>
+  </map>
+
   <key>LoginSRVTimeout</key>
   <map>
     <key>Comment</key>
@@ -6133,16 +6178,16 @@
     <integer>0</integer>
   </map>
   <key>MemoryLogFrequency</key>
-  <map>
-    <key>Comment</key>
-    <string>Seconds between display of Memory in log (0 for never)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>F32</string>
-    <key>Value</key>
+        <map>
+        <key>Comment</key>
+            <string>Seconds between display of Memory in log (0 for never)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
     <real>30.0</real>
-  </map>
+        </map>
     <key>MemoryPrivatePoolEnabled</key>
     <map>
       <key>Comment</key>
@@ -11467,17 +11512,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>SnapshotFiltersEnabled</key>
-    <map>
-        <key>Comment</key>
-        <string>Enable filters in the Snapshot Advanced panel (experimental).</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>Boolean</string>
-        <key>Value</key>
-        <integer>0</integer>
-    </map>
     <key>SnapshotFormat</key>
     <map>
       <key>Comment</key>
@@ -13227,7 +13261,7 @@
       <key>Value</key>
       <string>Default</string>
     </map>
-    <key>UseExternalBrowser</key>
+    <key>UseExternalBrowser</key> <!-- deprecated (see MAINT-4127) -->
     <map>
       <key>Comment</key>
       <string>Use default browser when opening web pages instead of in-world browser.</string>
@@ -13238,6 +13272,17 @@
       <key>Value</key>
       <boolean>1</boolean>
     </map>
+    <key>PreferredBrowserBehavior</key>
+    <map>
+      <key>Comment</key>
+      <string>Use system browser for any links (0), use builtin browser for SL links and system one for others (1) or use builtin browser only (2).</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>UseFreezeFrame</key>
     <map>
       <key>Comment</key>
@@ -14228,6 +14273,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LeaveMouselook</key>
+    <map>
+      <key>Comment</key>
+      <string>Exit Mouselook mode via S or Down Arrow keys while sitting </string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>TextureLoggingThreshold</key>
     <map>
       <key>Comment</key>
@@ -15466,6 +15522,17 @@
       <key>Value</key>
       <string />
     </map>
+  <key>WearFolderLimit</key>
+  <map>
+    <key>Comment</key>
+    <string>Limits number of items in the folder that can be replaced/added to current outfit</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>125</integer>
+  </map>
     <key>EveryoneCopy</key>
       <map>
         <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 500151c935..fc6f1f6395 100755
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -312,7 +312,7 @@
         <key>Type</key>
              <string>Boolean</string>
         <key>Value</key>
-             <integer>0</integer>
+             <integer>1</integer>
         </map>
     <!-- End of back compatibility settings -->
     </map>