From cf6b233e50135a961a9be4e8e00c846466060bf8 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Tue, 23 Mar 2010 21:47:17 +0200 Subject: Fixed critical bug EXT-6468 (group creation process ignores group options set prior to creation). Submitting on behalf of Yuri Cheborarev. Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/81/ --HG-- branch : product-engine --- indra/newview/llpanelgroupgeneral.cpp | 8 +++++--- indra/newview/skins/default/xui/en/panel_group_general.xml | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 517204b232..0a83ba8212 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -820,15 +820,15 @@ void LLPanelGroupGeneral::reset() mCtrlListGroup->set(true); - mCtrlReceiveNotices->setEnabled(true); + mCtrlReceiveNotices->setEnabled(false); mCtrlReceiveNotices->setVisible(true); - mCtrlListGroup->setEnabled(true); + mCtrlListGroup->setEnabled(false); mGroupNameEditor->setEnabled(TRUE); mEditCharter->setEnabled(TRUE); - mCtrlShowInGroupList->setEnabled(TRUE); + mCtrlShowInGroupList->setEnabled(false); mComboMature->setEnabled(TRUE); mCtrlOpenEnrollment->setEnabled(TRUE); @@ -934,6 +934,8 @@ void LLPanelGroupGeneral::setGroupID(const LLUUID& id) mCtrlListGroup->setEnabled(data.mID.notNull()); } + mCtrlShowInGroupList->setEnabled(data.mID.notNull()); + mActiveTitleLabel = getChild("active_title_label"); mComboActiveTitle = getChild("active_title"); diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index f913c58cc9..9341d433e8 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -241,14 +241,17 @@ Hover your mouse over the options for more help. tool_tip="Sets whether your group contains information rated as Moderate" top_pad="4" width="190"> + + - Select Mature - + - + Date: Tue, 23 Mar 2010 22:10:04 +0200 Subject: Major task (EXT-5106) Side panel list view toolbars are missing background art - Added "on hover" textures for toolbar buttons to textures.xml - Adjusted toolbars for list views according to style guide. - Adjusted tab container width, height and positioning for People, Places, Inventory, Appearance SP's. - Applied "over", "selected", "unselected" textures for toolbar buttons. - Fixed bottom buttons position and bottom panel height in Appearance and People tabs. Reviewed by Leyla Farazha https://codereview.productengine.com/secondlife/r/82/ --HG-- branch : product-engine --- indra/newview/skins/default/textures/textures.xml | 3 + .../skins/default/xui/en/panel_landmarks.xml | 86 ++++--- .../skins/default/xui/en/panel_main_inventory.xml | 71 +++--- .../default/xui/en/panel_outfits_inventory.xml | 72 +++--- .../newview/skins/default/xui/en/panel_people.xml | 276 +++++++++++++-------- .../newview/skins/default/xui/en/panel_places.xml | 2 +- .../default/xui/en/panel_teleport_history.xml | 65 ++--- 7 files changed, 334 insertions(+), 241 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index a3e5361e76..fed326c25e 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -616,12 +616,15 @@ with the same filename but different name + + + diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index ee8bca6f83..639e5d30ef 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -3,22 +3,25 @@ name="Landmarks" top="0" height="400" - layout="topleft" + layout="topleft" left="0" - width="380" + width="313" help_topic="panel_landmarks" border="false" background_visible="true" - bg_alpha_color="DkGray2" + bg_alpha_color="DkGray" follows="all"> + width="307"> + width="307"/> + width="307"/> + width="307"/> + width="313"/> + width="313"> + + width="307"> + width="307" /> + width="307" /> + @@ -377,7 +434,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t height="23" layout="topleft" left="8" - top_pad="0" + top_pad="4" name="button_bar" width="313">