aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterhtmlhelp.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2008-10-18 20:46:26 -0700
committerJacek Antonelli2008-12-15 18:49:01 -0600
commit109e2a25f8a71dae79fba7b5a58b9f38fcbeb76d (patch)
tree3d3afefe73779cc3f77d3f1c6203de6263c6b8d0 /linden/indra/newview/llfloaterhtmlhelp.cpp
parentAdded Home button functionality to the web browser. (diff)
downloadmeta-impy-109e2a25f8a71dae79fba7b5a58b9f38fcbeb76d.zip
meta-impy-109e2a25f8a71dae79fba7b5a58b9f38fcbeb76d.tar.gz
meta-impy-109e2a25f8a71dae79fba7b5a58b9f38fcbeb76d.tar.bz2
meta-impy-109e2a25f8a71dae79fba7b5a58b9f38fcbeb76d.tar.xz
Added menu option for inworld browser.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterhtmlhelp.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index a9d2e46..7fe4d59 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -150,6 +150,7 @@ void LLFloaterMediaBrowser::onLocationChange( const EventType& eventIn )
150 childSetEnabled("back", mBrowser->canNavigateBack()); 150 childSetEnabled("back", mBrowser->canNavigateBack());
151 childSetEnabled("forward", mBrowser->canNavigateForward()); 151 childSetEnabled("forward", mBrowser->canNavigateForward());
152 childSetEnabled("reload", TRUE); 152 childSetEnabled("reload", TRUE);
153 gSavedSettings.setString("BrowserLastVisited", truncated_url);
153} 154}
154 155
155LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url) 156LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url)
@@ -160,6 +161,14 @@ LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url
160 return floaterp; 161 return floaterp;
161} 162}
162 163
164void LLFloaterMediaBrowser::show()
165{
166 //Show home url if new session, last visited if not
167 std::string last_url = gSavedSettings.getString("BrowserLastVisited");
168 if(last_url.empty())
169 last_url = gSavedSettings.getString("BrowserHome");
170 showInstance(last_url);
171}
163//static 172//static
164void LLFloaterMediaBrowser::onEnterAddress(LLUICtrl* ctrl, void* user_data) 173void LLFloaterMediaBrowser::onEnterAddress(LLUICtrl* ctrl, void* user_data)
165{ 174{