From 9a397826dd5bbe04b827496ff6f802a9a5552306 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 22 Jun 2010 14:35:45 +0300 Subject: EXT-7789 FIXED reverted changes with removing "Rename Outfit" from gear menu Backed out changeset: f0e9147baf74 --HG-- branch : product-engine --- indra/newview/llpaneloutfitsinventory.cpp | 16 +++++++++++++++- indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 13 +++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp index 7e1bff0961..5563214407 100644 --- a/indra/newview/llpaneloutfitsinventory.cpp +++ b/indra/newview/llpaneloutfitsinventory.cpp @@ -86,6 +86,7 @@ public: registrar.add("Gear.Wear", boost::bind(&LLOutfitListGearMenu::onWear, this)); registrar.add("Gear.TakeOff", boost::bind(&LLOutfitListGearMenu::onTakeOff, this)); + registrar.add("Gear.Rename", boost::bind(&LLOutfitListGearMenu::onRename, this)); registrar.add("Gear.Delete", boost::bind(&LLOutfitListGearMenu::onDelete, this)); registrar.add("Gear.Create", boost::bind(&LLOutfitListGearMenu::onCreate, this, _2)); @@ -158,6 +159,15 @@ private: } } + void onRename() + { + const LLUUID& selected_outfit_id = getSelectedOutfitID(); + if (selected_outfit_id.notNull()) + { + LLAppearanceMgr::instance().renameOutfit(selected_outfit_id); + } + } + void onDelete() { const LLUUID& selected_outfit_id = getSelectedOutfitID(); @@ -187,7 +197,11 @@ private: return false; } - if ("delete" == param) + if ("rename" == param) + { + return get_is_category_renameable(&gInventory, selected_outfit_id); + } + else if ("delete" == param) { return LLAppearanceMgr::instance().getCanRemoveOutfit(selected_outfit_id); } diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml index 16b33eff89..8e7ef7f0b5 100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml @@ -175,6 +175,19 @@ + + + + + Date: Tue, 22 Jun 2010 15:00:22 +0300 Subject: EXT-7875 FIXED Implemented resetting of selection inside outfit on accordion collapse/expand. - Added method which resets selection and tied it up to DropDownStateChangedCallback. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/628/ --HG-- branch : product-engine --- indra/newview/lloutfitslist.cpp | 10 ++++++++++ indra/newview/lloutfitslist.h | 5 +++++ 2 files changed, 15 insertions(+) (limited to 'indra') diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index c5043e1c3d..6542afc366 100644 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -288,6 +288,9 @@ void LLOutfitsList::refreshList(const LLUUID& category_id) // Setting tab focus callback to monitor currently selected outfit. tab->setFocusReceivedCallback(boost::bind(&LLOutfitsList::changeOutfitSelection, this, list, cat_id)); + // Setting callback to reset items selection inside outfit on accordion collapsing and expanding (EXT-7875) + tab->setDropDownStateChangedCallback(boost::bind(&LLOutfitsList::resetItemSelection, this, list, cat_id)); + // Setting list commit callback to monitor currently selected wearable item. list->setCommitCallback(boost::bind(&LLOutfitsList::onSelectionChange, this, _1)); @@ -486,6 +489,13 @@ void LLOutfitsList::updateOutfitTab(const LLUUID& category_id) } } +void LLOutfitsList::resetItemSelection(LLWearableItemsList* list, const LLUUID& category_id) +{ + list->resetSelection(); + mItemSelected = false; + setSelectedOutfitUUID(category_id); +} + void LLOutfitsList::changeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id) { MASK mask = gKeyboard->currentMask(TRUE); diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h index df65f7187b..a6b9a66836 100644 --- a/indra/newview/lloutfitslist.h +++ b/indra/newview/lloutfitslist.h @@ -122,6 +122,11 @@ private: */ void changeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id); + /** + *Resets items selection inside outfit + */ + void resetItemSelection(LLWearableItemsList* list, const LLUUID& category_id); + /** * Saves newly selected outfit ID. */ -- cgit v1.2.3 From b14e19c1ac1f329d75769ba8a9307608365ca06e Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Tue, 22 Jun 2010 15:46:17 +0300 Subject: EXT-7820 FIX escape only parameters of slurl reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/614/ --HG-- branch : product-engine --- indra/newview/llchathistory.cpp | 4 ++-- indra/newview/llinspectremoteobject.cpp | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index ab97dbb695..ac12bffdfb 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -666,13 +666,13 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL slurl = region_slurl.getLocationString(); } } - url += "&slurl=" + slurl; + url += "&slurl=" + LLURI::escape(slurl); // set the link for the object name to be the objectim SLapp // (don't let object names with hyperlinks override our objectim Url) LLStyle::Params link_params(style_params); link_params.color.control = "HTMLLinkColor"; - link_params.link_href = LLURI::escape(url); + link_params.link_href = url; mEditor->appendText("" + chat.mFromName + "" + delimiter, false, link_params); } diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp index 97ff771658..be021df363 100644 --- a/indra/newview/llinspectremoteobject.cpp +++ b/indra/newview/llinspectremoteobject.cpp @@ -128,7 +128,16 @@ void LLInspectRemoteObject::onOpen(const LLSD& data) update(); // Position the inspector relative to the mouse cursor - LLUI::positionViewNearMouse(this); + // Similar to how tooltips are positioned + // See LLToolTipMgr::createToolTip + if (data.has("pos")) + { + LLUI::positionViewNearMouse(this, data["pos"]["x"].asInteger(), data["pos"]["y"].asInteger()); + } + else + { + LLUI::positionViewNearMouse(this); + } } void LLInspectRemoteObject::onClickMap() -- cgit v1.2.3 From bedc5790e02af04b77a97054f742aba7a02bc033 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 22 Jun 2010 15:46:21 +0300 Subject: Reformatted panel_edit_wearable.xml file with UI Preview Tool --HG-- branch : product-engine --- .../skins/default/xui/en/panel_edit_wearable.xml | 781 ++++++++++----------- 1 file changed, 376 insertions(+), 405 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index 00c5325039..1ab9f722d0 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -1,428 +1,399 @@ - - Editing Shape - - - Editing Skin - - - Editing Hair - - - Editing Eyes - - - Editing Shirt - - - Editing Pants - - - Editing Shoes - - - Editing Socks - - - Editing Jacket - - - Editing Skirt - - - Editing Gloves - - - Editing Undershirt - - - Editing Underpants - - - Editing Alpha Mask - - - Editing Tattoo - - - Shape: - - - Skin: - - - Hair: - - - Eyes: - - - Shirt: - - - Pants: - - - Shoes: - - - Socks: - - - Jacket: - - - Skirt: - - - Gloves: - - - Undershirt: - - - Underpants: - - - Alpha Mask: - - - Tattoo: - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +