summaryrefslogtreecommitdiff
path: root/indra/newview/llcommandhandler.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:40:13 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:40:13 -0400
commitee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (patch)
tree73ffbc468a65c2d4ed4c0dede4e24ad9e7cd69fd /indra/newview/llcommandhandler.h
parenta248ed2a2ccb89c9716f8657ef3c52269518c909 (diff)
parent60bceb759b592348b403689ffa8ed9c768126f8b (diff)
merge changes for storm-1057
Diffstat (limited to 'indra/newview/llcommandhandler.h')
-rw-r--r--indra/newview/llcommandhandler.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llcommandhandler.h b/indra/newview/llcommandhandler.h
index 1e65b6de23..1e0895565a 100644
--- a/indra/newview/llcommandhandler.h
+++ b/indra/newview/llcommandhandler.h
@@ -95,6 +95,7 @@ public:
const LLSD& params,
const LLSD& query_map,
LLMediaCtrl* web,
+ const std::string& nav_type,
bool trusted_browser);
// Execute a command registered via the above mechanism,
// passing string parameters.