diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-03 15:32:54 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-03 15:32:54 +0200 |
| commit | 4a3eeda1ea5b555d15758dd7abee9b11c980e5b3 (patch) | |
| tree | 400016fada68cf72c5bd64bd1e972ecdf100f530 /indra/newview/app_settings | |
| parent | 645e2588511ff55b773e22fe3c9ee2c4de37843c (diff) | |
| parent | eff50b018c93f7ddf328c750ddbea11f0a50f9c1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c4722b772e..768fdd4103 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5294,7 +5294,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>PluginInstancesCPULimit</key> <map> <key>Comment</key> @@ -5361,6 +5360,17 @@ <key>Value</key> <integer>13</integer> </map> + <key>PrimMediaControlsUseHoverControlSet</key> + <map> + <key>Comment</key> + <string>Whether or not hovering over prim media uses minimal "hover" controls or the authored control set.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>PrimMediaMaxRetries</key> <map> <key>Comment</key> |