diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-04 16:46:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-04 16:46:00 +0000 |
| commit | f8511d77a70bea452cde7270b47044358e58427c (patch) | |
| tree | 7772dd518136c7f466693f26db437ed1cf23caa6 /indra/newview/llfloaterworldmap.cpp | |
| parent | 90aa2ddb2efede12f12011fc163e3007e3ba7104 (diff) | |
EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 53b43effec..353020d9c4 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -76,6 +76,7 @@ #include "lltracker.h" #include "llui.h" #include "lluiconstants.h" +#include "llurldispatcher.h" #include "llviewercamera.h" #include "llviewermenu.h" #include "llviewerregion.h" @@ -712,8 +713,7 @@ void LLFloaterWorldMap::updateLocation() childSetValue("spin z", LLSD(agent_z) ); // Set the current SLURL - mSLURL = LLWeb::escapeURL( llformat("http://slurl.com/secondlife/%s/%d/%d/%d", - agent_sim_name.c_str(), agent_x, agent_y, agent_z) ); + mSLURL = LLURLDispatcher::buildSLURL(agent_sim_name, agent_x, agent_y, agent_z); } } @@ -750,8 +750,7 @@ void LLFloaterWorldMap::updateLocation() // simNameFromPosGlobal can fail, so don't give the user an invalid SLURL if ( gotSimName ) { - mSLURL = LLWeb::escapeURL(llformat("http://slurl.com/secondlife/%s/%d/%d/%d", - sim_name.c_str(), llround(region_x), llround(region_y), llround((F32)pos_global.mdV[VZ]))); + mSLURL = LLURLDispatcher::buildSLURL(sim_name, llround(region_x), llround(region_y), llround((F32)pos_global.mdV[VZ])); } else { // Empty SLURL will disable the "Copy SLURL to clipboard" button |