diff options
| author | Richard Linden <none@none> | 2011-03-28 17:38:54 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-28 17:38:54 -0700 |
| commit | 84b179b0bf254ae039dfdba330d25ac2df1c0a67 (patch) | |
| tree | 8e35dad1a88b3538722ee3d68891fa6ef9fdf779 /indra/newview/llcommandhandler.h | |
| parent | 5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (diff) | |
| parent | d597efc0f365fa07de9b7c0641dc4297466bfae5 (diff) | |
Automated merge with file:///F:\code\viewer-autobuild2010
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. |