diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-12-17 16:23:29 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-12-17 16:23:29 -0800 |
| commit | 43ed40f9761902833a3c78600515bd42d4f90e51 (patch) | |
| tree | ebfb119440b95d94d9d52d7095916d966ff490d5 | |
| parent | 9cd338c1f3715a9cae3bb29701984853d2de82ea (diff) | |
| parent | ab93c0ffb5f7601a7baee770f904537981be431a (diff) | |
merge
| -rw-r--r-- | indra/llui/llmenugl.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index fd5c2b7fef..c42ae040d6 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -97,7 +97,7 @@ const U32 SEPARATOR_HEIGHT_PIXELS = 8; const S32 TEAROFF_SEPARATOR_HEIGHT_PIXELS = 10; const S32 MENU_ITEM_PADDING = 4; -const std::string BOOLEAN_TRUE_PREFIX( "X" ); +const std::string BOOLEAN_TRUE_PREFIX( "\xE2\x9C\x94" ); // U+2714 HEAVY CHECK MARK const std::string BRANCH_SUFFIX( ">" ); const std::string ARROW_UP ("^^^^^^^"); const std::string ARROW_DOWN("vvvvvvv"); diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index a333868b8c..ee6d5fad6c 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -631,12 +631,9 @@ void LLFloaterPreference::onBtnOK() if (canClose()) { + saveSettings(); apply(); - // Here we do not want to cancel on close, so we do this funny thing - // that prevents cancel from undoing our changes when we hit OK - mCancelOnClose = false; closeFloater(false); - // closeFloater() will be called when viewer is quitting, leaving mCancelOnClose = true; // will cancel all changes we saved here, don't let this happen. // Fix for EXT-3465 |