diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-25 10:05:07 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-25 10:05:07 -0800 |
| commit | 1d512c599a8dfedcf93d7b1aadb8d85ad0d7de64 (patch) | |
| tree | 28996f22e1ff43831279482b74ab6ee7cb0663bc /indra/newview/app_settings/settings.xml | |
| parent | f11f8b34478f0d408689fe7959f233567001374d (diff) | |
| parent | af83fe79d8d074d3056e6dff86dcf14d8e71c885 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c29a3a0035..e607c3ad15 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -298,17 +298,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>AudioStreamingVideo</key> - <map> - <key>Comment</key> - <string>Enable streaming video</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>AuditTexture</key> <map> <key>Comment</key> |