diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-03 14:52:05 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-03 14:52:05 -0500 |
| commit | e87975284e2b50c81d95bbb9672678ae262288be (patch) | |
| tree | c081cf1087ac2aa055d0e69737f936138578a2c4 /indra/newview/app_settings | |
| parent | 0dd9871012f50d6201217a79b65bedd28368efae (diff) | |
| parent | 3f8c129a1f4caefcc25c895a6612aaaaa0c6aaa3 (diff) | |
update from viewer2 and merge into avp
--HG--
branch : avatar-pipeline
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> |