diff options
| author | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
| commit | 00e4fb0ac8431bda3705c218a548557cfca7e749 (patch) | |
| tree | dd006c79cad8cdf9309290272597d9d2a0e93e8b /indra/newview/app_settings/settings.xml | |
| parent | 657e462b6a46bee09fe91e84ea37763db79c868c (diff) | |
| parent | bd897431e14aff091d5f45425816ddec4b2538c7 (diff) | |
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index bbf3f4fc75..3326319e2d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5373,17 +5373,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>MultipleAttachments</key> - <map> - <key>Comment</key> - <string>Allow multiple objects to be attached to a single attachment point.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>MuteAmbient</key> <map> <key>Comment</key> @@ -6436,6 +6425,17 @@ <key>Value</key> <real>1.0</real> </map> + <key>MediaBrowserWindowLimit</key> + <map> + <key>Comment</key> + <string>Maximum number of media brower windows that can be open at once (0 for no limit)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>5</integer> + </map> <key>MediaRollOffRate</key> <map> <key>Comment</key> |