diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 11:00:46 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 11:00:46 -0800 |
| commit | 471b8f71cd01176ad5deb1b1e6d8cec738d09d0c (patch) | |
| tree | 9dcbab745f8e28933d8f0ef5b7eff09b815f31f8 /indra/newview/app_settings/settings.xml | |
| parent | 6ff6ed4d1148a66b188472c94b58bd573389942d (diff) | |
| parent | 1d512c599a8dfedcf93d7b1aadb8d85ad0d7de64 (diff) | |
Merge conflict resolution.
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 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> |