summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-08-13 12:21:28 -0700
committerRichard Nelson <none@none>2010-08-13 12:21:28 -0700
commit187c229aca41a2a26caf05bd7d8d6c0d6a378699 (patch)
tree804f5abc9b8af1982dac1951398804f1b1e879e4 /indra
parent2696bb058290ebfb261f0f43130a9a3d72253041 (diff)
fix for hints reappearing even after criteria passed
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llagent.cpp1
-rw-r--r--indra/newview/llfirstuse.cpp1
2 files changed, 2 insertions, 0 deletions
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);
}
}