From 291d99bc66c4c2b8009ba723a43e2e97d24313f9 Mon Sep 17 00:00:00 2001 From: Tess Chu Date: Thu, 15 Nov 2007 19:22:19 +0000 Subject: svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6 --- indra/newview/llcommandhandler.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'indra/newview/llcommandhandler.h') diff --git a/indra/newview/llcommandhandler.h b/indra/newview/llcommandhandler.h index 50928e210b..0cb9d123fa 100644 --- a/indra/newview/llcommandhandler.h +++ b/indra/newview/llcommandhandler.h @@ -44,7 +44,7 @@ public: LLFooHandler() : LLCommandHandler("foo") { } // Your code here - bool handle(const std::vector& tokens) + bool handle(const LLSD& tokens, const LLSD& queryMap) { if (tokens.size() < 1) return false; LLUUID id( tokens[0] ); @@ -65,7 +65,8 @@ public: virtual ~LLCommandHandler(); - virtual bool handle(const std::vector& params) = 0; + virtual bool handle(const LLSD& params, + const LLSD& queryMap) = 0; // Execute the command with a provided (possibly empty) // list of parameters. // Return true if you did something, false if the parameters @@ -76,7 +77,9 @@ public: class LLCommandDispatcher { public: - static bool dispatch(const std::string& cmd, const std::vector& params); + static bool dispatch(const std::string& cmd, + const LLSD& params, + const LLSD& queryMap); // Execute a command registered via the above mechanism, // passing string parameters. // Returns true if command was found and executed correctly. -- cgit v1.2.3