From 1edf45f33b52b2f7e86d0e9b58fa7373e4870f5a Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 29 Sep 2014 11:37:54 +0300
Subject: MAINT-4473 FIXED Don't erase logs location path on pressing Cancel
button.
---
indra/newview/llfloaterpreference.cpp | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'indra/newview/llfloaterpreference.cpp')
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 2eadd40bfa..08d82bfd95 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1998,6 +1998,12 @@ void LLPanelPreference::cancel()
{
LLControlVariable* control = iter->first;
LLSD ctrl_value = iter->second;
+
+ if((control->getName() == "InstantMessageLogPath") && (ctrl_value.asString() == ""))
+ {
+ continue;
+ }
+
control->set(ctrl_value);
}
--
cgit v1.2.3