From a433c05bb086b14c7440da0f7f2895c46926eaea Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 7 Nov 2016 21:03:05 +0200
Subject: [PATCH] MAINT-6911 Fixes viewer crash after using "Clear settings &
reset form"
---
doc/contributions.txt | 1 +
indra/newview/llfloatermodeluploadbase.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 00e09e452fb..23aa1623017 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 0fe97fd610f..7cdfd56d9ab 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)
--
GitLab