Skip to content
Snippets Groups Projects
Commit 77f35a5b authored by Kent Quirk's avatar Kent Quirk
Browse files

Merge.

parents 347be078 4f01a5f4
Branches
No related tags found
No related merge requests found
...@@ -144,9 +144,6 @@ BOOL LLFloaterTOS::postBuild() ...@@ -144,9 +144,6 @@ BOOL LLFloaterTOS::postBuild()
// Don't use the start_url parameter for this browser instance -- it may finish loading before we get to add our observer. // Don't use the start_url parameter for this browser instance -- it may finish loading before we get to add our observer.
// Store the URL separately and navigate here instead. // Store the URL separately and navigate here instead.
web_browser->navigateTo( getString( "loading_url" ) ); web_browser->navigateTo( getString( "loading_url" ) );
gResponsePtr = LLIamHere::build( this );
LLHTTPClient::get( getString( "real_url" ), gResponsePtr );
} }
return TRUE; return TRUE;
...@@ -163,20 +160,6 @@ void LLFloaterTOS::setSiteIsAlive( bool alive ) ...@@ -163,20 +160,6 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
if ( alive ) if ( alive )
{ {
// navigate to the "real" page // navigate to the "real" page
loadIfNeeded();
}
else
{
// normally this is set when navigation to TOS page navigation completes (so you can't accept before TOS loads)
// but if the page is unavailable, we need to do this now
LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
tos_agreement->setEnabled( true );
}
}
}
void LLFloaterTOS::loadIfNeeded()
{
if(!mRealNavigateBegun && mSiteAlive) if(!mRealNavigateBegun && mSiteAlive)
{ {
LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html"); LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");
...@@ -187,10 +170,19 @@ void LLFloaterTOS::loadIfNeeded() ...@@ -187,10 +170,19 @@ void LLFloaterTOS::loadIfNeeded()
} }
} }
} }
else
{
LL_INFOS("TOS") << "ToS page: ToS page unavailable!" << LL_ENDL;
// normally this is set when navigation to TOS page navigation completes (so you can't accept before TOS loads)
// but if the page is unavailable, we need to do this now
LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
tos_agreement->setEnabled( true );
}
}
}
LLFloaterTOS::~LLFloaterTOS() LLFloaterTOS::~LLFloaterTOS()
{ {
// tell the responder we're not here anymore // tell the responder we're not here anymore
if ( gResponsePtr ) if ( gResponsePtr )
gResponsePtr->setParent( 0 ); gResponsePtr->setParent( 0 );
...@@ -215,7 +207,7 @@ void LLFloaterTOS::updateAgree(LLUICtrl*, void* userdata ) ...@@ -215,7 +207,7 @@ void LLFloaterTOS::updateAgree(LLUICtrl*, void* userdata )
void LLFloaterTOS::onContinue( void* userdata ) void LLFloaterTOS::onContinue( void* userdata )
{ {
LLFloaterTOS* self = (LLFloaterTOS*) userdata; LLFloaterTOS* self = (LLFloaterTOS*) userdata;
llinfos << "User agrees with TOS." << llendl; LL_INFOS("TOS") << "User agrees with TOS." << LL_ENDL;
if(self->mReplyPumpName != "") if(self->mReplyPumpName != "")
{ {
...@@ -229,7 +221,7 @@ void LLFloaterTOS::onContinue( void* userdata ) ...@@ -229,7 +221,7 @@ void LLFloaterTOS::onContinue( void* userdata )
void LLFloaterTOS::onCancel( void* userdata ) void LLFloaterTOS::onCancel( void* userdata )
{ {
LLFloaterTOS* self = (LLFloaterTOS*) userdata; LLFloaterTOS* self = (LLFloaterTOS*) userdata;
llinfos << "User disagrees with TOS." << llendl; LL_INFOS("TOS") << "User disagrees with TOS." << LL_ENDL;
LLNotificationsUtil::add("MustAgreeToLogIn", LLSD(), LLSD(), login_alert_done); LLNotificationsUtil::add("MustAgreeToLogIn", LLSD(), LLSD(), login_alert_done);
if(self->mReplyPumpName != "") if(self->mReplyPumpName != "")
...@@ -254,11 +246,13 @@ void LLFloaterTOS::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent ev ...@@ -254,11 +246,13 @@ void LLFloaterTOS::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent ev
if(!mLoadingScreenLoaded) if(!mLoadingScreenLoaded)
{ {
mLoadingScreenLoaded = true; mLoadingScreenLoaded = true;
loadIfNeeded();
gResponsePtr = LLIamHere::build( this );
LLHTTPClient::get( getString( "real_url" ), gResponsePtr );
} }
else if(mRealNavigateBegun) else if(mRealNavigateBegun)
{ {
llinfos << "NAVIGATE COMPLETE" << llendl; LL_INFOS("TOS") << "TOS: NAVIGATE COMPLETE" << LL_ENDL;
// enable Agree to TOS radio button now that page has loaded // enable Agree to TOS radio button now that page has loaded
LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk"); LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
tos_agreement->setEnabled( true ); tos_agreement->setEnabled( true );
......
...@@ -67,8 +67,6 @@ class LLFloaterTOS : ...@@ -67,8 +67,6 @@ class LLFloaterTOS :
private: private:
void loadIfNeeded();
std::string mMessage; std::string mMessage;
int mWebBrowserWindowId; int mWebBrowserWindowId;
bool mLoadingScreenLoaded; bool mLoadingScreenLoaded;
......
...@@ -1386,23 +1386,23 @@ anguage Infrstructure (CLI) international standard</string> ...@@ -1386,23 +1386,23 @@ anguage Infrstructure (CLI) international standard</string>
<key>darwin</key> <key>darwin</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>38d836fa53d073b9f197eecd0f5615f0</string> <string>3b7fa3a7ac07034a747759f22956b6d5</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-darwin-20100319.tar.bz2</uri> <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8385-darwin-20100412.tar.bz2</uri>
</map> </map>
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>dd8dd1c223ecb8b232bf626cca6c63ac</string> <string>3f834e00fa06e636814f22ad8685e407</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-linux-20100319.tar.bz2</uri> <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8385-linux-20100412.tar.bz2</uri>
</map> </map>
<key>windows</key> <key>windows</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>8b4ce60f25823cd38896cb3b7eb0dd43</string> <string>089a715a33cb48e030c9206966dfe31b</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-windows-20100319.tar.bz2</uri> <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8385-windows-20100412.tar.bz2</uri>
</map> </map>
</map> </map>
</map> </map>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment