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/llagentui.cpp | |
| parent | a7085418df1ada6e19b94b6df772ed21e663d119 (diff) | |
| parent | 0bb3f144c0a6712a269246975635962b3b5f48d0 (diff) | |
merged backout.
Diffstat (limited to 'indra/newview/llagentui.cpp')
| -rw-r--r-- | indra/newview/llagentui.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp index 15d9f36b74..c4597ad6f8 100644 --- a/indra/newview/llagentui.cpp +++ b/indra/newview/llagentui.cpp @@ -76,15 +76,16 @@ void LLAgentUI::buildFullname(std::string& name) } //static -void LLAgentUI::buildSLURL(LLSLURL& slurl, const bool escaped /*= true*/) +std::string LLAgentUI::buildSLURL(const bool escaped /*= true*/) { - LLSLURL return_slurl; - LLViewerRegion *regionp = gAgent.getRegion(); - if (regionp) - { - return_slurl = LLSLURL(regionp->getName(), gAgent.getPositionGlobal()); - } - slurl = return_slurl; + std::string slurl; + LLViewerRegion *regionp = gAgent.getRegion(); + if (regionp) + { + LLVector3d agentPos = gAgent.getPositionGlobal(); + slurl = LLSLURL::buildSLURLfromPosGlobal(regionp->getName(), agentPos, escaped); + } + return slurl; } //static |