diff options
author | McCabe Maxsted | 2011-04-17 21:58:11 -0700 |
---|---|---|
committer | McCabe Maxsted | 2011-04-17 21:58:11 -0700 |
commit | 666dfaafb3f8db90f7a3ce090b79f358c96c8fd7 (patch) | |
tree | 1be862018fcce5ad232156f0eadd286d0c1c94e3 /linden/indra/newview | |
parent | Updated the default_grids.xml entry for InWorldz (and fixed the capitalization) (diff) | |
download | meta-impy-666dfaafb3f8db90f7a3ce090b79f358c96c8fd7.zip meta-impy-666dfaafb3f8db90f7a3ce090b79f358c96c8fd7.tar.gz meta-impy-666dfaafb3f8db90f7a3ce090b79f358c96c8fd7.tar.bz2 meta-impy-666dfaafb3f8db90f7a3ce090b79f358c96c8fd7.tar.xz |
Potential fix for being unable to accept vivox licensing agreement, ported from Singularity, patch by Siana
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/floatervoicelicense.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/linden/indra/newview/floatervoicelicense.cpp b/linden/indra/newview/floatervoicelicense.cpp index e8cd4f3..c780ff3 100644 --- a/linden/indra/newview/floatervoicelicense.cpp +++ b/linden/indra/newview/floatervoicelicense.cpp | |||
@@ -128,8 +128,16 @@ BOOL FloaterVoiceLicense::postBuild() | |||
128 | // start to observe it so we see navigate complete events | 128 | // start to observe it so we see navigate complete events |
129 | web_browser->addObserver( this ); | 129 | web_browser->addObserver( this ); |
130 | 130 | ||
131 | gResponsePtr = LLIamHereVoice::build( this ); | 131 | std::string url = getString( "real_url" ); |
132 | LLHTTPClient::get( getString( "real_url" ), gResponsePtr ); | 132 | if (url.substr(0,4) == "http") |
133 | { | ||
134 | gResponsePtr = LLIamHereVoice::build( this ); | ||
135 | LLHTTPClient::get( url, gResponsePtr ); | ||
136 | } | ||
137 | else | ||
138 | { | ||
139 | setSiteIsAlive(false); | ||
140 | } | ||
133 | } | 141 | } |
134 | 142 | ||
135 | return TRUE; | 143 | return TRUE; |