diff options
-rwxr-xr-x | indra/newview/lltoolmorph.cpp | 4 | ||||
-rw-r--r-- | indra/newview/llviewerwearable.cpp | 6 | ||||
-rw-r--r-- | indra/newview/llviewerwearable.h | 6 | ||||
-rwxr-xr-x | indra/newview/llvoavatar.cpp | 6 |
4 files changed, 12 insertions, 10 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index fa94b52362..71e0509d03 100755 --- a/indra/newview/lltoolmorph.cpp +++ b/indra/newview/lltoolmorph.cpp @@ -151,7 +151,7 @@ void LLVisualParamHint::preRender(BOOL clear_depth) LLViewerWearable* wearable = (LLViewerWearable*)mWearablePtr; if (wearable) { - wearable->setVolitile(TRUE); + wearable->setVolatile(TRUE); } mLastParamWeight = mVisualParam->getWeight(); mWearablePtr->setVisualParamWeight(mVisualParam->getID(), mVisualParamWeight, FALSE); @@ -250,7 +250,7 @@ BOOL LLVisualParamHint::render() LLViewerWearable* wearable = (LLViewerWearable*)mWearablePtr; if (wearable) { - wearable->setVolitile(FALSE); + wearable->setVolatile(FALSE); } gAgentAvatarp->updateVisualParams(); diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp index e8425dc76a..76f94935b8 100644 --- a/indra/newview/llviewerwearable.cpp +++ b/indra/newview/llviewerwearable.cpp @@ -72,14 +72,16 @@ private: static std::string asset_id_to_filename(const LLUUID &asset_id); LLViewerWearable::LLViewerWearable(const LLTransactionID& transaction_id) : - LLWearable() + LLWearable(), + mVolatile(FALSE) { mTransactionID = transaction_id; mAssetID = mTransactionID.makeAssetID(gAgent.getSecureSessionID()); } LLViewerWearable::LLViewerWearable(const LLAssetID& asset_id) : - LLWearable() + LLWearable(), + mVolatile(FALSE) { mAssetID = asset_id; mTransactionID.setNull(); diff --git a/indra/newview/llviewerwearable.h b/indra/newview/llviewerwearable.h index 047b2ce143..ef8c29323e 100644 --- a/indra/newview/llviewerwearable.h +++ b/indra/newview/llviewerwearable.h @@ -68,8 +68,8 @@ public: void setParamsToDefaults(); void setTexturesToDefaults(); - void setVolitile(BOOL volitle) { mVolitle = volitle; } // TRUE when doing preview renders, some updates will be suppressed. - BOOL getVolitile() { return mVolitle; } + void setVolatile(BOOL is_volatile) { mVolatile = is_volatile; } // TRUE when doing preview renders, some updates will be suppressed. + BOOL getVolatile() { return mVolatile; } /*virtual*/ LLUUID getDefaultTextureImageID(LLAvatarAppearanceDefines::ETextureIndex index) const; @@ -98,7 +98,7 @@ protected: LLAssetID mAssetID; LLTransactionID mTransactionID; - BOOL mVolitle; // True when rendering preview images. Can suppress some updates. + BOOL mVolatile; // True when rendering preview images. Can suppress some updates. LLUUID mItemID; // ID of the inventory item in the agent's inventory }; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 46b909c4a1..8c20533b4c 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5223,7 +5223,7 @@ void LLVOAvatar::computeBodySize() // Enforce a constraint to make sure we don't go below 1.1 meters (server-enforced limit) // Camera positioning and other things start to break down when your avatar is "walking" while being fully underground const LLViewerObject * last_object = NULL; - if (isSelf() && getWearableData() && isFullyLoaded() && !LLApp::isQuitting()) + if (isSelf() && getWearableData() && !LLApp::isQuitting()) { // Do not force a hover parameter change while we have pending attachments, which may be mesh-based with // joint offsets. @@ -5246,7 +5246,7 @@ void LLVOAvatar::computeBodySize() last_object = object; llwarns << "attachment at point: " << (*points_iter).first << " object exists: " << object->getAttachmentItemID() << llendl; loaded &=!object->isDrawableState(LLDrawable::REBUILD_ALL); - if (!loaded && shape && !shape->getVolitile()) + if (!loaded && shape && !shape->getVolatile()) { llwarns << "caught unloaded attachment! skipping enforcement" << llendl; } @@ -5259,7 +5259,7 @@ void LLVOAvatar::computeBodySize() { LL_DEBUGS("Avatar") << "scanned at least one object!" << LL_ENDL; } - if (loaded && shape && !shape->getVolitile()) + if (loaded && shape && !shape->getVolatile()) { F32 hover_value = shape->getVisualParamWeight(AVATAR_HOVER); if (hover_value < 0.0f && (mBodySize.mV[VZ] + hover_value < 1.1f)) |