From 813b140d0767146b17acf4ad2fb96fbd5a347c34 Mon Sep 17 00:00:00 2001 From: Tess Chu Date: Thu, 15 Nov 2007 22:39:12 +0000 Subject: svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge --- indra/newview/llcommandhandler.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'indra/newview/llcommandhandler.cpp') diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp index 95a30e8903..fd3aef9afc 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 LLSD& params, const LLSD& queryMap); + bool dispatch(const std::string& cmd, const std::vector& params); private: std::map mMap; @@ -68,14 +68,13 @@ void LLCommandHandlerRegistry::add(const char* cmd, LLCommandHandler* handler) } bool LLCommandHandlerRegistry::dispatch(const std::string& cmd, - const LLSD& params, - const LLSD& queryMap) + const std::vector& params) { 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, queryMap); + return handler->handle(params); } //--------------------------------------------------------------------------- @@ -98,7 +97,7 @@ LLCommandHandler::~LLCommandHandler() //--------------------------------------------------------------------------- // static -bool LLCommandDispatcher::dispatch(const std::string& cmd, const LLSD& params, const LLSD& queryMap) +bool LLCommandDispatcher::dispatch(const std::string& cmd, const std::vector& params) { - return LLCommandHandlerRegistry::instance().dispatch(cmd, params, queryMap); + return LLCommandHandlerRegistry::instance().dispatch(cmd, params); } -- cgit v1.2.3