diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-10-23 16:33:31 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-10-23 16:33:31 +0000 |
| commit | 0220106ecdecd323854522a5bc3fd6455c60fdfc (patch) | |
| tree | f9b79f6fbd3b80a291d21c4e388b5eb6a7cffd4f | |
| parent | 584962d5c79097904fec0102f78ea4aa7482a337 (diff) | |
For EXT-1862 : Wearing an item shouldn't refocus to COF
| -rw-r--r-- | indra/newview/llfloaterinventory.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp index 4596ae7739..c890f9f122 100644 --- a/indra/newview/llfloaterinventory.cpp +++ b/indra/newview/llfloaterinventory.cpp @@ -48,6 +48,7 @@ #include "message.h" // newview includes +#include "llappearancemgr.h" #include "llappviewer.h" #include "llfirstuse.h" #include "llfloaterchat.h" @@ -1719,6 +1720,12 @@ void LLInventoryPanel::openDefaultFolderForType(LLAssetType::EType type) void LLInventoryPanel::setSelection(const LLUUID& obj_id, BOOL take_keyboard_focus) { + // Don't select objects in COF (e.g. to prevent refocus when items are worn). + const LLInventoryObject *obj = gInventory.getObject(obj_id); + if (obj && obj->getParentUUID() == LLAppearanceManager::getCOF()) + { + return; + } mFolders->setSelectionByID(obj_id, take_keyboard_focus); } |