From 187c229aca41a2a26caf05bd7d8d6c0d6a378699 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Fri, 13 Aug 2010 12:21:28 -0700
Subject: fix for hints reappearing even after criteria passed

---
 indra/newview/llagent.cpp    | 1 +
 indra/newview/llfirstuse.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index aade16cc7b..70bda3893e 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1556,6 +1556,7 @@ 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 4708087846..15de138c95 100644
--- a/indra/newview/llfirstuse.cpp
+++ b/indra/newview/llfirstuse.cpp
@@ -160,6 +160,7 @@ void LLFirstUse::firstUseNotification(const std::string& control_var, bool enabl
 			LLNotifications::instance().cancel(notif);
 			sNotifications.erase(notification_name);
 		}
+		gWarningSettings.setBOOL(control_var, FALSE);
 	}
 
 }
-- 
cgit v1.2.3