summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-09-29 11:37:54 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-09-29 11:37:54 +0300
commit1edf45f33b52b2f7e86d0e9b58fa7373e4870f5a (patch)
tree52469f0520ff253f61b8526f322f524f9b56d75b /indra/newview/llfloaterpreference.cpp
parente0efa75ab799b41612c3c87874dff8ea38737a92 (diff)
MAINT-4473 FIXED Don't erase logs location path on pressing Cancel button.
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rwxr-xr-xindra/newview/llfloaterpreference.cpp6
1 files changed, 6 insertions, 0 deletions
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);
}