summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.cpp
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-09-08 14:28:31 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-09-08 14:28:31 -0700
commit76001ce3f0b53391c674f315855017b78a3a2873 (patch)
treea2c74f15dcf8c611ce87c4cb6c3a5751e9b8d9e3 /indra/newview/llweb.cpp
parent40743eaf99c9cbfee08f0bb44bc7c614bc660f34 (diff)
parent2ed83382a1dd84575536c16e248a602ba96755cd (diff)
Merge
Diffstat (limited to 'indra/newview/llweb.cpp')
-rw-r--r--indra/newview/llweb.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 300a5db7c3..3204c2d264 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -67,6 +67,7 @@ void LLWeb::initClass()
LLAlertDialog::setURLLoader(&sAlertURLLoader);
}
+
// static
void LLWeb::loadURL(const std::string& url)
{
@@ -76,12 +77,19 @@ void LLWeb::loadURL(const std::string& url)
}
else
{
- LLFloaterReg::showInstance("media_browser",url);
+ loadURLInternal(url);
}
}
// static
+void LLWeb::loadURLInternal(const std::string &url)
+{
+ LLFloaterReg::showInstance("media_browser", url);
+}
+
+
+// static
void LLWeb::loadURLExternal(const std::string& url)
{
std::string escaped_url = escapeURL(url);