diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-15 14:30:45 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-15 14:30:45 +0300 |
| commit | 7547530ad1ff176513701fd4337ff0ce6569fac4 (patch) | |
| tree | 4b6393e96123c115ed0957a4ca050cc116142627 | |
| parent | daf79b0e87b5ee8d306cb132fafad5bbf5d1513a (diff) | |
Post-merge cleanup: llvoavatar.cpp
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 27fb04a5dd..52d6740fe5 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -8474,8 +8474,9 @@ bool LLVOAvatar::processFullyLoadedChange(bool loading) } else if (!mFullyLoaded) { - // We wait a little bit before giving the 'all clear', to let things to settle down: - // models to snap into place, textures to get first packets, LODs to load. + // We wait a little bit before giving the 'all clear', to let things to + // settle down: models to snap into place, textures to get first packets, + // LODs to load. const F32 LOADED_DELAY = 1.f; if (mFirstFullyVisible) @@ -8503,11 +8504,11 @@ bool LLVOAvatar::processFullyLoadedChange(bool loading) { mFullyLoaded = (mFullyLoadedTimer.getElapsedTimeF32() > LOADED_DELAY); } - } - if (!mPreviousFullyLoaded && !loading && mFullyLoaded) - { - debugAvatarRezTime("AvatarRezNotification", "fully loaded"); + if (!mPreviousFullyLoaded && !loading && mFullyLoaded) + { + debugAvatarRezTime("AvatarRezNotification", "fully loaded"); + } } // did our loading state "change" from last call? diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 8c6fe5a7b0..6cdf50efea 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -402,7 +402,7 @@ public: virtual bool getIsCloud() const; bool isFullyTextured() const; bool hasGray() const; - S32 getRezzedStatus() const; // 0 = cloud, 1 = gray, 2 = textured, 3 = textured and fully downloaded. + S32 getRezzedStatus() const; // 0 = cloud, 1 = gray, 2 = textured, 3 = waiting for attachments, 4 = full. void updateRezzedStatusTimers(S32 status); S32 mLastRezzedStatus; |