diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-10-15 23:49:00 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-11 00:07:38 +0300 |
| commit | bab3bc4ebd8f33d80411d6d28e16eea6b865e8fd (patch) | |
| tree | 8fa877a1984cb66d9ca7b7fbd42792573b017c58 /indra/newview | |
| parent | a510a1da004a9299d5389e77bb9aa43ae1cc1c60 (diff) | |
Fix more merge issues:
* Re-apply changes from a620e58daccf92b5b8d61347312739720ed2b51a
* Fix duplicate code resulting from 826236f1bc065fba257d7954d11ac98c59493445
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index d249d230c6..28fcea6228 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -8510,7 +8510,6 @@ bool LLVOAvatar::processFullyLoadedChange(bool loading) ((mFullyLoaded != mPreviousFullyLoaded) || // if the value is different from the previous call (!mFullyLoadedInitialized) || // if we've never been called before (mFullyLoadedFrameCounter % UPDATE_RATE == 0)); // every now and then issue a change - bool fully_loaded_changed = (mFullyLoaded != mPreviousFullyLoaded); mPreviousFullyLoaded = mFullyLoaded; mFullyLoadedInitialized = true; |