diff options
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/settings.xml | 194 |
1 files changed, 127 insertions, 67 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 15f6fe5649..4912f27e70 100755..100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8372,21 +8372,10 @@ <key>Value</key> <integer>1</integer> </map> - <key>RenderAvatarComplexityLimit</key> - <map> - <key>Comment</key> - <string>Max visual complexity of avatars in a scene</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>-1</integer> - </map> <key>RenderComplexityColorMin</key> <map> <key>Comment</key> - <string>Max visual complexity of avatars in a scene</string> + <string>Unused obsolete setting</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -8402,7 +8391,7 @@ <key>RenderComplexityColorMid</key> <map> <key>Comment</key> - <string>Max visual complexity of avatars in a scene</string> + <string>Unused obsolete setting</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -8418,7 +8407,7 @@ <key>RenderComplexityColorMax</key> <map> <key>Comment</key> - <string>Max visual complexity of avatars in a scene</string> + <string>Unused obsolete setting</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -8434,7 +8423,7 @@ <key>RenderComplexityThreshold</key> <map> <key>Comment</key> - <string>Only color objects higher than render threshold</string> + <string>Unused obsolete setting</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -8445,8 +8434,7 @@ <key>RenderComplexityStaticMax</key> <map> <key>Comment</key> - <string>Sets a static max value for scaling of RenderComplexity - display (-1 for dynamic scaling)</string> + <string>Unused obsolete setting</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -8468,13 +8456,13 @@ <key>RenderAvatarMaxVisible</key> <map> <key>Comment</key> - <string>Maximum number of avatars to display at any one time</string> + <string>OBSOLETE and UNUSED. See RenderAvatarMaxNonImpostors</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>S32</string> <key>Value</key> - <integer>12</integer> + <integer>0</integer> </map> <key>RenderAvatarPhysicsLODFactor</key> <map> @@ -9907,13 +9895,13 @@ <key>RenderTerrainDetail</key> <map> <key>Comment</key> - <string>Detail applied to terrain texturing (0 = none, 1 or 2 = full)</string> + <string>Detail applied to terrain texturing (0 = none, 1 = full)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>S32</string> <key>Value</key> - <integer>2</integer> + <integer>1</integer> </map> <key>RenderTerrainLODFactor</key> <map> @@ -10025,66 +10013,79 @@ <key>Value</key> <integer>0</integer> </map> - <key>RenderUseFarClip</key> - <map> - <key>Comment</key> - <string>If false, frustum culling will ignore far clip plane.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>RenderUseImpostors</key> - <map> - <key>Comment</key> - <string>Whether we want to use impostors for far away avatars.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - - <key>RenderAutoMuteByteLimit</key> + <key>RenderUseFarClip</key> <map> <key>Comment</key> - <string>Maximum bytes of attachments before an avatar is rendered as a simple impostor (0 for no limit).</string> + <string>If false, frustum culling will ignore far clip plane.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>RenderUseImpostors</key> + <map> + <key>Comment</key> + <string>OBSOLETE and UNUSED. See RenderAvatarMaxNonImpostors and RenderAvatarMaxComplexity.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>RenderAutoMuteByteLimit</key> + <map> + <key>Comment</key> + <string>OBSOLETE and UNUSED.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> <string>U32</string> <key>Value</key> <integer>0</integer> </map> - <key>RenderAutoMuteRenderWeightLimit</key> + <key>RenderAvatarMaxNonImpostors</key> <map> <key>Comment</key> - <string>Maximum render weight before an avatar is rendered as a simple impostor (0 to not use this limit).</string> + <string>Maximum number of avatars to fully render at one time; + over this limit uses impostor rendering (simplified rendering + with less frequent updates), reducing client lag.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>U32</string> <key>Value</key> + <integer>12</integer> + </map> + <key>RenderAutoMuteRenderWeightLimit</key> + <map> + <key>Comment</key> + <string>OBSOLETE. This setting has been renamed RenderAvatarMaxNonImpostors.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> <integer>0</integer> </map> - <key>RenderAutoMuteSurfaceAreaLimit</key> + <key>ShowMyComplexityChanges</key> <map> <key>Comment</key> - <string>Maximum surface area of attachments before an avatar is rendered as a simple impostor (0 to not use this limit).</string> + <string>How long to show notices about avatar complexity (set to zero to disable those notices)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>F32</string> + <string>U32</string> <key>Value</key> - <integer>0</integer> + <integer>10</integer> </map> - <key>RenderAutoMuteFunctions</key> + <key>RenderAvatarMaxComplexity</key> <map> <key>Comment</key> - <string>Developing feature to render some avatars using simple impostors or colored silhouettes. (Set to 7 for all functionality)</string> + <string>Maximum Avatar Complexity; above this value, the avatar is + rendered as a solid color outline (0 to disable this limit).</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -10092,6 +10093,19 @@ <key>Value</key> <integer>0</integer> </map> + <key>RenderAutoMuteSurfaceAreaLimit</key> + <map> + <key>Comment</key> + <string>Maximum surface area of attachments before an avatar is + rendered as a simple impostor (to not use this limit, set to zero + or set RenderAvatarMaxComplexity to zero).</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>1000.0</real> + </map> <key>RenderAutoMuteLogging</key> <map> <key>Comment</key> @@ -10112,7 +10126,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>0</integer> + <real>10.0E6</real> </map> <key>RenderVBOEnable</key> @@ -10699,17 +10713,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>ShowAdvancedGraphicsSettings</key> - <map> - <key>Comment</key> - <string>Show advanced graphics settings</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>ShowAllObjectHoverTip</key> <map> <key>Comment</key> @@ -11062,6 +11065,28 @@ <key>Value</key> <integer>1</integer> </map> + <key>FriendsListHideUsernames</key> + <map> + <key>Comment</key> + <string>Show both Display name and Username in Friend list</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>NearbyListHideUsernames</key> + <map> + <key>Comment</key> + <string>Show both Display name and Username in Nearby list</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>NearbyListShowMap</key> <map> <key>Comment</key> @@ -15783,6 +15808,41 @@ <key>Value</key> <integer>0</integer> </map> + <key>PresetGraphicActive</key> + <map> + <key>Comment</key> + <string>Name of currently selected preference</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> + <key>IndirectMaxComplexity</key> + <map> + <key>Comment</key> + <string>Controls RenderAvatarMaxComplexity in a non-linear fashion (do + not set this value)</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>IndirectMaxNonImpostors</key> + <map> + <key>Comment</key> + <string>Controls RenderAvatarMaxNonImpostors in a non-linear fashion (do + not set this value)</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> |