summaryrefslogtreecommitdiff
path: root/indra/llui/lldraghandle.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-07-19 13:59:20 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-07-19 13:59:20 +0300
commitc96e69aa08595d2a818834ba74874d26cb2b344e (patch)
tree180ad0b1f550f7df1c2d8e8b0f7050ebdd5abf12 /indra/llui/lldraghandle.cpp
parentef56e156ab8276fec7d967b6f4ab7b83baaca0bb (diff)
parentbfdfff3f0743550a8f8b42e8959df909c200a073 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/lldraghandle.cpp')
-rw-r--r--indra/llui/lldraghandle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp
index 9f83fcca35..b52cb2b751 100644
--- a/indra/llui/lldraghandle.cpp
+++ b/indra/llui/lldraghandle.cpp
@@ -113,7 +113,7 @@ void LLDragHandleTop::setTitle(const std::string& title)
params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT);
params.font_shadow(LLFontGL::DROP_SHADOW_SOFT);
params.use_ellipses = true;
- params.allow_html = false; //cancel URL replacement in floater title
+ params.parse_urls = false; //cancel URL replacement in floater title
mTitleBox = LLUICtrlFactory::create<LLTextBox> (params);
addChild( mTitleBox );
}