diff options
| author | Eli Linden <eli@lindenlab.com> | 2011-03-11 11:23:25 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2011-03-11 11:23:25 -0800 |
| commit | d0b457365145233c3b4bc64991b183722b13fac8 (patch) | |
| tree | 62214499f2f68faad03fd16fa5ce5dc6d5cc6a87 /indra | |
| parent | ddf8ef0ad16107eaac1bf928e3f8fd2ebc4c70c7 (diff) | |
| parent | 34807845ab6c6440d17624e1cbf042472d25ce9e (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 2 | ||||
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 2 |
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 +} |