diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-21 17:02:53 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-21 17:02:53 -0400 |
commit | f91481c82faf1f9527cf54f7dbf4cbc28555003b (patch) | |
tree | e37d53e4714be56a79d08108ed1eda205410e341 /indra/newview/llmorphview.cpp | |
parent | be20b12c5c225e5dbc564ba32dee87b4bf1722b5 (diff) |
EXT-7209 EXT-7366 FIX avatar needs to enter "appearance editing" mode
Avatar now enters "appearance editing" mode when opening the outfit or
wearable editors in the sidepanel. Changed code to ensure we don't
accidentally switch out of it and back in when switching from one to the other.
Note that this cuts out LLFLoaterCustomize from being built and shown to the user
from any UI. The code for this (and related classes) will be removed once we have
pulled any code out of it that we still need. The current outfit and wearable
editors should be working sufficiently for most purposes. Bugs should be reported
to Nyx Linden or the avatar team.
Code reviewed by Vir
Diffstat (limited to 'indra/newview/llmorphview.cpp')
-rw-r--r-- | indra/newview/llmorphview.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp index d670eb6ffd..27a27fb65a 100644 --- a/indra/newview/llmorphview.cpp +++ b/indra/newview/llmorphview.cpp @@ -131,14 +131,7 @@ void LLMorphView::setVisible(BOOL visible) if (visible) { - llassert( !gFloaterCustomize ); - gFloaterCustomize = new LLFloaterCustomize(); - gFloaterCustomize->fetchInventory(); - gFloaterCustomize->openFloater(); - - // Must do this _after_ gFloaterView is initialized. - gFloaterCustomize->switchToDefaultSubpart(); - + // TODO: verify some user action has already opened outfit editor? - Nyx initialize(); // First run dialog @@ -146,13 +139,7 @@ void LLMorphView::setVisible(BOOL visible) } else { - if( gFloaterCustomize ) - { - gFloaterView->removeChild( gFloaterCustomize ); - delete gFloaterCustomize; - gFloaterCustomize = NULL; - } - + // TODO: verify some user action has already closed outfit editor ? - Nyx shutdown(); } } |