summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-11-03 12:20:14 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-11-03 12:20:14 -0500
commit1972a095ddbed84415d315fa3bed731303a27cd8 (patch)
treec38df4ec40839d5fce4f6dacf0b309fa0dcea3f3 /indra/newview/llvoavatarself.cpp
parentc9d121dd01625790cb963372c861f8e4072430d2 (diff)
parenta100a6e07f8b6ea16313e25e3249736228d9b03c (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r--indra/newview/llvoavatarself.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 758db538a2..34e6b0f89e 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -205,7 +205,10 @@ void LLVOAvatarSelf::markDead()
param;
param = (LLViewerVisualParam*) getNextVisualParam())
{
- param->setIsDummy(TRUE);
+ if (param->getWearableType() != WT_INVALID)
+ {
+ param->setIsDummy(TRUE);
+ }
}
return success;