diff options
| author | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
| commit | 2b69cb9e9cf5209a8156580b74e6662e4cc4243f (patch) | |
| tree | f38805b6ca5b60e8c0130259865dc610eaee7a0b /indra/newview/llfloaterinventory.cpp | |
| parent | 913786a62b2b8d8e6d9c483ea805a21e694fd818 (diff) | |
| parent | 4ddaa866dde7a92e56617a32464e0667de3759ef (diff) | |
Merged change to auto play pref (DEV-41787)
Diffstat (limited to 'indra/newview/llfloaterinventory.cpp')
| -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); } |