summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-10-01 18:58:20 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2010-10-01 18:58:20 +0300
commit7af6d1c7319bc0f339e9159161c05ed6eb45fb5b (patch)
tree9706b24a1eab9b2f7728cc20308d933cde2165f2
parentf92ad98d62f298c0005f7bc8cac503ada8dc88d0 (diff)
STORM-307 FIXED Disabled highlighting of URLs in outfit names.
Affected: My Outfits and Edit Outfit panels.
-rw-r--r--indra/llui/llaccordionctrltab.cpp1
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml1
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_appearance.xml1
3 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index b7da5f4a1b..e28ef1f25d 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -141,6 +141,7 @@ LLAccordionCtrlTab::LLAccordionCtrlTabHeader::LLAccordionCtrlTabHeader(
textboxParams.use_ellipses = true;
textboxParams.bg_visible = false;
textboxParams.mouse_opaque = false;
+ textboxParams.parse_urls = false;
mHeaderTextbox = LLUICtrlFactory::create<LLTextBox>(textboxParams);
addChild(mHeaderTextbox);
}
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index e0426c75b4..a48a9ce626 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -132,6 +132,7 @@
height="18"
layout="topleft"
name="curr_outfit_name"
+ parse_urls="false"
text_color="LtGray"
top_pad="2"
value="[Current Outfit]"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index c1c0f07304..b5839878d5 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -77,6 +77,7 @@ width="333">
font="SansSerifLargeBold"
height="20"
left="35"
+ parse_urls="false"
text_color="White"
top="15"
use_ellipses="true"