diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:33:19 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:33:19 -0500 |
| commit | cd64ae7fb8ee781a5bf9ac47dd2428e659b939c9 (patch) | |
| tree | 9638dfe3ce3a7d5399d6f52552c9e1e3f308fd46 /indra/newview/llvoavatar.cpp | |
| parent | e4f1f611a4736e4b0b78c0d61c3c5f576fec93d0 (diff) | |
| parent | 2abb1a81c56a27eab02157851cb9e67730231bb6 (diff) | |
reconciled .hgtags
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 |