diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-05-31 17:10:48 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-05-31 17:10:48 +0100 |
| commit | eb8eaa58a4e28b4db2736000f22fbd97371ef9db (patch) | |
| tree | f27b7dccc4409bce20d9173a6f17d971c689637e /indra/newview/app_settings/settings.xml | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
| parent | f0ae109b696671c5773a5084a7329d0b164b7735 (diff) | |
Merge storm-2145 dev into lindenlab branch parented from viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index bbd7f65383..fded2f4f84 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2369,7 +2369,8 @@ <key>Value</key> <integer>0</integer> </map> - <key>DEPRECATED: DebugShowPrivateMem</key> <!-- deprecated (see MAINT-8091) --> + <key>DEPRECATED: DebugShowPrivateMem</key> + <!-- deprecated (see MAINT-8091) --> <map> <key>Comment</key> <string>Show Private Mem Info</string> @@ -6408,7 +6409,8 @@ <key>Value</key> <real>600.0</real> </map> - <key>MemoryPrivatePoolEnabled</key> <!-- deprecated (see MAINT-8091) --> + <key>MemoryPrivatePoolEnabled</key> + <!-- deprecated (see MAINT-8091) --> <map> <key>Comment</key> <string>DEPRECATED: Enable the private memory pool management</string> @@ -6419,7 +6421,8 @@ <key>Value</key> <integer>0</integer> </map> - <key>MemoryPrivatePoolSize</key> <!-- deprecated (see MAINT-8091) --> + <key>MemoryPrivatePoolSize</key> + <!-- deprecated (see MAINT-8091) --> <map> <key>Comment</key> <string>DEPRECATED: Size of the private memory pool in MB (min. value is 256)</string> @@ -16167,7 +16170,29 @@ <key>Value</key> <integer>0</integer> </map> - <key>CefVerboseLog</key> + <key>CameraOpacity</key> + <map> + <key>Comment</key> + <string>Opacity of the Camera Controls floater</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>1.0</real> + </map> + <key>PresetCameraActive</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>CefVerboseLog</key> <map> <key>Comment</key> <string>Enable/disable CEF verbose loggingk</string> |