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

Automated merge with ssh://hg.lindenlab.com/james/gooey/

meow-7.2.2
James Cook 2009-11-12 13:35:39 -08:00
parent 7adf642ecb 14fb8d400e
commit ab3cb6d937
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llinspectgroup.cpp
View File

@ -216,7 +216,8 @@ void LLInspectGroup::requestUpdate()
getChild<LLUICtrl>("group_details")->setValue("");
getChild<LLUICtrl>("group_cost")->setValue("");
// Must have a visible button so the inspector can take focus
getChild<LLUICtrl>("leave_btn")->setVisible(true);
getChild<LLUICtrl>("view_profile_btn")->setVisible(true);
getChild<LLUICtrl>("leave_btn")->setVisible(false);
getChild<LLUICtrl>("join_btn")->setVisible(false);
// Make a new request for properties

2
indra/newview/skins/default/xui/en/inspect_group.xml
View File

@ -31,7 +31,7 @@
use_ellipses="true"
width="240"
word_wrap="false">
Grumpity's Grumpy Group of Moose
Grumpity&apos;s Grumpy Group of Moose
</text>
<text
follows="all"