diff options
| author | Signal Linden <signal@lindenlab.com> | 2023-11-21 08:07:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 08:07:20 -0800 |
| commit | 5416d94d07ac85ba384fafb0b0b1b11b8cd0b6e4 (patch) | |
| tree | 1c4fd503f43d628dd6223af44aa14921357ae0ab /indra/newview/llstartup.cpp | |
| parent | 9b50c50bf2fe3fab2dbb0bcd18d7c8f5b9a13a1b (diff) | |
| parent | 62c7a17604ba4faec989465a374e7ed7627ec56b (diff) | |
Merge branch 'DRTVWR-587-maint-V' into signal/simple-release
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index ad87fca25b..faa3382b76 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2748,6 +2748,7 @@ void register_viewer_callbacks(LLMessageSystem* msg) msg->setHandlerFunc("InitiateDownload", process_initiate_download); msg->setHandlerFunc("LandStatReply", LLFloaterTopObjects::handle_land_reply); msg->setHandlerFunc("GenericMessage", process_generic_message); + msg->setHandlerFunc("GenericStreamingMessage", process_generic_streaming_message); msg->setHandlerFunc("LargeGenericMessage", process_large_generic_message); msg->setHandlerFuncFast(_PREHASH_FeatureDisabled, process_feature_disabled_message); @@ -2877,8 +2878,7 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name, // Need to fetch cof contents before we can wear. if (do_copy) { - callAfterCategoryFetch(LLAppearanceMgr::instance().getCOF(), - boost::bind(&LLAppearanceMgr::wearInventoryCategory, LLAppearanceMgr::getInstance(), cat, do_copy, do_append)); + callAfterCOFFetch(boost::bind(&LLAppearanceMgr::wearInventoryCategory, LLAppearanceMgr::getInstance(), cat, do_copy, do_append)); } else { |