diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
| commit | 1147cb1afbc21e1251614895844e95bca9b6b5bc (patch) | |
| tree | da01f6c0e6b61a7c0637a371c946ea69b46f9dff /indra/newview/llvoavatarself.cpp | |
| parent | b11a625e6ff89470d25273fa426ed13f7abc4a6a (diff) | |
| parent | 0600083891ab5b2c6a79097f65945bcb2d049bed (diff) | |
Automated merge from trunk
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 4347dec805..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; } @@ -1761,14 +1764,8 @@ BOOL LLVOAvatarSelf::canGrabLocalTexture(ETextureIndex type, U32 index) const // search for full permissions version for (S32 i = 0; i < items.count(); i++) { - LLInventoryItem* itemp = items[i]; - LLPermissions item_permissions = itemp->getPermissions(); - if ( item_permissions.allowOperationBy( - PERM_MODIFY, gAgent.getID(), gAgent.getGroupID()) && - item_permissions.allowOperationBy( - PERM_COPY, gAgent.getID(), gAgent.getGroupID()) && - item_permissions.allowOperationBy( - PERM_TRANSFER, gAgent.getID(), gAgent.getGroupID()) ) + LLViewerInventoryItem* itemp = items[i]; + if (itemp->getIsFullPerm()) { can_grab = TRUE; break; |