diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-04-14 15:16:15 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-04-14 15:16:15 +0300 |
| commit | 8636ed0db750f624d03470232c7d03122a120c7d (patch) | |
| tree | e7d3518693796708c12977b21b15cf4e852211fb /indra/newview/llurldispatcher.h | |
| parent | c4f03ca949c25b6fd5794ebada5c5e65154a33c0 (diff) | |
| parent | 88a7262340f2fc5085f4ac6600790518d01292d6 (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 |