From ab93c0ffb5f7601a7baee770f904537981be431a Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 17 Dec 2009 16:15:46 -0800
Subject: [PATCH] EXT-3534 Default Location Obscures the Top of an Open
Notecard When Nav and/or Favorites Bar are Hidden EXT-3334 [BSI] Chat/IM
log preferences not retained EXT-3402 Replace "X" for checked menu items
with a check mark glyph [Patch Included] reviewed by richard
---
indra/llui/llmenugl.cpp | 2 +-
indra/newview/llfloaterpreference.cpp | 5 +----
indra/newview/llviewercontrol.cpp | 19 -------------------
3 files changed, 2 insertions(+), 24 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 ab27375b87..4cd0727ce2 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -628,12 +628,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);
- mCancelOnClose = true;
gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
LLUIColorTable::instance().saveUserSettings();
std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 6339d23fa7..004e3c6380 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -516,33 +516,14 @@ bool toggle_show_snapshot_button(const LLSD& newvalue)
bool toggle_show_navigation_panel(const LLSD& newvalue)
{
- LLRect floater_view_rect = gFloaterView->getRect();
- LLRect notify_view_rect = gNotifyBoxView->getRect();
LLNavigationBar* navbar = LLNavigationBar::getInstance();
-
- //if newvalue contains 0 => navbar should turn invisible, so floater_view_rect should get higher,
- //and to do this pm=1, else if navbar becomes visible pm=-1 so floater_view_rect gets lower.
- int pm=newvalue.asBoolean()?-1:1;
- floater_view_rect.mTop += pm*(navbar->getDefNavBarHeight()-navbar->getDefFavBarHeight());
- notify_view_rect.mTop += pm*(navbar->getDefNavBarHeight()-navbar->getDefFavBarHeight());
- gFloaterView->setRect(floater_view_rect);
- floater_view_rect = gFloaterView->getRect();
navbar->showNavigationPanel(newvalue.asBoolean());
return true;
}
bool toggle_show_favorites_panel(const LLSD& newvalue)
{
- LLRect floater_view_rect = gFloaterView->getRect();
- LLRect notify_view_rect = gNotifyBoxView->getRect();
LLNavigationBar* navbar = LLNavigationBar::getInstance();
-
- //if newvalue contains 0 => favbar should turn invisible, so floater_view_rect should get higher,
- //and to do this pm=1, else if favbar becomes visible pm=-1 so floater_view_rect gets lower.
- int pm=newvalue.asBoolean()?-1:1;
- floater_view_rect.mTop += pm*navbar->getDefFavBarHeight();
- notify_view_rect.mTop += pm*navbar->getDefFavBarHeight();
- gFloaterView->setRect(floater_view_rect);
navbar->showFavoritesPanel(newvalue.asBoolean());
return true;
}
--
GitLab