diff options
author | Don Kjer <don@lindenlab.com> | 2011-04-14 18:27:31 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-04-14 18:27:31 +0000 |
commit | 01f4570c795b197e74bfa96139631c43df8d0664 (patch) | |
tree | 7c1952cc51adec21025f537281e59f828e75224d /indra/newview/llcommandhandler.h | |
parent | 2bf967149626672584b17b53fb5d2e6186f3d896 (diff) | |
parent | 88a7262340f2fc5085f4ac6600790518d01292d6 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llcommandhandler.h')
-rw-r--r-- | indra/newview/llcommandhandler.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llcommandhandler.h b/indra/newview/llcommandhandler.h index 1e65b6de23..1e0895565a 100644 --- a/indra/newview/llcommandhandler.h +++ b/indra/newview/llcommandhandler.h @@ -95,6 +95,7 @@ public: const LLSD& params, const LLSD& query_map, LLMediaCtrl* web, + const std::string& nav_type, bool trusted_browser); // Execute a command registered via the above mechanism, // passing string parameters. |