diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-07 11:15:56 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-07 11:15:56 -0400 |
commit | b8e67774397f2878aafc5906845f5f738e00c408 (patch) | |
tree | 02ed12e0d5534fbf71f3ab8ce222d7508d73166d /indra/newview/llcommandhandler.h | |
parent | 755f9d9ac9548e27d68ec701676e20c4824833f8 (diff) | |
parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) |
SL-18837: Merge branch 'main' into actions
Diffstat (limited to 'indra/newview/llcommandhandler.h')
-rw-r--r-- | indra/newview/llcommandhandler.h | 4 |
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); |