diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 10:40:38 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 10:40:38 +0100 |
| commit | ec0be6639058c9fa242f8fd9c0380bef44c02e1d (patch) | |
| tree | 79730fa38b4f1952571d66bb1bc08e9691711b41 /indra/newview/lllandmarkactions.cpp | |
| parent | a7085418df1ada6e19b94b6df772ed21e663d119 (diff) | |
| parent | 0bb3f144c0a6712a269246975635962b3b5f48d0 (diff) | |
merged backout.
Diffstat (limited to 'indra/newview/lllandmarkactions.cpp')
| -rw-r--r-- | indra/newview/lllandmarkactions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp index 539ca97a93..7336efb62a 100644 --- a/indra/newview/lllandmarkactions.cpp +++ b/indra/newview/lllandmarkactions.cpp @@ -299,7 +299,7 @@ void LLLandmarkActions::getSLURLfromPosGlobal(const LLVector3d& global_pos, slur bool gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal(global_pos, sim_name); if (gotSimName) { - std::string slurl = LLSLURL(sim_name, global_pos).getSLURLString(); + std::string slurl = LLSLURL::buildSLURLfromPosGlobal(sim_name, global_pos, escaped); cb(slurl); return; @@ -351,7 +351,7 @@ void LLLandmarkActions::onRegionResponseSLURL(slurl_callback_t cb, bool gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal(global_pos, sim_name); if (gotSimName) { - slurl = LLSLURL(sim_name, global_pos).getSLURLString(); + slurl = LLSLURL::buildSLURLfromPosGlobal(sim_name, global_pos, escaped); } else { |