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/keywords.ini20
-rwxr-xr-xindra/newview/app_settings/settings.xml96
2 files changed, 68 insertions, 48 deletions
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/settings.xml b/indra/newview/app_settings/settings.xml
index a042166e44..8ca6bb879d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -91,7 +91,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>300</real>
+ <real>300.0</real>
</map>
<key>AckCollectTime</key>
<map>
@@ -124,7 +124,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>1</real>
+ <real>1.0</real>
</map>
<key>AdvanceSnapshot</key>
<map>
@@ -1695,7 +1695,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>100</real>
+ <integer>100</integer>
</map>
<key>ChatLoadGroupTimeout</key>
<map>
@@ -4304,7 +4304,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>3</real>
+ <real>3.0</real>
</map>
<key>FullScreenAutoDetectAspectRatio</key>
<map>
@@ -6319,7 +6319,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>MeshEnabled</key>
<map>
@@ -6330,7 +6330,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>1</real>
+ <integer>1</integer>
</map>
<key>MeshImportUseSLM</key>
<map>
@@ -6341,7 +6341,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>1</real>
+ <integer>1</integer>
</map>
<key>MeshUploadLogXML</key>
<map>
@@ -6352,7 +6352,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>MeshUploadFakeErrors</key>
<map>
@@ -6363,7 +6363,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>MeshUploadTimeOut</key>
<map>
@@ -6374,7 +6374,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>600</real>
+ <integer>600</integer>
</map>
<key>MigrateCacheDirectory</key>
<map>
@@ -8598,7 +8598,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>64</real>
+ <real>64.0</real>
</map>
<key>RenderCubeMap</key>
<map>
@@ -8734,7 +8734,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>RenderEdgeDepthCutoff</key>
@@ -8780,7 +8780,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>4</real>
+ <real>4.0</real>
</map>
<key>RenderDeferredSpotShadowBias</key>
<map>
@@ -8847,7 +8847,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0</real>
+ <real>0.0</real>
</map>
<key>RenderDepthPrePass</key>
@@ -9041,7 +9041,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>RenderSpecularResX</key>
@@ -9053,7 +9053,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>1024</real>
+ <integer>1024</integer>
</map>
<key>RenderSpecularResY</key>
@@ -9065,7 +9065,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>256</real>
+ <integer>256</integer>
</map>
<key>RenderSpecularExponent</key>
@@ -9221,7 +9221,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>4</real>
+ <integer>4</integer>
</map>
<key>RenderShadowBlurDistFactor</key>
<map>
@@ -9388,9 +9388,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>
@@ -9991,7 +9991,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>0</real>
+ <integer>0</integer>
</map>
<key>RenderAutoMuteLogging</key>
<map>
@@ -10213,7 +10213,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>250000</real>
+ <integer>250000</integer>
</map>
<key>MeshMetaDataDiscount</key>
<map>
@@ -10224,7 +10224,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>384</real>
+ <integer>384</integer>
</map>
<key>MeshMinimumByteSize</key>
<map>
@@ -10235,7 +10235,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>MeshBytesPerTriangle</key>
<map>
@@ -10246,7 +10246,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>Mesh2MaxConcurrentRequests</key>
<map>
@@ -10378,7 +10378,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>1024</real>
+ <integer>1024</integer>
</map>
<key>SceneLoadLowMemoryBound</key>
<map>
@@ -10389,7 +10389,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <real>750</real>
+ <integer>750</integer>
</map>
<key>SceneLoadMinRadius</key>
<map>
@@ -12182,7 +12182,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>6</real>
+ <integer>6</integer>
</map>
<key>UICheckboxctrlBtnSize</key>
<map>
@@ -12193,7 +12193,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>13</real>
+ <integer>13</integer>
</map>
<key>UICheckboxctrlHeight</key>
<map>
@@ -12204,7 +12204,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>UICheckboxctrlHPad</key>
<map>
@@ -12215,7 +12215,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>2</real>
+ <integer>2</integer>
</map>
<key>UICheckboxctrlSpacing</key>
<map>
@@ -12226,7 +12226,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>5</real>
+ <integer>5</integer>
</map>
<key>UICheckboxctrlVPad</key>
<map>
@@ -12237,7 +12237,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>2</real>
+ <integer>2</integer>
</map>
<key>UICloseBoxFromTop</key>
<map>
@@ -12248,7 +12248,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>5</real>
+ <integer>5</integer>
</map>
<key>UIExtraTriangleHeight</key>
<map>
@@ -12259,7 +12259,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>-1</real>
+ <integer>-1</integer>
</map>
<key>UIExtraTriangleWidth</key>
<map>
@@ -12270,7 +12270,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>4</real>
+ <integer>4</integer>
</map>
<key>UIFloaterCloseBoxSize</key>
<map>
@@ -12281,7 +12281,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>16</real>
+ <integer>16</integer>
</map>
<key>UIFloaterHPad</key>
<map>
@@ -12292,7 +12292,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>6</real>
+ <integer>6</integer>
</map>
<key>UIFloaterTestBool</key>
<map>
@@ -12512,7 +12512,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>500</real>
+ <integer>500</integer>
</map>
<key>UIMinimizedWidth</key>
<map>
@@ -12523,7 +12523,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>160</real>
+ <integer>160</integer>
</map>
<key>UIMultiSliderctrlSpacing</key>
<map>
@@ -12534,7 +12534,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>4</real>
+ <integer>4</integer>
</map>
<key>UIMultiTrackHeight</key>
<map>
@@ -13194,7 +13194,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <real>3</real>
+ <integer>3</integer>
</map>
<key>UseCircuitCodeTimeout</key>
<map>
@@ -15202,9 +15202,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>
@@ -15521,7 +15521,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>2</real>
+ <real>2.0</real>
</map>
<key>TeleportLocalDelay</key>
<map>
@@ -15532,7 +15532,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>1</real>
+ <real>1.0</real>
</map>
<key>FMODExProfilerEnable</key>
<map>