From a28de873cea85bdedcac20a164d7bd2012a4d5bc Mon Sep 17 00:00:00 2001 From: angela Date: Thu, 3 Dec 2009 22:28:53 +0800 Subject: EXT-2575 [BSI] Deleting content inside a prim from build floater deletes prim, rather than content --- indra/newview/llpanelobjectinventory.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'indra/newview/llpanelobjectinventory.cpp') diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 342d2bc739..7b0eb8c2d2 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1695,6 +1695,7 @@ void LLPanelObjectInventory::updateInventory() } mFolders->requestArrange(); + //LLEditMenuHandler::gEditMenuHandler = mFolders; mInventoryNeedsUpdate = FALSE; } @@ -1940,3 +1941,22 @@ void LLPanelObjectInventory::idle(void* user_data) self->updateInventory(); } } + +void LLPanelObjectInventory::onFocusLost() +{ + // inventory no longer handles cut/copy/paste/delete + if (LLEditMenuHandler::gEditMenuHandler == mFolders) + { + LLEditMenuHandler::gEditMenuHandler = NULL; + } + + LLPanel::onFocusLost(); +} + +void LLPanelObjectInventory::onFocusReceived() +{ + // inventory now handles cut/copy/paste/delete + LLEditMenuHandler::gEditMenuHandler = mFolders; + + LLPanel::onFocusReceived(); +} \ No newline at end of file -- cgit v1.2.3 From 0f2f846a12936991f0434d5aac50c850d76ce2a4 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 3 Dec 2009 20:50:21 -0500 Subject: EXT-3125 : INFRASTRUCTURE : Cleanup LLInventoryFilter to disambiguate various filter options EXT-3124 : Add lookup for finding all linked items to an item LLInventoryFilter cleanup, including adding ability to lookup item by UUID. --HG-- branch : avatar-pipeline --- indra/newview/llpanelobjectinventory.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelobjectinventory.cpp') diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 342d2bc739..754df33bd4 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -50,6 +50,7 @@ #include "llfloaterbuycurrency.h" #include "llfloaterreg.h" #include "llinventorybridge.h" +#include "llinventoryfilter.h" #include "llinventoryfunctions.h" #include "llpreviewanim.h" #include "llpreviewgesture.h" -- cgit v1.2.3 From 6dcdcb191111a4ac2ea423d1d3e21673bb930b1d Mon Sep 17 00:00:00 2001 From: angela Date: Fri, 4 Dec 2009 13:22:17 +0800 Subject: Deleting content inside a prim from build floater deletes prim, rather than content EXT-2575 --- indra/newview/llpanelobjectinventory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelobjectinventory.cpp') diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 7b0eb8c2d2..79e84efd5f 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1695,8 +1695,8 @@ void LLPanelObjectInventory::updateInventory() } mFolders->requestArrange(); - //LLEditMenuHandler::gEditMenuHandler = mFolders; mInventoryNeedsUpdate = FALSE; + LLEditMenuHandler::gEditMenuHandler = mFolders; } // *FIX: This is currently a very expensive operation, because we have -- cgit v1.2.3 From ab6134c2310bae6aa68565b6a31093c123713135 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 4 Dec 2009 10:18:53 -0800 Subject: Fix linux build, newline at end of file --- indra/newview/llpanelobjectinventory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelobjectinventory.cpp') diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 79e84efd5f..0012f22cdd 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1959,4 +1959,4 @@ void LLPanelObjectInventory::onFocusReceived() LLEditMenuHandler::gEditMenuHandler = mFolders; LLPanel::onFocusReceived(); -} \ No newline at end of file +} -- cgit v1.2.3