diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-03 17:33:03 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-03 17:33:03 +0200 |
| commit | 506f1787a5e3c98c60e10a00e6197303d28eb03a (patch) | |
| tree | 9da32a06c41da5e5a56bc49fcb562546a652db02 /indra/newview/app_settings | |
| parent | f1d834c50d7155102a6482e1c4e4205ddca65be2 (diff) | |
| parent | efa9c7a5ba1fa1facaa15d22418e9d4199c3f773 (diff) | |
merge
--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> |