summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2011-10-26 10:28:58 -0400
committerprep <prep@lindenlab.com>2011-10-26 10:28:58 -0400
commit92d6091538559e17f29a36b022ced7d781f469cb (patch)
tree21c01f04de860f5f0839ad8240ec30f3e6d88077 /indra
parent8d410326c937a375fa0eb7855678e590499a79d2 (diff)
Simple menu hook testing
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewermenufile.cpp20
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml8
2 files changed, 28 insertions, 0 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index b9293b3b31..ec4562d31a 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -78,6 +78,24 @@
// system libraries
#include <boost/tokenizer.hpp>
+class LLBuildNavMesh : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool result = true;
+ return result;
+ }
+};
+
+class LLFileUploadNavMesh : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ llinfos<<"ok"<<llendl;
+ return true;
+ }
+};
+
class LLFileEnableUpload : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@@ -1284,5 +1302,7 @@ void init_menu_file()
view_listener_t::addMenu(new LLMeshEnabled(), "File.MeshEnabled");
view_listener_t::addMenu(new LLMeshUploadVisible(), "File.VisibleUploadModel");
+ //prep#
+ view_listener_t::addCommit(new LLFileUploadNavMesh(), "File.UploadNavMesh");
// "File.SaveTexture" moved to llpanelmaininventory so that it can be properly handled.
}
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 63e50b0b9f..b16b6afceb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1092,6 +1092,14 @@
<menu_item_call.on_visible
function="File.VisibleUploadModel"/>
</menu_item_call>
+ <menu_item_call
+ label="BuildNavMeshTest"
+ layout="topleft"
+ name="BuildNavMesh">
+ <menu_item_call.on_click
+ function="File.UploadNavMesh"
+ parameter="" />
+ </menu_item_call>
<menu_item_call
label="Bulk (L$[COST] per file)..."
layout="topleft"