aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-01-24 18:03:35 -0700
committerMcCabe Maxsted2009-01-24 18:03:35 -0700
commit65108aff6016531af6b47887c8cc2be048f9fae3 (patch)
treee75ab5493c01df3ec785232c83015d54d9247587
parentBackported fix for VWR-5529: group chat scrolls up when logging enabled (diff)
downloadmeta-impy-65108aff6016531af6b47887c8cc2be048f9fae3.zip
meta-impy-65108aff6016531af6b47887c8cc2be048f9fae3.tar.gz
meta-impy-65108aff6016531af6b47887c8cc2be048f9fae3.tar.bz2
meta-impy-65108aff6016531af6b47887c8cc2be048f9fae3.tar.xz
Fixed 'open in external browser' button
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/newview/llfloaterhtmlhelp.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6f6cd91..3470158 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,6 +2,12 @@
2=- 1.1.0 -= 2=- 1.1.0 -=
3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
4 4
52009-01-24 McCabe Maxsted <hakushakukun@gmail.com>
6
7 * linden/indra/newview/llfloaterhtmlhelp.cpp:
8 Fixed 'open in external browser' button.
9
10
52009-01-23 McCabe Maxsted <hakushakukun@gmail.com> 112009-01-23 McCabe Maxsted <hakushakukun@gmail.com>
6 12
7 * linden/indra/llui/lltexteditor.cpp: 13 * linden/indra/llui/lltexteditor.cpp:
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index f637624..85122c7 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -263,7 +263,7 @@ void LLFloaterMediaBrowser::onClickOpenWebBrowser(void* user_data)
263 std::string url = self->mCurrentURL.empty() ? 263 std::string url = self->mCurrentURL.empty() ?
264 self->mBrowser->getHomePageUrl() : 264 self->mBrowser->getHomePageUrl() :
265 self->mCurrentURL; 265 self->mCurrentURL;
266 LLWeb::loadURL(url); 266 LLWeb::loadURLExternal(url);
267} 267}
268 268
269void LLFloaterMediaBrowser::onClickAssign(void* user_data) 269void LLFloaterMediaBrowser::onClickAssign(void* user_data)