summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2010-06-21 12:20:24 -0400
committerNat Goodspeed <nat@lindenlab.com>2010-06-21 12:20:24 -0400
commitf17623d8c67a10c2d7547e40ac8442c703d107ed (patch)
tree2ae37385da280a758a66e920f9bdb317dcde59ee /indra/newview/llviewercontrol.cpp
parent4e538adca41d486125c3b887ce694c457bcab157 (diff)
parentbef22c0325cbfeb3d290753a66ecf862bf4593d3 (diff)
Automated merge with ssh://192.168.2.107/c:/linden/viewer-release/
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rw-r--r--indra/newview/llviewercontrol.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index f4b4954cbd..f2c9fbf78d 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -462,7 +462,11 @@ bool toggle_agent_pause(const LLSD& newvalue)
bool toggle_show_navigation_panel(const LLSD& newvalue)
{
- LLNavigationBar::getInstance()->showNavigationPanel(newvalue.asBoolean());
+ bool value = newvalue.asBoolean();
+
+ LLNavigationBar::getInstance()->showNavigationPanel(value);
+ gSavedSettings.setBOOL("ShowMiniLocationPanel", !value);
+
return true;
}
@@ -474,7 +478,11 @@ bool toggle_show_favorites_panel(const LLSD& newvalue)
bool toggle_show_mini_location_panel(const LLSD& newvalue)
{
- LLPanelTopInfoBar::getInstance()->setVisible(newvalue.asBoolean());
+ bool value = newvalue.asBoolean();
+
+ LLPanelTopInfoBar::getInstance()->setVisible(value);
+ gSavedSettings.setBOOL("ShowNavbarNavigationPanel", !value);
+
return true;
}