summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-09 09:57:38 -0800
committerRichard Linden <none@none>2011-03-09 09:57:38 -0800
commitf45c84dddef95a800b200010a8722a19e016adcf (patch)
tree4416afe98548e6e804389d0b105834ee6c5327ca /indra/newview
parent8886460a22a6cc6307dd0909219b4dd442c55f8d (diff)
parent24b254c3934ad13516b1c03bf9799397fb364a81 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 94a49f2cef..e4e836be0c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -617,7 +617,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html</string>
+ <string></string>
</map>
<key>AvatarBakedTextureUploadTimeout</key>
<map>
@@ -2566,7 +2566,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/guide.html</string>
+ <string></string>
</map>
<key>DisableCameraConstraints</key>
<map>