summaryrefslogtreecommitdiff
path: root/indra/newview/lllocationinputctrl.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-07-12 18:40:51 +0300
committerMike Antipov <mantipov@productengine.com>2010-07-12 18:40:51 +0300
commitee6c66316e9c9a6c019232b5c773d2063328cdd3 (patch)
tree61be2476631c8fb05b63d4cfe0df5c265b4fd1d8 /indra/newview/lllocationinputctrl.cpp
parent8435d93653e4aa3e1c7602c5eaf34b4fed1c74f2 (diff)
parent34cb8b7402a7e4727dd28ddc90d8d142dbbed3b6 (diff)
Merge with another head in branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
-rw-r--r--indra/newview/lllocationinputctrl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index b8590d838e..46ebb54786 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -1052,7 +1052,7 @@ void LLLocationInputCtrl::changeLocationPresentation()
//needs unescaped one
LLSLURL slurl;
LLAgentUI::buildSLURL(slurl, false);
- mTextEntry->setText(slurl.getSLURLString());
+ mTextEntry->setText(LLURI::unescape(slurl.getSLURLString()));
mTextEntry->selectAll();
mMaturityButton->setVisible(FALSE);