summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-27 11:42:52 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-27 11:42:52 +0000
commit2bc346672c7280c99e08afdabab644647871e7be (patch)
tree50c43d828963f07b58d0ce8a2b431bd09fc7c182 /indra/newview/llvoavatarself.cpp
parent213ff5a4e0fa150d91c1a68fb56bb7cb605020d6 (diff)
parent28bdead9e5c77c6bcd557de58410838dc6cc4e15 (diff)
merge.
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r--indra/newview/llvoavatarself.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 4e90b63cc3..131c6ac1a1 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1655,8 +1655,11 @@ BOOL LLVOAvatarSelf::updateIsFullyLoaded()
{
BOOL loading = FALSE;
- // do we have a shape?
- if (visualParamWeightsAreDefault())
+ // do we have our body parts?
+ if (gAgentWearables.getWearableCount(WT_SHAPE) == 0 ||
+ gAgentWearables.getWearableCount(WT_HAIR) == 0 ||
+ gAgentWearables.getWearableCount(WT_EYES) == 0 ||
+ gAgentWearables.getWearableCount(WT_SKIN) == 0)
{
loading = TRUE;
}