summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/high_graphics.xml6
-rwxr-xr-xindra/newview/app_settings/keywords.ini20
-rwxr-xr-xindra/newview/app_settings/low_graphics.xml8
-rwxr-xr-xindra/newview/app_settings/mid_graphics.xml6
-rwxr-xr-xindra/newview/app_settings/settings.xml290
-rwxr-xr-xindra/newview/app_settings/settings_per_account.xml2
-rwxr-xr-xindra/newview/app_settings/ultra_graphics.xml7
7 files changed, 197 insertions, 142 deletions
diff --git a/indra/newview/app_settings/high_graphics.xml b/indra/newview/app_settings/high_graphics.xml
index 5bc2e1b7e6..4e7c0fa914 100755
--- a/indra/newview/app_settings/high_graphics.xml
+++ b/indra/newview/app_settings/high_graphics.xml
@@ -26,8 +26,10 @@
<RenderTerrainLODFactor value="2"/>
<!--Default for now-->
<RenderTreeLODFactor value="0.5"/>
- <!--Try Impostors-->
- <RenderUseImpostors value="TRUE"/>
+ <!--Avater Impostors and Visual Muting Limits-->
+ <RenderAvatarMaxNonImpostors value="20"/>
+ <RenderAvatarMaxComplexity value="350000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="300"/>
<!--Default for now-->
<RenderVolumeLODFactor value="1.125"/>
<!--NO SHADERS-->
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 4972472f67..9699eda96b 100755
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -52,6 +52,7 @@ remote_data remote_data(integer event_type, key channel, key message_id, str
http_response http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
http_request http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
+
# integer constants
[word .1, .1, .5]
TRUE Integer constant for Boolean operations
@@ -714,6 +715,25 @@ TEXTURE_TRANSPARENT UUID for the "White - Transparent" texture
URL_REQUEST_GRANTED Used with http_request when a public URL is successfully granted
URL_REQUEST_DENIED Used with http_request when a public URL is not available
+XP_ERROR_NONE No error was detected
+XP_ERROR_THROTTLED The call failed due to too many recent calls.
+XP_ERROR_EXPERIENCES_DISABLED The region currently has experiences disabled.
+XP_ERROR_INVALID_PARAMETERS One of the string arguments was too big to fit in the key-value store.
+XP_ERROR_NOT_PERMITTED This experience is not allowed to run on the current region.
+XP_ERROR_NO_EXPERIENCE This script is not associated with an experience.
+XP_ERROR_NOT_FOUND The sim was unable to verify the validity of the experience. Retrying after a short wait is advised.
+XP_ERROR_INVALID_EXPERIENCE The script is associated with an experience that no longer exists.
+XP_ERROR_EXPERIENCE_DISABLED The experience owner has temporarily disabled the experience.
+XP_ERROR_EXPERIENCE_SUSPENDED The experience has been suspended by Linden Customer Support.
+XP_ERROR_QUOTA_EXCEEDED An attempted write data to the key-value store failed due to the data quota being met.
+XP_ERROR_STORE_DISABLED The key-value store is currently disabled on this region.
+XP_ERROR_STORAGE_EXCEPTION Unable to communicate with the key-value store.
+XP_ERROR_KEY_NOT_FOUND The requested key does not exist.
+XP_ERROR_RETRY_UPDATE A checked update failed due to an out of date request.
+XP_ERROR_MATURITY_EXCEEDED The request failed due to agent content preferences.
+XP_ERROR_UNKNOWN_ERROR Other unknown error.
+
+
# float constants
[word .3, .1, .5]
PI 3.1415926535897932384626433832795
diff --git a/indra/newview/app_settings/low_graphics.xml b/indra/newview/app_settings/low_graphics.xml
index ca1dae0b86..b98d681018 100755
--- a/indra/newview/app_settings/low_graphics.xml
+++ b/indra/newview/app_settings/low_graphics.xml
@@ -7,7 +7,7 @@
<!--Default for now-->
<RenderAvatarPhysicsLODFactor value="0.0"/>
<!--Default for now-->
- <RenderAvatarMaxVisible value="3"/>
+ <RenderAvatarMaxNonImpostors value="10"/>
<!--NO SHADERS-->
<RenderAvatarVP value="FALSE"/>
<!--Short Range-->
@@ -28,8 +28,10 @@
<RenderTerrainLODFactor value="1.0"/>
<!--Default for now-->
<RenderTreeLODFactor value="0.5"/>
- <!--Try Impostors-->
- <RenderUseImpostors value="TRUE"/>
+ <!--Avater Impostors and Visual Muting Limits-->
+ <RenderAvatarMaxNonImpostors value="12"/>
+ <RenderAvatarMaxComplexity value="75000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="150"/>
<!--Default for now-->
<RenderVolumeLODFactor value="1.125"/>
<!--NO SHADERS-->
diff --git a/indra/newview/app_settings/mid_graphics.xml b/indra/newview/app_settings/mid_graphics.xml
index 01822fe64c..fad48f9683 100755
--- a/indra/newview/app_settings/mid_graphics.xml
+++ b/indra/newview/app_settings/mid_graphics.xml
@@ -26,8 +26,10 @@
<RenderTerrainLODFactor value="1.0"/>
<!--Default for now-->
<RenderTreeLODFactor value="0.5"/>
- <!--Try Impostors-->
- <RenderUseImpostors value="TRUE"/>
+ <!--Avater Impostors and Visual Muting Limits-->
+ <RenderAvatarMaxNonImpostors value="18"/>
+ <RenderAvatarMaxComplexity value="100000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="200"/>
<!--Default for now-->
<RenderVolumeLODFactor value="1.125"/>
<!--NO SHADERS-->
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 138bdde9e9..272b609d9d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -47,7 +47,18 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>300</real>
+ <real>300.0</real>
+ </map>
+ <key>AckCollectTime</key>
+ <map>
+ <key>Comment</key>
+ <string>Ack messages collection and grouping time</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.1</real>
</map>
<key>AdminMenu</key>
<map>
@@ -69,7 +80,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>1</real>
+ <real>1.0</real>
</map>
<key>AdvanceSnapshot</key>
<map>
@@ -1640,7 +1651,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>100</real>
+ <integer>100</integer>
</map>
<key>ChatLoadGroupTimeout</key>
<map>
@@ -4249,7 +4260,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>3</real>
+ <real>3.0</real>
</map>
<key>FullScreenAutoDetectAspectRatio</key>
<map>
@@ -5019,6 +5030,7 @@
<key>Type</key>
<string>LLSD</string>
<key>Value</key>
+ <array/>
</map>
<key>LSLFindCaseInsensitivity</key>
<map>
@@ -6263,7 +6275,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>MeshEnabled</key>
<map>
@@ -6274,7 +6286,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>1</real>
+ <integer>1</integer>
</map>
<key>MeshImportUseSLM</key>
<map>
@@ -6285,7 +6297,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>1</real>
+ <integer>1</integer>
</map>
<key>MeshUploadLogXML</key>
<map>
@@ -6296,7 +6308,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>MeshUploadFakeErrors</key>
<map>
@@ -6307,7 +6319,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>MeshUploadTimeOut</key>
<map>
@@ -6318,7 +6330,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>600</real>
+ <integer>600</integer>
</map>
<key>MigrateCacheDirectory</key>
<map>
@@ -8217,17 +8229,6 @@
<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>
@@ -8313,13 +8314,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>
@@ -8542,7 +8543,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>64</real>
+ <real>64.0</real>
</map>
<key>RenderCubeMap</key>
<map>
@@ -8678,7 +8679,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>RenderEdgeDepthCutoff</key>
@@ -8724,7 +8725,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>4</real>
+ <real>4.0</real>
</map>
<key>RenderDeferredSpotShadowBias</key>
<map>
@@ -8791,7 +8792,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0</real>
+ <real>0.0</real>
</map>
<key>RenderDepthPrePass</key>
@@ -8985,7 +8986,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>RenderSpecularResX</key>
@@ -8997,7 +8998,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>1024</real>
+ <integer>1024</integer>
</map>
<key>RenderSpecularResY</key>
@@ -9009,7 +9010,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>256</real>
+ <integer>256</integer>
</map>
<key>RenderSpecularExponent</key>
@@ -9165,7 +9166,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>4</real>
+ <integer>4</integer>
</map>
<key>RenderShadowBlurDistFactor</key>
<map>
@@ -9332,9 +9333,9 @@
<string>Vector3</string>
<key>Value</key>
<array>
- <real>1</real>
- <real>0</real>
- <real>0</real>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
</array>
</map>
<key>RenderGlowMaxExtractAlpha</key>
@@ -9752,13 +9753,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>
@@ -9870,29 +9871,28 @@
<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>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>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>
@@ -9902,40 +9902,54 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>10000000</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>RenderAvatarMaxComplexity</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>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>
- <string>F32</string>
+ <string>U32</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>RenderAutoMuteFunctions</key>
+ <key>RenderAutoMuteSurfaceAreaLimit</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 surface area of attachments before an avatar is rendered as a simple impostor (0 to not use this limit).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>U32</string>
+ <string>F32</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>RenderAutoMuteLogging</key>
<map>
@@ -9957,7 +9971,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.0E6</real>
</map>
<key>RenderVBOEnable</key>
@@ -10157,7 +10171,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>250000</real>
+ <integer>250000</integer>
</map>
<key>MeshMetaDataDiscount</key>
<map>
@@ -10168,7 +10182,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>384</real>
+ <integer>384</integer>
</map>
<key>MeshMinimumByteSize</key>
<map>
@@ -10179,7 +10193,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>MeshBytesPerTriangle</key>
<map>
@@ -10190,7 +10204,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>Mesh2MaxConcurrentRequests</key>
<map>
@@ -10322,7 +10336,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>1024</real>
+ <integer>1024</integer>
</map>
<key>SceneLoadLowMemoryBound</key>
<map>
@@ -10333,7 +10347,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>750</real>
+ <integer>750</integer>
</map>
<key>SceneLoadMinRadius</key>
<map>
@@ -10544,17 +10558,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>
@@ -11774,7 +11777,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <integer>0.0</integer>
+ <real>0.0</real>
</map>
<key>TextureFetchSource</key>
<map>
@@ -12126,7 +12129,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>6</real>
+ <integer>6</integer>
</map>
<key>UICheckboxctrlBtnSize</key>
<map>
@@ -12137,7 +12140,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>13</real>
+ <integer>13</integer>
</map>
<key>UICheckboxctrlHeight</key>
<map>
@@ -12148,7 +12151,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>UICheckboxctrlHPad</key>
<map>
@@ -12159,7 +12162,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>2</real>
+ <integer>2</integer>
</map>
<key>UICheckboxctrlSpacing</key>
<map>
@@ -12170,7 +12173,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>5</real>
+ <integer>5</integer>
</map>
<key>UICheckboxctrlVPad</key>
<map>
@@ -12181,7 +12184,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>2</real>
+ <integer>2</integer>
</map>
<key>UICloseBoxFromTop</key>
<map>
@@ -12192,7 +12195,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>5</real>
+ <integer>5</integer>
</map>
<key>UIExtraTriangleHeight</key>
<map>
@@ -12203,7 +12206,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>-1</real>
+ <integer>-1</integer>
</map>
<key>UIExtraTriangleWidth</key>
<map>
@@ -12214,7 +12217,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>4</real>
+ <integer>4</integer>
</map>
<key>UIFloaterCloseBoxSize</key>
<map>
@@ -12225,7 +12228,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>UIFloaterHPad</key>
<map>
@@ -12236,7 +12239,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>6</real>
+ <integer>6</integer>
</map>
<key>UIFloaterTestBool</key>
<map>
@@ -12456,7 +12459,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>500</real>
+ <integer>500</integer>
</map>
<key>UIMinimizedWidth</key>
<map>
@@ -12467,7 +12470,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>160</real>
+ <integer>160</integer>
</map>
<key>UIMultiSliderctrlSpacing</key>
<map>
@@ -12478,7 +12481,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>4</real>
+ <integer>4</integer>
</map>
<key>UIMultiTrackHeight</key>
<map>
@@ -13138,7 +13141,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>3</real>
+ <integer>3</integer>
</map>
<key>UseCircuitCodeTimeout</key>
<map>
@@ -13217,6 +13220,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>EnvironmentPersistAcrossLogin</key>
+ <map>
+ <key>Comment</key>
+ <string>Keep Environment settings consistent across sessions</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>UseDayCycle</key>
<map>
<key>Comment</key>
@@ -14108,17 +14122,6 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>MaxFPS</key>
- <map>
- <key>Comment</key>
- <string>Yield some time to the local host if we reach a threshold framerate.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>-1.0</real>
- </map>
<key>ForcePeriodicRenderingTime</key>
<map>
<key>Comment</key>
@@ -14691,17 +14694,6 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>UseHTTPInventory</key>
- <map>
- <key>Comment</key>
- <string>Allow use of http inventory transfers instead of UDP</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>ClickToWalk</key>
<map>
<key>Comment</key>
@@ -15157,9 +15149,9 @@
<string>Color4</string>
<key>Value</key>
<array>
- <real>0</real>
- <real>0</real>
- <real>0</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
<real>1.0</real>
</array>
</map>
@@ -15476,7 +15468,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>2</real>
+ <real>2.0</real>
</map>
<key>TeleportLocalDelay</key>
<map>
@@ -15487,7 +15479,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>1</real>
+ <real>1.0</real>
</map>
<key>FMODExProfilerEnable</key>
<map>
@@ -15610,7 +15602,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>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index d119504017..c62b45ed81 100755
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -97,7 +97,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>true</integer>
+ <integer>1</integer>
</map>
<key>InstantMessageLogPath</key>
<map>
diff --git a/indra/newview/app_settings/ultra_graphics.xml b/indra/newview/app_settings/ultra_graphics.xml
index 71459e5470..270f91aeeb 100755
--- a/indra/newview/app_settings/ultra_graphics.xml
+++ b/indra/newview/app_settings/ultra_graphics.xml
@@ -26,8 +26,11 @@
<RenderTerrainLODFactor value="2.0"/>
<!--Default for now-->
<RenderTreeLODFactor value="1.0"/>
- <!--Try Impostors-->
- <RenderUseImpostors value="TRUE"/>
+ <!--Avater Impostors and Visual Muting Limits (real defaults set
+ based on default graphics setting -->
+ <RenderAvatarMaxNonImpostors value="0"/>
+ <RenderAvatarMaxComplexity value="0"/>
+ <RenderAutoMuteSurfaceAreaLimit value="10000"/>
<!--Default for now-->
<RenderVolumeLODFactor value="2.0"/>
<!--NO SHADERS-->