diff options
author | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-09 20:56:23 +0000 |
---|---|---|
committer | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-09 20:56:23 +0000 |
commit | 7a64aad1def1b0612addbf2e66c66db061d7e182 (patch) | |
tree | 2e011e8b58933e692c0cae738a4382a37e3e222b /indra/newview/lllocationinputctrl.cpp | |
parent | 311aaf7ffd8f7dc95dba84f10fcae97bc93901bb (diff) |
DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling
ignore dead branch
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
-rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 404e266806..75b7f9313b 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -572,8 +572,7 @@ void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data) value["global_pos"] = result->mGlobalPos.getValue(); std::string region_name = result->mTitle.substr(0, result->mTitle.find(',')); //TODO*: add Surl to teleportitem or parse region name from title - value["tooltip"] = LLSLURL::buildSLURLfromPosGlobal(region_name, - result->mGlobalPos, false); + value["tooltip"] = LLSLURL(region_name, result->mGlobalPos).getSLURLString(); add(result->getTitle(), value); } result = std::find_if(result + 1, th_items.end(), boost::bind( @@ -832,7 +831,7 @@ void LLLocationInputCtrl::changeLocationPresentation() if(mTextEntry && !mTextEntry->hasSelection() && text == mHumanReadableLocation ) { //needs unescaped one - mTextEntry->setText(LLAgentUI::buildSLURL(false)); + mTextEntry->setText(LLAgentUI::buildSLURL(false).getSLURLString()); mTextEntry->selectAll(); } } |