From 272c3f6d08aa9c5520c853cff2db4d5430869d81 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sat, 17 Mar 2012 10:38:45 -0400
Subject: [PATCH] Also clear toolbar settings on mode change

---
 indra/newview/llpanellogin.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index beeaf2297c..1fbd5a7f52 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -1337,6 +1337,10 @@ void LLPanelLogin::updateLoginPanelLinks()
  
 void LLPanelLogin::onModeChange(const LLSD& original_value, const LLSD& new_value)
 {
+	// <FS:AO> make sure toolbar settings are reset on mode change
+	llinfos << "Clearing toolbar settings." << llendl;
+        gSavedSettings.setBOOL("ResetToolbarSettings",TRUE);
+
 	if (original_value.asString() != new_value.asString())
 	{
 		LLNotificationsUtil::add("ModeChange", LLSD(), LLSD(), boost::bind(&LLPanelLogin::onModeChangeConfirm, this, original_value, new_value, _1, _2));