diff --git a/doc/contributions.txt b/doc/contributions.txt index 00e09e452fb57cd45c7612d99f99016d03c00e5a..23aa1623017b1cd1f7a1931354c9804f2b5577dc 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -205,6 +205,7 @@ Ansariel Hiller MAINT-6752 MAINT-6773 MAINT-6906 + MAINT-6911 STORM-2140 Aralara Rajal Arare Chantilly diff --git a/indra/newview/llfloatermodeluploadbase.cpp b/indra/newview/llfloatermodeluploadbase.cpp index 0fe97fd610f9b41579f09906c2e3325772aa734e..7cdfd56d9ab86e165458aaf22ea14fe1fb8a1c2c 100644 --- a/indra/newview/llfloatermodeluploadbase.cpp +++ b/indra/newview/llfloatermodeluploadbase.cpp @@ -80,6 +80,7 @@ void LLFloaterModelUploadBase::requestAgentUploadPermissionsCoro(std::string url if (!observer) { LL_WARNS("MeshUploadFlag") << "Unable to get observer after call to '" << url << "' aborting." << LL_ENDL; + return; } if (!status)