From 7c0a6df30a1d78611782767763b7710702b96336 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Mon, 20 Sep 2010 16:21:00 -0700
Subject: EXP-60 FIX not showing after Re-enabling Hints in same session

---
 indra/newview/llagent.cpp    |  1 -
 indra/newview/llfirstuse.cpp | 13 ++++++++-----
 indra/newview/llhints.cpp    | 29 +++++++++++++----------------
 3 files changed, 21 insertions(+), 22 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index fec29eac17..c9bd7851ed 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1557,7 +1557,6 @@ void LLAgent::updateAgentPosition(const F32 dt, const F32 yaw_radians, const S32
 	if (mMoveTimer.getStarted() && mMoveTimer.getElapsedTimeF32() > gSavedSettings.getF32("NotMovingHintTimeout"))
 	{
 		LLFirstUse::notMoving();
-		mMoveTimer.stop();
 	}
 
 	propagate(dt);
diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
index 1764d6b145..dd08706f4f 100644
--- a/indra/newview/llfirstuse.cpp
+++ b/indra/newview/llfirstuse.cpp
@@ -130,12 +130,15 @@ void LLFirstUse::firstUseNotification(const std::string& control_var, bool enabl
 
 	if (enable)
 	{
-		LL_DEBUGS("LLFirstUse") << "Trigger first use notification " << notification_name << LL_ENDL;
+		if (gSavedSettings.getBOOL("EnableUIHints"))
+		{
+			LL_DEBUGS("LLFirstUse") << "Trigger first use notification " << notification_name << LL_ENDL;
 
-		// if notification doesn't already exist and this notification hasn't been disabled...
-		if (gWarningSettings.getBOOL(control_var))
-		{ // create new notification
-			LLNotifications::instance().add(LLNotification::Params().name(notification_name).substitutions(args).payload(payload.with("control_var", control_var)));
+			// if notification doesn't already exist and this notification hasn't been disabled...
+			if (gWarningSettings.getBOOL(control_var))
+			{ // create new notification
+				LLNotifications::instance().add(LLNotification::Params().name(notification_name).substitutions(args).payload(payload.with("control_var", control_var)));
+			}
 		}
 	}	
 	else
diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index 393aa188e1..a8274b3887 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -310,26 +310,23 @@ std::map<LLNotificationPtr, class LLHintPopup*> LLHints::sHints;
 //static
 void LLHints::show(LLNotificationPtr hint)
 {
-	if (gSavedSettings.getBOOL("EnableUIHints"))
-	{
-		LLHintPopup::Params p(LLUICtrlFactory::getDefaultParams<LLHintPopup>());
+	LLHintPopup::Params p(LLUICtrlFactory::getDefaultParams<LLHintPopup>());
 
-		LLParamSDParser parser;
-		parser.readSD(hint->getPayload(), p, true);
-		p.notification = hint;
+	LLParamSDParser parser;
+	parser.readSD(hint->getPayload(), p, true);
+	p.notification = hint;
 
-		if (p.validateBlock())
-		{
-			LLHintPopup* popup = new LLHintPopup(p);
+	if (p.validateBlock())
+	{
+		LLHintPopup* popup = new LLHintPopup(p);
 
-			sHints[hint] = popup;
+		sHints[hint] = popup;
 
-			LLView* hint_holder = gViewerWindow->getHintHolder();
-			if (hint_holder)
-			{
-				hint_holder->addChild(popup);
-				popup->centerWithin(hint_holder->getLocalRect());
-			}
+		LLView* hint_holder = gViewerWindow->getHintHolder();
+		if (hint_holder)
+		{
+			hint_holder->addChild(popup);
+			popup->centerWithin(hint_holder->getLocalRect());
 		}
 	}
 }
-- 
cgit v1.2.3