summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-17 13:43:12 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-17 13:43:12 -0500
commit72022279535dd0ff0938e2dbbf44b6dfd6560af3 (patch)
treea960bc44b49c67f5d08db025d04c5e35957fc34f /indra/newview/llappearancemgr.cpp
parent70b605e4196b538cb7831e8821f765b5c99d9ae0 (diff)
Removed function that was only used for debugging. Defer object suicide until end of the method
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index a23d21f84b..09efda6aca 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -95,7 +95,7 @@ public:
mCopyItems(copy_items),
mAppend(append)
{}
- ~LLOutfitObserver();
+ ~LLOutfitObserver() {}
virtual void done();
void doWearCategory();
@@ -105,12 +105,6 @@ protected:
bool mAppend;
};
-LLOutfitObserver::~LLOutfitObserver()
-{
- llinfos << "~LLOutfitObserver" << llendl;
-}
-
-// BAP is LLOutfitObserver getting deleted here?
void LLOutfitObserver::done()
{
gInventory.removeObserver(this);
@@ -236,7 +230,6 @@ void LLOutfitFetch::done()
// loop.
//dec_busy_count();
gInventory.removeObserver(this);
- delete this;
// increment busy count and either tell the inventory to check &
// call done, or add this object to the inventory for observation.
@@ -255,6 +248,7 @@ void LLOutfitFetch::done()
// will call done for us when everything is here.
gInventory.addObserver(outfit_observer);
}
+ delete this;
}
class LLUpdateAppearanceOnDestroy: public LLInventoryCallback