summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-05-08 21:41:11 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-05-08 21:41:11 +0300
commit93f0023efad59c6f86ee8003e3a22f1102ad28e8 (patch)
treeffb06811136a43a737aacfa844974e206f9f5537 /indra/newview/app_settings
parent922793e4898ec272576f32b79cc31b1c299e1e21 (diff)
parent34322f8f37380df868703051230f2a4109602b3f (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml22
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7a6df7990a..c00077e4ef 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11552,6 +11552,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>MenuSearch</key>
+ <map>
+ <key>Comment</key>
+ <string>Show/hide 'Search menus' field</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>GroupListShowIcons</key>
<map>
<key>Comment</key>
@@ -14280,6 +14291,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>RegionCrossingInterpolationTime</key>
+ <map>
+ <key>Comment</key>
+ <string>How long to extrapolate object motion after crossing regions</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>VertexShaderEnable</key>
<map>
<key>Comment</key>