From 815afaad1b9e69ef599690be9831f200d7fbd9c1 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 24 Jan 2012 17:52:31 -0800
Subject: Putting back in the code to update the status message on the
 pathfinding console floater after the navmesh data has been received.

---
 indra/newview/llnavmeshstation.cpp | 4 ++++
 indra/newview/llnavmeshstation.h   | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llnavmeshstation.cpp b/indra/newview/llnavmeshstation.cpp
index 6f6ebc184a..90ae38b715 100644
--- a/indra/newview/llnavmeshstation.cpp
+++ b/indra/newview/llnavmeshstation.cpp
@@ -31,6 +31,8 @@
 #include "llagent.h"
 #include "llviewerregion.h"
 #include "llsdutil.h"
+#include "llfloaterpathfindingconsole.h"
+
 //===============================================================================
 LLNavMeshStation::LLNavMeshStation()
 {
@@ -69,10 +71,12 @@ public:
 				{
 					const LLSD::Binary& stuff = content["navmesh_data"].asBinary();
 					LLPathingLib::getInstance()->extractNavMeshSrcFromLLSD( stuff, mDir );
+					pObserver->getPathfindingConsole()->setHasNavMeshReceived();
 				}
 				else
 				{
 					llwarns<<"no mesh data "<<llendl;
+					pObserver->getPathfindingConsole()->setHasNoNavMesh();
 				}
 			}
 		}	
diff --git a/indra/newview/llnavmeshstation.h b/indra/newview/llnavmeshstation.h
index c8e23513eb..72bf725688 100644
--- a/indra/newview/llnavmeshstation.h
+++ b/indra/newview/llnavmeshstation.h
@@ -37,14 +37,19 @@ class LLNavMeshObserver
 {
 public:
 	//Ctor
-	LLNavMeshObserver() { mObserverHandle.bind(this); }
+	LLNavMeshObserver()
+		: mPathfindingConsole(NULL)
+	{ mObserverHandle.bind(this); }
 	//Dtor
 	virtual ~LLNavMeshObserver() {}
 	//Accessor for the observers handle
 	const LLHandle<LLNavMeshObserver>& getObserverHandle() const { return mObserverHandle; }
+	LLFloaterPathfindingConsole *getPathfindingConsole() {return mPathfindingConsole;}
+	void                        setPathfindingConsole(LLFloaterPathfindingConsole *pPathfindingConsole) {mPathfindingConsole = pPathfindingConsole;}
 
 protected:
 	LLRootHandle<LLNavMeshObserver> mObserverHandle;	
+	LLFloaterPathfindingConsole     *mPathfindingConsole;
 };
 //===============================================================================
 class LLNavMeshDownloadObserver
-- 
cgit v1.2.3