summaryrefslogtreecommitdiff
path: root/indra/newview/llurldispatcher.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:19:11 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:19:11 -0400
commitc77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (patch)
treed30164242aa4af36f721033eb7a93fb2f2198de4 /indra/newview/llurldispatcher.h
parentf1b1dbaba54ce678e6ec5311d4b50ded3f91d58c (diff)
parente0adaa188ba06b6d3f3282121d149193de87c6e6 (diff)
merge changes for storm-250
Diffstat (limited to 'indra/newview/llurldispatcher.h')
-rw-r--r--indra/newview/llurldispatcher.h3
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