diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-11-07 21:03:05 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-11-07 21:03:05 +0200 |
| commit | a433c05bb086b14c7440da0f7f2895c46926eaea (patch) | |
| tree | b0cf39cd9c088657964bb47a36c50ae4db87e853 | |
| parent | 6083fd1cbef478c15c49055d27270d0a6f2ddfa2 (diff) | |
MAINT-6911 Fixes viewer crash after using "Clear settings & reset form"
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfloatermodeluploadbase.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 00e09e452f..23aa162301 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 0fe97fd610..7cdfd56d9a 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) |