Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Should correct not being able to accept Vivox license

Browse Source
This commit is contained in:
Siana Gearz
2011-04-15 17:04:32 +02:00
parent ab8656d5d8
commit 4f9b8443e2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/floatervoicelicense.cpp
View File

@@ -127,9 +127,13 @@ BOOL FloaterVoiceLicense::postBuild()
{ {
// start to observe it so we see navigate complete events // start to observe it so we see navigate complete events
web_browser->addObserver( this ); web_browser->addObserver( this );
std::string url = getString( "real_url" );
gResponsePtr = LLIamHereVoice::build( this ); if(url.substr(0,4) == "http") {
LLHTTPClient::get( getString( "real_url" ), gResponsePtr ); gResponsePtr = LLIamHereVoice::build( this );
LLHTTPClient::get( url, gResponsePtr );
} else {
setSiteIsAlive(false);
}
} }
return TRUE; return TRUE;
@@ -145,11 +149,7 @@ void FloaterVoiceLicense::setSiteIsAlive( bool alive )
{ {
// navigate to the "real" page // navigate to the "real" page
std::string real_url = getString( "real_url" ); std::string real_url = getString( "real_url" );
if (real_url.find("http://") == 0) { web_browser->navigateTo(real_url);
web_browser->navigateTo(real_url);
} else {
web_browser->navigateToLocalPage("license",real_url);
}
} }
} }
else else