summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-11 11:20:20 -0800
committerRichard Linden <none@none>2011-03-11 11:20:20 -0800
commit34807845ab6c6440d17624e1cbf042472d25ce9e (patch)
treec9035ab643c4ec29e7b7385ac3f59450437d0497 /indra
parent1c5d2516e0d926c8bd0bc2faad0f8ccaa2725339 (diff)
fixed avatar picker url
fixed linux build
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/settings_minimal.xml2
-rw-r--r--indra/newview/lltoolpie.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 73c7c1e4bd..646f5e85bc 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -323,7 +323,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>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/avatars.html</string>
</map>
<key>LogInventoryDecline</key>
<map>
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index c52111ab54..c98feca91c 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1756,4 +1756,4 @@ void LLToolPie::steerCameraWithMouse(S32 x, S32 y)
mMouseSteerX = x;
mMouseSteerY = y;
}
-} \ No newline at end of file
+}