diff options
author | James Cook <james@lindenlab.com> | 2009-12-04 10:56:19 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-04 10:56:19 -0800 |
commit | fa8b2135f5eaf92b24abe79f908a62e7e2c0a076 (patch) | |
tree | 4262266a4b752a7599170b9a75a60f8d4956cd0b /indra/newview/llpanelobjectinventory.cpp | |
parent | 5b695ac56a7fbbb4d1f63bccb0c147c46e56ebcf (diff) | |
parent | ab6134c2310bae6aa68565b6a31093c123713135 (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 342d2bc739..0012f22cdd 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1696,6 +1696,7 @@ void LLPanelObjectInventory::updateInventory() mFolders->requestArrange(); mInventoryNeedsUpdate = FALSE; + LLEditMenuHandler::gEditMenuHandler = mFolders; } // *FIX: This is currently a very expensive operation, because we have @@ -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(); +} |