diff options
| author | Rye <rye@lindenlab.com> | 2024-10-31 21:37:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-31 21:37:47 -0400 |
| commit | 6aa18dc532f6b56dd9b6872553fa9ecb3bf0ca55 (patch) | |
| tree | faad43b153a40ef0a4429883b235ce189604e773 /indra/newview/llvoavatar.cpp | |
| parent | af671c5ce8b8d9c02f8acb9137ff99e8867ec66e (diff) | |
| parent | 20fc24d66564674c74b5d4ac30887af10cf9a8cd (diff) | |
Merge pull request #2983 from secondlife/rye/minor-fixes
Various minor crash and correctness fixes
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 690cfaa677..bfed8b9d39 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -687,7 +687,6 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, mVisualComplexity(VISUAL_COMPLEXITY_UNKNOWN), mLoadedCallbacksPaused(false), mLoadedCallbackTextures(0), - mRenderUnloadedAvatar(LLCachedControl<bool>(gSavedSettings, "RenderUnloadedAvatar", false)), mLastRezzedStatus(-1), mIsEditingAppearance(false), mUseLocalAppearance(false), @@ -8523,7 +8522,8 @@ bool LLVOAvatar::processFullyLoadedChange(bool loading) bool LLVOAvatar::isFullyLoaded() const { - return (mRenderUnloadedAvatar || mFullyLoaded); + static LLCachedControl<bool> render_unloaded_avatars(gSavedSettings, "RenderUnloadedAvatar", false); + return (render_unloaded_avatars || mFullyLoaded); } bool LLVOAvatar::isTooComplex() const |