From 0459dd1e39dd0619f25e537840356f6c567f78e9 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 11 Feb 2010 15:22:38 -0500 Subject: EXT-5343 appearance editor "save as" does not affect Current outfit changed logic of the save as button to copy a link from the newly created inventory item to the current outfit folder. This makes your changes persist on relog. Reviewed by Vir. --- indra/newview/llagentwearables.cpp | 6 +++++- indra/newview/llagentwearables.h | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 6078620e87..a439720dcf 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -299,6 +299,10 @@ void LLAgentWearables::addWearableToAgentInventoryCallback::fire(const LLUUID& i { gAgentWearables.makeNewOutfitDone(mType, mIndex); } + if (mTodo & CALL_WEARITEM) + { + LLAppearanceManager::instance().addCOFItemLink(inv_item, true); + } } void LLAgentWearables::addWearabletoAgentInventoryDone(const S32 type, @@ -510,7 +514,7 @@ void LLAgentWearables::saveWearableAs(const EWearableType type, type, index, new_wearable, - addWearableToAgentInventoryCallback::CALL_UPDATE); + addWearableToAgentInventoryCallback::CALL_WEARITEM); LLUUID category_id; if (save_in_lost_and_found) { diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index b4f58674af..858540a5f5 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -244,7 +244,8 @@ private: CALL_UPDATE = 1, CALL_RECOVERDONE = 2, CALL_CREATESTANDARDDONE = 4, - CALL_MAKENEWOUTFITDONE = 8 + CALL_MAKENEWOUTFITDONE = 8, + CALL_WEARITEM = 16 }; // MULTI-WEARABLE: index is an EWearableType - more confusing usage. -- cgit v1.2.3 From 35d43f25620a6eb3878fc744a22398aac29d1e20 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 11 Feb 2010 16:33:56 -0500 Subject: EXT-5105 Incorrect keyboard shortcut for Inventory in main menu EXT-5334 CTRL+SHIFT+I now brings up InventorySP instead of InventoryFloater Fixed a regression due to EXT-5105 where CTRL+SHIFT+I was bringing up the InventorySP instead of InventoryFloater. Note that this reverts some code checked in for EXT-5105 (i.e. it re-adds in some functions that were deleted). As a side bonus, now the Gestures CTRL+G menu option shows as being checked when the gestures floater is active. --- indra/newview/llviewermenu.cpp | 16 +++++++++- indra/newview/skins/default/xui/en/menu_viewer.xml | 36 +++++++++++++--------- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index af89df448d..b15a9a9e99 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2555,7 +2555,7 @@ void handle_object_inspect() key["task"] = "task"; LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); } - + /* // Old floater properties LLFloaterReg::showInstance("inspect", LLSD()); @@ -5599,6 +5599,19 @@ void handle_buy_currency() LLFloaterBuyCurrency::buyCurrency(); } +class LLFloaterVisible : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + std::string floater_name = userdata.asString(); + bool new_value = false; + { + new_value = LLFloaterReg::instanceVisible(floater_name); + } + return new_value; + } +}; + class LLShowHelp : public view_listener_t { bool handleEvent(const LLSD& userdata) @@ -8030,6 +8043,7 @@ void initialize_menus() enable.add("EnableEdit", boost::bind(&enable_object_edit)); enable.add("VisibleBuild", boost::bind(&enable_object_build)); + view_listener_t::addMenu(new LLFloaterVisible(), "FloaterVisible"); view_listener_t::addMenu(new LLShowSidetrayPanel(), "ShowSidetrayPanel"); view_listener_t::addMenu(new LLSidetrayPanelVisible(), "SidetrayPanelVisible"); view_listener_t::addMenu(new LLSomethingSelected(), "SomethingSelected"); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 95ce6d6ff4..07a366da7f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -55,34 +55,42 @@ + layout="topleft" + shortcut="control|shift|I" + visible="false"> + function="Floater.Visible" + parameter="inventory" /> + function="Floater.Toggle" + parameter="inventory" /> - - + + - - + - + - +