diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-27 14:40:49 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-27 14:40:49 -0400 |
| commit | cd46893057b9ec7d309059eff3f503cfaf46de56 (patch) | |
| tree | 0e5a45384e96e4f600dccc47df4047493f8e6bf1 /indra/newview/llviewermenu.cpp | |
| parent | b2433a6c82980e76dfde8735d69b788d20abc9d8 (diff) | |
EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIP
Final fixes for:
EXT-7209 camera to enter appearance edit mode
EXT-7366 change camera to face front of avatar in previews
EXT-7213 kill old appearance editor
Partial fix for:
EXT-7392 alpha mask checkboxes are not hooked up
All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin:
425d4e960450
15d04b6464a7
e92ae606de12
adc94512ea9b
24577dbbf7a4
6f28b241eae2
(sorry dessie! :) )
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index b1b6db3305..69352e6685 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -54,7 +54,6 @@ #include "llfloaterbuy.h" #include "llfloaterbuycontents.h" #include "llbuycurrencyhtml.h" -#include "llfloatercustomize.h" #include "llfloatergodtools.h" #include "llfloaterinventory.h" #include "llfloaterland.h" @@ -3738,7 +3737,7 @@ void handle_reset_view() { if (gAgentCamera.cameraCustomizeAvatar()) { - // switching to outfit editor should automagically save any currently edited wearable + // switching to outfit selector should automagically save any currently edited wearable LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD().with("type", "my_outfits")); } |