summaryrefslogtreecommitdiff
path: root/indra/newview/llcommandhandler.h
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-08-24 07:37:50 +0800
committerErik Kundiman <erik@megapahit.org>2023-08-24 07:37:50 +0800
commit7f354c70ba623b591c36dadd0f6616b349be4fc7 (patch)
tree67557a9981877e6e4b1f08937dfde94e6287dc61 /indra/newview/llcommandhandler.h
parent5b9cb5bba3c12b1b5c86ba56d43ccf06b83edc14 (diff)
parent33e0766ee08cccb480675a75d83b3a6e78849906 (diff)
Merge tag '6.6.14-release'
source for viewer 6.6.14.581101
Diffstat (limited to 'indra/newview/llcommandhandler.h')
-rw-r--r--indra/newview/llcommandhandler.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llcommandhandler.h b/indra/newview/llcommandhandler.h
index 486feecca6..1a354b04f7 100644
--- a/indra/newview/llcommandhandler.h
+++ b/indra/newview/llcommandhandler.h
@@ -42,7 +42,7 @@ public:
LLFooHandler() : LLCommandHandler("foo", UNTRUSTED_BLOCK) { }
// Your code here
- bool handle(const LLSD& tokens, const LLSD& query_map,
+ bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid,
LLMediaCtrl* web)
{
if (tokens.size() < 1) return false;
@@ -90,6 +90,7 @@ public:
virtual bool handle(const LLSD& params,
const LLSD& query_map,
+ const std::string& grid,
LLMediaCtrl* web) = 0;
// For URL secondlife:///app/foo/bar/baz?cat=1&dog=2
// @params - array of "bar", "baz", possibly empty
@@ -106,6 +107,7 @@ public:
static bool dispatch(const std::string& cmd,
const LLSD& params,
const LLSD& query_map,
+ const std::string& grid,
LLMediaCtrl* web,
const std::string& nav_type,
bool trusted_browser);