diff options
| author | James Cook <james@lindenlab.com> | 2009-11-12 13:35:39 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-12 13:35:39 -0800 |
| commit | ab3cb6d9371df29344943bd58a1433a6d7d7b159 (patch) | |
| tree | 6012cc32bc9b13f1bcfbd9c810225b8f7608f70b | |
| parent | 7adf642ecbe48a1bc84ff54672f1777a6067c14f (diff) | |
| parent | 14fb8d400edf0ea71290195b6bf41b7d580157af (diff) | |
Automated merge with ssh://hg.lindenlab.com/james/gooey/
| -rw-r--r-- | indra/newview/llinspectgroup.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/inspect_group.xml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llinspectgroup.cpp b/indra/newview/llinspectgroup.cpp index c78bcd6afe..7fd7b69021 100644 --- a/indra/newview/llinspectgroup.cpp +++ b/indra/newview/llinspectgroup.cpp @@ -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 diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml index e5e5007c56..f48af2f97e 100644 --- a/indra/newview/skins/default/xui/en/inspect_group.xml +++ b/indra/newview/skins/default/xui/en/inspect_group.xml @@ -31,7 +31,7 @@ use_ellipses="true" width="240" word_wrap="false"> - Grumpity's Grumpy Group of Moose + Grumpity's Grumpy Group of Moose </text> <text follows="all" |