summaryrefslogtreecommitdiff
path: root/indra/llui/lldraghandle.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-07-15 10:45:24 -0700
committerRichard Linden <none@none>2010-07-15 10:45:24 -0700
commitdd72f789e2c25a41a6d921bafb20d17e26bd2acc (patch)
treeff11013ee4e91ecde7a3d1a4007a44fd1340f260 /indra/llui/lldraghandle.cpp
parentdee93e85601bce555784f07eb83e97aef45ec9b5 (diff)
parent2fb2efe2a24127ccb274cfdf1ca8e7e22d301ed5 (diff)
Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-public
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 );
}