summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmaterialeditor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 71499ae97b..9b1c06d313 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -424,11 +424,11 @@ BOOL LLMaterialEditor::postBuild()
void LLMaterialEditor::onClickCloseBtn(bool app_quitting)
{
- if (app_quitting)
+ if (app_quitting || mIsOverride)
{
closeFloater(app_quitting);
}
- else if (!mIsOverride)
+ else
{
onClickCancel();
}