diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
| commit | f1a4593e471f4ae0e08767f73f100add683965bf (patch) | |
| tree | 0f0f42a772c9c739ee5e726a8044e2888d17b735 /indra/newview/llvoavatar.cpp | |
| parent | d7e6f21981b0a00c0d89096cc17bab07be60e51a (diff) | |
| parent | 50a57ba9fec0435a990338398d5c4f23c5cc91f0 (diff) | |
merge changes for vmrg-204
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4c33716c32..4767ba2bed 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -690,7 +690,8 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, mFullyLoadedInitialized(FALSE), mSupportsAlphaLayers(FALSE), mLoadedCallbacksPaused(FALSE), - mHasPelvisOffset( FALSE ) + mHasPelvisOffset( FALSE ), + mRenderUnloadedAvatar(LLCachedControl<bool>(gSavedSettings, "RenderUnloadedAvatar")) { LLMemType mt(LLMemType::MTYPE_AVATAR); //VTResume(); // VTune @@ -6493,10 +6494,7 @@ BOOL LLVOAvatar::processFullyLoadedChange(bool loading) BOOL LLVOAvatar::isFullyLoaded() const { - if (gSavedSettings.getBOOL("RenderUnloadedAvatar")) - return TRUE; - else - return mFullyLoaded; + return (mRenderUnloadedAvatar || mFullyLoaded); } bool LLVOAvatar::isTooComplex() const |