Hooked up responder, added navmeshupload capabilty to viewer

4 files changed, 25 insertions, 6 deletions

diff --git a/indra/newview/llnavmeshstation.cpp b/indra/newview/llnavmeshstation.cpp
index 2128411a07..565cc4eb2d 100644
--- a/indra/newview/llnavmeshstation.cpp
+++ b/indra/newview/llnavmeshstation.cpp
@@ -52,8 +52,22 @@ public:
 	}
 	
 	void result( const LLSD& content )
-	{
-		content;
+	{		
+		llinfos<<"Content received"<<llendl;
+		//TODO# some sanity checking
+		if ( content.has("error") )
+		{
+			llwarns	<< "Error on fetched data"<< llendl;
+		}
+		else 
+		{
+			LLNavMeshObserver* pObserver = mObserverHandle.get();
+			if ( pObserver )
+			{
+				llinfos<<"Do something immensely important w/content"<<llendl;
+				//pObserver->execute();
+			}
+		}	
 	}
 	
 private:
diff --git a/indra/newview/llnavmeshstation.h b/indra/newview/llnavmeshstation.h
index acb9a6932e..ed607be52a 100644
--- a/indra/newview/llnavmeshstation.h
+++ b/indra/newview/llnavmeshstation.h
@@ -46,7 +46,7 @@ protected:
 	LLRootHandle<LLNavMeshObserver> mObserverHandle;	

 };

 //===============================================================================

-class LLNavMeshStation : public LLSingleton<LLNavMeshStation>, LLNavMeshObserver

+class LLNavMeshStation : public LLSingleton<LLNavMeshStation>

 {

 public:

 	//Ctor

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index baea83ffd9..18247a2dad 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -90,9 +90,10 @@ class LLBuildNavMesh  : public view_listener_t
 		return result;
 	}
 };
-
+//prep#
 class LLFileUploadNavMesh  : public view_listener_t, LLNavMeshObserver
 {
+	
 	bool handleEvent(const LLSD& userdata)
 	{
 		LLPathingLib::initSystem();
@@ -115,7 +116,8 @@ class LLFileUploadNavMesh  : public view_listener_t, LLNavMeshObserver
 					llinfos<< typeid(*this).name() <<"setNavMeshUploadURL "<< url <<llendl;					
 					//Populate the required paramters that are required to store in the dictionary
 					data["agent_id"]  = gAgent.getID();
-					data["object_id"] = "prepFIXME#IsThisReallyNeeded?";
+					LLUUID object_id;
+					data["object_id"] = object_id; //"prepFIXME#IsThisReallyNeeded?";
 					data["region_id"] = gAgent.getRegion()->getRegionID();
 					data["sim_host"]  = gAgent.getRegion()->getHost().getString();
 					data["sim_port"]  = (S32)gAgent.getRegion()->getHost().getPort();
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index ed943964f9..73a0d4de24 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1519,6 +1519,10 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("MapLayer");
 	capabilityNames.append("MapLayerGod");
 	capabilityNames.append("MeshUploadFlag");
+	
+	//perp#
+	capabilityNames.append("NavMeshUpload");
+
 	capabilityNames.append("NewFileAgentInventory");
 	capabilityNames.append("ParcelPropertiesUpdate");
 	capabilityNames.append("ParcelMediaURLFilterList");
@@ -1554,7 +1558,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("ViewerMetrics");
 	capabilityNames.append("ViewerStartAuction");
 	capabilityNames.append("ViewerStats");
-	
 	// Please add new capabilities alphabetically to reduce
 	// merge conflicts.
 }