diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-04-15 15:57:57 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-04-15 15:57:57 -0700 |
| commit | ddd599b3473609788e430adf1895b12a5cb35375 (patch) | |
| tree | c41da37ab77e25cfc76d85448c51103a7b55e2ca /indra/newview/llurldispatcher.h | |
| parent | ebe0c8204df30a85b8228e81acbcf7945c15220c (diff) | |
| parent | 411a1bfcb6e6f7c0bc6e8afcf8aed447426df340 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llurldispatcher.h')
| -rw-r--r-- | indra/newview/llurldispatcher.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llurldispatcher.h b/indra/newview/llurldispatcher.h index b07db4da3f..6309a97af5 100644 --- a/indra/newview/llurldispatcher.h +++ b/indra/newview/llurldispatcher.h @@ -33,6 +33,7 @@ class LLURLDispatcher public: static bool dispatch(const std::string& slurl, + const std::string& nav_type, LLMediaCtrl* web, bool trusted_browser); // At startup time and on clicks in internal web browsers, @@ -41,6 +42,8 @@ public: // secondlife://RegionName/123/45/67/ // secondlife:///app/agent/3d6181b0-6a4b-97ef-18d8-722652995cf1/show // sl://app/foo/bar + // @param nav_type + // type of navigation type (see LLQtWebKit::LLWebPage::acceptNavigationRequest) // @param web // Pointer to LLMediaCtrl sending URL, can be NULL // @param trusted_browser |