diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:23:39 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:23:39 -0400 |
| commit | 38306a2bbbcaaa0825db88aab39f7d10943f9af3 (patch) | |
| tree | ab5f360c6537510303da006a7678124c3134613b /indra/newview/llcommandhandler.h | |
| parent | 6715603b6a991f822274b000e5d8fb9b8d405464 (diff) | |
| parent | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff) | |
automated merge viewer-pre-beta -> seraph-viewer-pre-beta
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. |