livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7213 WIP kill old appearance editor and traces of code 

Removed last remaining references to gFloaterCustomize.
Next step: kill the files themselves.
Will be reviewed when complete, before pushing
master
Nyx (Neal Orman) 2010-05-26 18:22:04 -04:00
parent 1084bfef00
commit ec7dbc7040
5 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llagentwearables.cpp
View File

@ -1676,14 +1676,12 @@ void LLAgentWearables::userRemoveWearablesOfType(const LLWearableType::EType &ty
void LLAgentWearables::userRemoveAllClothes()
{
// We have to do this up front to avoid having to deal with the case of multiple wearables being dirty.
if (gFloaterCustomize)
if (gAgentCamera.cameraCustomizeAvatar())
{
gFloaterCustomize->askToSaveIfDirty(userRemoveAllClothesStep2);
}
else
{
userRemoveAllClothesStep2(TRUE);
// switching to outfit editor should automagically save any currently edited wearable
LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD().with("type", "edit_outfit"));
}
userRemoveAllClothesStep2(TRUE);
}
// static

14
indra/newview/llappearancemgr.cpp
View File

@ -34,6 +34,7 @@
#include "llaccordionctrltab.h"
#include "llagent.h"
#include "llagentcamera.h"
#include "llagentwearables.h"
#include "llappearancemgr.h"
#include "llcommandhandler.h"
@ -1362,16 +1363,13 @@ void LLAppearanceMgr::wearInventoryCategoryOnAvatar( LLInventoryCategory* catego
llinfos << "wearInventoryCategoryOnAvatar( " << category->getName()
<< " )" << llendl;
if( gFloaterCustomize )
if (gAgentCamera.cameraCustomizeAvatar())
{
gFloaterCustomize->askToSaveIfDirty(boost::bind(&LLAppearanceMgr::changeOutfit,
&LLAppearanceMgr::instance(),
_1, category->getUUID(), append));
}
else
{
LLAppearanceMgr::changeOutfit(TRUE, category->getUUID(), append);
// switching to outfit editor should automagically save any currently edited wearable
LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD().with("type", "edit_outfit"));
}
LLAppearanceMgr::changeOutfit(TRUE, category->getUUID(), append);
}
void LLAppearanceMgr::wearOutfitByName(const std::string& name)

12
indra/newview/llinventorybridge.cpp
View File

@ -4447,15 +4447,13 @@ void remove_inventory_category_from_avatar( LLInventoryCategory* category )
<< " )" << llendl;
if( gFloaterCustomize )
if (gAgentCamera.cameraCustomizeAvatar())
{
gFloaterCustomize->askToSaveIfDirty(
boost::bind(remove_inventory_category_from_avatar_step2, _1, category->getUUID()));
}
else
{
remove_inventory_category_from_avatar_step2(TRUE, category->getUUID() );
// switching to outfit editor should automagically save any currently edited wearable
LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD().with("type", "edit_outfit"));
}
remove_inventory_category_from_avatar_step2(TRUE, category->getUUID() );
}
struct OnRemoveStruct

16
indra/newview/llviewermenu.cpp
View File

@ -3736,17 +3736,15 @@ void reset_view_final( BOOL proceed );
void handle_reset_view()
{
if( (CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode()) && gFloaterCustomize )
if (gAgentCamera.cameraCustomizeAvatar())
{
// Show dialog box if needed.
gFloaterCustomize->askToSaveIfDirty( reset_view_final );
}
else
{
gAgentCamera.switchCameraPreset(CAMERA_PRESET_REAR_VIEW);
reset_view_final( TRUE );
LLFloaterCamera::resetCameraMode();
// switching to outfit editor should automagically save any currently edited wearable
LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD().with("type", "my_outfits"));
}
gAgentCamera.switchCameraPreset(CAMERA_PRESET_REAR_VIEW);
reset_view_final( TRUE );
LLFloaterCamera::resetCameraMode();
}
class LLViewResetView : public view_listener_t

8
indra/newview/llwearable.cpp
View File

@ -579,14 +579,6 @@ BOOL LLWearable::isDirty() const
}
}
//if( gFloaterCustomize )
//{
// if( mDescription != gFloaterCustomize->getWearableDescription( mType ) )
// {
// return TRUE;
// }
//}
return FALSE;
}