diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-12 17:24:47 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-12 17:24:47 -0500 |
| commit | 22a20bfecf401912be2fda2ce644112440dcc90f (patch) | |
| tree | d3047abbe2b448ae29bcb53f4bdb5eb1a511e488 /indra/newview/llinventorypanel.cpp | |
| parent | 4acc05b3793623a03ea763c5c8c4072f986ee286 (diff) | |
| parent | 56df94412b230d6cec7d253cc431e3a97d008f67 (diff) | |
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
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 dfd4af5c28..9ee2defc01 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -694,7 +694,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::getCOF())
+ if (obj && obj->getParentUUID() == LLAppearanceManager::instance().getCOF())
{
return;
}
|