diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
| commit | c18a4cb0117b6e865a72a01465606c67a7e3bf6d (patch) | |
| tree | 25abf867eabd03b7804a1e36e9c9af2513636cc7 /indra/newview/app_settings | |
| parent | 77344afa8b39b4c1fcebda4de63998a67fd4debb (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
merge changes for 5.1.4-release
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1689f66e8b..bbd7f65383 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2369,7 +2369,7 @@ <key>Value</key> <integer>0</integer> </map> - <key>DebugShowPrivateMem</key> + <key>DEPRECATED: DebugShowPrivateMem</key> <!-- deprecated (see MAINT-8091) --> <map> <key>Comment</key> <string>Show Private Mem Info</string> @@ -6408,10 +6408,10 @@ <key>Value</key> <real>600.0</real> </map> - <key>MemoryPrivatePoolEnabled</key> + <key>MemoryPrivatePoolEnabled</key> <!-- deprecated (see MAINT-8091) --> <map> <key>Comment</key> - <string>Enable the private memory pool management</string> + <string>DEPRECATED: Enable the private memory pool management</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -6419,10 +6419,10 @@ <key>Value</key> <integer>0</integer> </map> - <key>MemoryPrivatePoolSize</key> + <key>MemoryPrivatePoolSize</key> <!-- deprecated (see MAINT-8091) --> <map> <key>Comment</key> - <string>Size of the private memory pool in MB (min. value is 256)</string> + <string>DEPRECATED: Size of the private memory pool in MB (min. value is 256)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -8631,7 +8631,19 @@ <key>Value</key> <integer>0</integer> </map> - + <key>RenderNsightDebugSupport</key> + <map> + <key>Comment</key> + <string> + Disable features which prevent nVidia nSight from being usable with SL. Requires restart. + </string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>RenderLocalLights</key> <map> <key>Comment</key> |