summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.cpp
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-02-26 17:20:44 -0800
committerEli Linden <eli@lindenlab.com>2010-02-26 17:20:44 -0800
commitd7038ea1911e84077ba9d863686ef1ca25273aa8 (patch)
tree2841bc32b8ae1801b6f1f0bc5473ac70d76e144b /indra/newview/llvoavatarself.cpp
parentc3a00ac24b0a787fa3b51a2eff178e489658ddc1 (diff)
parentd1e3785416c348f0e9d6de5232773777e90130b6 (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 4347dec805..f8b5bfc718 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;
}