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