diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-29 12:30:09 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-29 12:30:09 -0400 |
| commit | b6e7850c0a3d65ed0a1501e19a1655055000e32f (patch) | |
| tree | 553d336a12691fb1c1caebc0e1979fc3567b02b7 /indra/newview/llinventorypanel.cpp | |
| parent | 58d76a9ecf83b49e42fabfada27ca20814f93cf3 (diff) | |
| parent | b2a667b7222640a384cb23763b32f8746b0c8cd8 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index e2ace7db01..9a2d76e7e2 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -723,7 +723,7 @@ void LLInventoryPanel::setSelection(const LLUUID& obj_id, BOOL take_keyboard_foc { // 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::instance().getCOF()) + if (obj && obj->getParentUUID() == LLAppearanceMgr::instance().getCOF()) { return; } |