diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-03-13 00:22:06 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-03-13 00:22:06 -0400 |
| commit | 864b5a7222cc20fea82e3e2ad7fd1055ed72f552 (patch) | |
| tree | 604b9ce6f1b13c020e6fe96acc0714584285b0c5 | |
| parent | 418aec4dd28f4e0a373232cc86324a35ffc4345f (diff) | |
Move callback registration for the avatar tracker to STATE_AGENT_SEND.
| -rw-r--r-- | indra/newview/llstartup.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index db75e4555b..3973036cc6 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1306,15 +1306,6 @@ bool idle_startup() do_startup_frame(); do_startup_frame(); - - // It is entirely possible that we may get the friends list _before_ we have the callbacks registered to process that. - // This will lead to the friends list not being processed properly and online statuses not being updated appropriately at login. - // So, we need to make sure that we have the callbacks registered before we get the friends list. - // -Geenz 2025-03-12 - LL_INFOS() << " AvatarTracker" << LL_ENDL; - LLAvatarTracker::instance().registerCallbacks(gMessageSystem); - do_startup_frame(); - // Since we connected, save off the settings so the user doesn't have to // type the name/password again if we crash. gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), true); @@ -1723,6 +1714,15 @@ bool idle_startup() gAssetStorage->setUpstream(regionp->getHost()); gCacheName->setUpstream(regionp->getHost()); } + + // It is entirely possible that we may get the friends list _before_ we have the callbacks registered to process that. + // This will lead to the friends list not being processed properly and online statuses not being updated appropriately at login. + // So, we need to make sure that we have the callbacks registered before we get the friends list. + // This appears to crop up on some systems somewhere between STATE_AGENT_SEND and STATE_INVENTORY_SEND. It's happened to me a few times now. + // -Geenz 2025-03-12 + LL_INFOS() << " AvatarTracker" << LL_ENDL; + LLAvatarTracker::instance().registerCallbacks(gMessageSystem); + do_startup_frame(); // Create login effect |