diff options
| author | James Cook <james@lindenlab.com> | 2009-12-09 13:06:07 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-09 13:06:07 -0800 |
| commit | 3476116de84f43367b26e95535ea00ce77ee5215 (patch) | |
| tree | dff6eb5b61f5e6d2fdb77863fdb801c1043a5653 /indra/newview/llpanelobjectinventory.cpp | |
| parent | e9bca5d52ab69f25568b344081e9ae0b699a0ade (diff) | |
EXT-2827 and fix for delete key not deleting objects while building.
Object inventory was grabbing edit menu handling during refresh.
Put back Angela's code so that Right-click > Remove > Delete
is now disabled if you have a single face selected. Fixed
LLSelectMgr::contains() for SELECT_ALL_TES case.
Reviewed with Richard.
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 4f8aff6f78..9d38dab26e 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1697,7 +1697,7 @@ void LLPanelObjectInventory::updateInventory() mFolders->requestArrange(); mInventoryNeedsUpdate = FALSE; - LLEditMenuHandler::gEditMenuHandler = mFolders; + // Edit menu handler is set in onFocusReceived } // *FIX: This is currently a very expensive operation, because we have |