diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-19 14:53:51 -0800 | 
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-19 14:53:51 -0800 | 
| commit | 1afef408835e88a2f34bc33e8bda959ae1229baf (patch) | |
| tree | bec7125817cae6ef53e7ea9de34a04eaadab40c2 /indra/newview | |
| parent | c3b8a84d3c8cbb0df0e0ed0c56d876ac9b63f7b7 (diff) | |
| parent | ea3130e7e379efc04dd7ffff4f5b4c1665d440ba (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d0bbcc222d..68f376fe11 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -285,7 +285,7 @@        <key>Type</key>        <string>Boolean</string>        <key>Value</key> -      <integer>0</integer> +      <integer>1</integer>      </map>      <key>AudioStreamingMusic</key>      <map> @@ -296,7 +296,7 @@        <key>Type</key>        <string>Boolean</string>        <key>Value</key> -      <integer>0</integer> +      <integer>1</integer>      </map>      <key>AudioStreamingVideo</key>      <map> @@ -307,7 +307,7 @@        <key>Type</key>        <string>Boolean</string>        <key>Value</key> -      <integer>0</integer> +      <integer>1</integer>      </map>    <key>AuditTexture</key>    <map>  | 
