diff options
| author | skolb <none@none> | 2009-12-17 09:26:33 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-17 09:26:33 -0800 |
| commit | f713efe298c73408d59d042a0d35763a96a5bc5f (patch) | |
| tree | d7b2720b202810f5926fde2889cab92cae6dd756 /indra/newview/app_settings | |
| parent | eb6b69640ea70de0e3b848ec3a4af3eee098f19f (diff) | |
| parent | c9a284fc69020f499ccb6d9fa877dad6864ec66f (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 f00b100217..9dfce27fad 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> |