livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Xiaohong Bao 2010-10-13 20:06:30 -06:00
parent 03277635d0 7af6d1c731
commit 22958ae803
6 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/llaccordionctrltab.cpp
View File

@ -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);
}

3
indra/newview/llnamebox.cpp
View File

@ -47,6 +47,7 @@ LLNameBox::LLNameBox(const Params& p)
{
mNameID = LLUUID::null;
mLink = p.link;
mParseHTML = mLink; // STORM-215
mInitialValue = p.initial_value().asString();
LLNameBox::sInstances.insert(this);
setText(LLStringUtil::null);
@ -119,7 +120,7 @@ void LLNameBox::setName(const std::string& name, BOOL is_group)
std::string url;
if (is_group)
url = "[secondlife:///app/group/" + LLURI::escape(name) + "/about " + name + "]";
url = "[secondlife:///app/group/" + mNameID.asString() + "/about " + name + "]";
else
url = "[secondlife:///app/agent/" + mNameID.asString() + "/about " + name + "]";

1
indra/newview/skins/default/xui/en/panel_group_notify.xml
View File

@ -85,6 +85,7 @@
layout="topleft"
left="45"
name="attachment"
parse_urls="false"
text_color="GroupNotifyTextColor"
value="Attachment"
use_ellipses="true"

1
indra/newview/skins/default/xui/en/panel_outfit_edit.xml
View File

@ -132,6 +132,7 @@
height="18"
layout="topleft"
name="curr_outfit_name"
parse_urls="false"
text_color="LtGray"
top_pad="2"
value="[Current Outfit]"

1
indra/newview/skins/default/xui/en/panel_pick_list_item.xml
View File

@ -52,6 +52,7 @@
layout="topleft"
left="110"
name="picture_name"
parse_urls="false"
text_color="white"
top="9"
use_ellipses="true"

1
indra/newview/skins/default/xui/en/sidepanel_appearance.xml
View File

@ -77,6 +77,7 @@ width="333">
font="SansSerifLargeBold"
height="20"
left="35"
parse_urls="false"
text_color="White"
top="15"
use_ellipses="true"