diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-26 09:36:40 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-26 09:36:40 +0200 |
| commit | 04729c1cd581e985247e5537fdcd46d78e5a9f1c (patch) | |
| tree | c8368ccb8e00e6128c9ef453a7f106ef433d0abc /indra/newview/app_settings | |
| parent | 5d7497aab21f9cfcd8b86c73c27dce33e8409841 (diff) | |
| parent | fbf605ea321ee29afad63a4afe47f65584d67eea (diff) | |
Merge with default branch
--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> |