From 133a7b5fe2bcaaec8389b209cb5bd774ebc2ab63 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 14 Mar 2008 19:27:38 +0000
Subject: svn merge -r 82272:82277
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 -->
 release

QAR-364 - merge of maint-ui-9
---
 indra/newview/llviewermenu.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'indra/newview/llviewermenu.cpp')

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8ef9d9c913..a384d24947 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4881,23 +4881,22 @@ class LLWorldAlwaysRun : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
+		// as well as altering the default walk-vs-run state,
+		// we also change the *current* walk-vs-run state.
 		if (gAgent.getAlwaysRun())
 		{
 			gAgent.clearAlwaysRun();
+			gAgent.clearRunning();
 		}
 		else
 		{
 			gAgent.setAlwaysRun();
+			gAgent.setRunning();
 		}
-		LLMessageSystem *msg = gMessageSystem;
 
+		// tell the simulator.
+		gAgent.sendWalkRun(gAgent.getAlwaysRun());
 
-		msg->newMessageFast(_PREHASH_SetAlwaysRun);
-		msg->nextBlockFast(_PREHASH_AgentData);
-		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-		msg->addBOOLFast(_PREHASH_AlwaysRun, gAgent.getAlwaysRun() );
-		gAgent.sendReliableMessage();
 		return true;
 	}
 };
-- 
cgit v1.2.3