diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-17 15:18:19 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-17 15:18:19 -0700 |
| commit | 0ff49e798c6bed6fe888ac463c746bc06036d876 (patch) | |
| tree | a8ebd3f8a8a1604f6c1ec6787e2c527c00a28520 /indra/newview/llavataractions.cpp | |
| parent | ae3b5a4907b4611644d3b21c75ed420bc58593a2 (diff) | |
EXP-1359 FIX -- Selecting New Inventory window from gear menu in Inventory panel opens old My Inventory panel
* Removed old inventory panel.
* Renamed new inventory panel from "my_inventory" to "inventory"
Reviewed by Richard.
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index b54f622986..10fd6b739e 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -445,7 +445,7 @@ void LLAvatarActions::csr(const LLUUID& id, std::string name) void LLAvatarActions::share(const LLUUID& id) { LLSD key; - LLFloaterSidePanelContainer::showPanel("my_inventory", key); + LLFloaterSidePanelContainer::showPanel("inventory", key); LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,id); @@ -702,7 +702,7 @@ std::set<LLUUID> LLAvatarActions::getInventorySelectedUUIDs() if (inventory_selected_uuids.empty()) { - LLSidepanelInventory *sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("my_inventory"); + LLSidepanelInventory *sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory"); if (sidepanel_inventory) { inventory_selected_uuids = sidepanel_inventory->getInboxOrOutboxSelectionList(); |