diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
| commit | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (patch) | |
| tree | 279f3421a88280d6003d6973dcb5556702e2c52f /indra/newview/app_settings/settings.xml | |
| parent | c59e2d21174415842b1418c5f389becb7c013706 (diff) | |
| parent | c9d121dd01625790cb963372c861f8e4072430d2 (diff) | |
merge from remote repo
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -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 28c59ae93e..a286d321ee 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>PrimMediaDragNDrop</key> <map> <key>Comment</key> |