diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-04-01 21:47:22 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-01 21:47:22 -0700 |
commit | aa0a129b6798f8be554d1d9d41cbd217a0040daf (patch) | |
tree | a206cf638fa4a8f48dd869e0ccf12b7b6a428972 /indra/newview/lllandmarkactions.cpp | |
parent | 98695056c2fbfb91de805d9e2a01cde23668c4d3 (diff) | |
parent | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (diff) |
Automated Merge
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 7336efb62a..539ca97a93 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::buildSLURLfromPosGlobal(sim_name, global_pos, escaped); + std::string slurl = LLSLURL(sim_name, global_pos).getSLURLString(); 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::buildSLURLfromPosGlobal(sim_name, global_pos, escaped); + slurl = LLSLURL(sim_name, global_pos).getSLURLString(); } else { |