diff options
| author | skolb <> | 2009-12-15 22:05:21 -0800 |
|---|---|---|
| committer | skolb <> | 2009-12-15 22:05:21 -0800 |
| commit | 88291b378eda6178ae3f2cbda60feddf0e68e3fa (patch) | |
| tree | 1c59efc71a095f2ff25af779969f8780680d6ad6 /indra/newview/app_settings | |
| parent | e7eae453908e77a959a2ef6fea272107491fe35e (diff) | |
| parent | 966b2ebfe28d096791395188552f3fc18154247c (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ff569ecffa..578f8fd4f0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5471,6 +5471,17 @@ <key>Value</key> <integer>13</integer> </map> + <key>PrimMediaMasterEnabled</key> + <map> + <key>Comment</key> + <string>Whether or not Media on a Prim is enabled.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>PrimMediaControlsUseHoverControlSet</key> <map> <key>Comment</key> |