diff options
| author | angela <angela@lindenlab.com> | 2009-11-03 11:09:44 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-03 11:09:44 +0800 |
| commit | 0b1ed9af5f32c7869cdf05763e4d6d5730b66327 (patch) | |
| tree | 986e2baeee191338dcb3c063af80992b47f1ddb9 /indra/newview/app_settings | |
| parent | 399e922d33ae36d415431a512020771e058454cd (diff) | |
| parent | 3c1c0d7544805df7d77b7f2af4ab1f83ebf0839c (diff) | |
merge
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> |