diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-01-26 10:28:16 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-01-26 10:28:16 +0200 |
commit | 58df93f189897555ae060f82ec058fe77173e5e0 (patch) | |
tree | f31beb977386437f7fc7c50f28a29a46156681f7 /indra/newview/app_settings | |
parent | 865617da42d1ec723362f83d6ab2edbae5bb9a65 (diff) | |
parent | 04729c1cd581e985247e5537fdcd46d78e5a9f1c (diff) |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
-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 72d2e1aba0..093e4f4894 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> |