diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-09 13:46:05 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-09 13:46:05 -0800 |
| commit | 2554a88ec17998c092368e814254c6ad3928d920 (patch) | |
| tree | 39d3e0d9abd21f36dee6d96cc02d2cb5dda3867b /indra/newview/llpanelobjectinventory.cpp | |
| parent | 2af183c51d8911a7242b838394863e2606ed3fe7 (diff) | |
| parent | 6260ce6a9210192963a77e5b1f44b0d2c2c86591 (diff) | |
merge!
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 |