summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenufile.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2011-11-04 14:10:48 -0400
committerprep <prep@lindenlab.com>2011-11-04 14:10:48 -0400
commit1194063e316461e5b4bf93c1c9ab8e99fefb435b (patch)
treeb1053c8761397cabea6382e164feeb4b7c007f4e /indra/newview/llviewermenufile.cpp
parentbfbd649b4c2a2e03298e82d1caa6611dee4411cb (diff)
Hooked up responder, added navmeshupload capabilty to viewer
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
-rw-r--r--indra/newview/llviewermenufile.cpp6
1 files changed, 4 insertions, 2 deletions
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();