diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 09:28:26 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 09:28:26 +0000 |
| commit | a402f4894d72209f9ac9bc9d7962c28b3c26bb18 (patch) | |
| tree | 1db4f4a35008b6f4281e6275b7a4beb679d285d6 /indra/newview/app_settings/settings.xml | |
| parent | b42b421d25f3b3a7ea4f571388acb64f98e1f51d (diff) | |
| parent | ccc72757ef23fa7ffba066e5bdaf05e3f8a95cca (diff) | |
merge.
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 48ba71f446..94a2ca16f4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4545,6 +4545,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>MediaPerformanceManagerDebug</key> + <map> + <key>Comment</key> + <string>Whether to show debug data for the media performance manager in the nearby media list.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>MemoryLogFrequency</key> <map> <key>Comment</key> @@ -6304,7 +6315,7 @@ <real>1.0</real> </map> - <key>RenderHighlightEnable</key> + <key>RenderHoverGlowEnable</key> <map> <key>Comment</key> <string>Show glow effect when hovering on interactive objects.</string> @@ -6313,7 +6324,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>RenderHighlightFadeTime</key> |