diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index df7f06a7740d25f501b128a0b760c077173971e3..baea83ffd9be99849ebde96d3e92e7ee81f8ae0e 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -115,10 +115,10 @@ 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";
+					data["object_id"] = "prepFIXME#IsThisReallyNeeded?";
 					data["region_id"] = gAgent.getRegion()->getRegionID();
-					data["sim_host"]  = "prepFIXME";
-					data["sim_port"]  = "prepFIXME";						
+					data["sim_host"]  = gAgent.getRegion()->getHost().getString();
+					data["sim_port"]  = (S32)gAgent.getRegion()->getHost().getPort();
 					LLNavMeshStation::getInstance()->setNavMeshUploadURL( url );
 					LLNavMeshStation::getInstance()->postNavMeshToServer( data, getObserverHandle() );
 				}