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.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/newview/llcommandhandler.cpp') diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp index fd3aef9afc..95a30e8903 100644 --- a/indra/newview/llcommandhandler.cpp +++ b/indra/newview/llcommandhandler.cpp @@ -46,7 +46,7 @@ class LLCommandHandlerRegistry public: static LLCommandHandlerRegistry& instance(); void add(const char* cmd, LLCommandHandler* handler); - bool dispatch(const std::string& cmd, const std::vector& params); + bool dispatch(const std::string& cmd, const LLSD& params, const LLSD& queryMap); private: std::map mMap; @@ -68,13 +68,14 @@ void LLCommandHandlerRegistry::add(const char* cmd, LLCommandHandler* handler) } bool LLCommandHandlerRegistry::dispatch(const std::string& cmd, - const std::vector& params) + const LLSD& params, + const LLSD& queryMap) { std::map::iterator it = mMap.find(cmd); if (it == mMap.end()) return false; LLCommandHandler* handler = it->second; if (!handler) return false; - return handler->handle(params); + return handler->handle(params, queryMap); } //--------------------------------------------------------------------------- @@ -97,7 +98,7 @@ LLCommandHandler::~LLCommandHandler() //--------------------------------------------------------------------------- // static -bool LLCommandDispatcher::dispatch(const std::string& cmd, const std::vector& params) +bool LLCommandDispatcher::dispatch(const std::string& cmd, const LLSD& params, const LLSD& queryMap) { - return LLCommandHandlerRegistry::instance().dispatch(cmd, params); + return LLCommandHandlerRegistry::instance().dispatch(cmd, params, queryMap); } -- cgit v1.2.3