summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-01-05 21:26:06 -0700
committerXiaohong Bao <bao@lindenlab.com>2012-01-05 21:26:06 -0700
commit141089327649f9b89be4ac9cc2b50f56eee62a48 (patch)
tree20da82a615df7456da3bf63bb37f4495120aaedd /indra
parentce1f95bade2eeec5732d3275bb54fd1612ab03fb (diff)
fix for SH-2829: [crashhunters] Crash in LLWearable::importFile()/LLOverrideBakedTextureUpdate::LLOverrideBakedTextureUpdate()
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llagentwearablesfetch.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagentwearablesfetch.cpp b/indra/newview/llagentwearablesfetch.cpp
index 1edc96e165..4097ff707c 100644
--- a/indra/newview/llagentwearablesfetch.cpp
+++ b/indra/newview/llagentwearablesfetch.cpp
@@ -111,6 +111,12 @@ void LLInitialWearablesFetch::add(InitialWearableData &data)
void LLInitialWearablesFetch::processContents()
{
+ if(!gAgentAvatarp) //no need to process wearables if the agent avatar is deleted.
+ {
+ delete this;
+ return ;
+ }
+
// Fetch the wearable items from the Current Outfit Folder
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t wearable_array;