diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-04-02 13:30:14 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-04-02 13:30:14 -0700 |
| commit | 50b97bfaf5b975d0e6ea6920b161007ade0d4fc5 (patch) | |
| tree | 55ec9fbcb664036b84a59d4db1774e2152992347 /indra/newview/skins/default/xui/en/floater_tos.xml | |
| parent | 8ee0bdbd1fc04c09e07c0fc10528c01c6b6a9abf (diff) | |
Fix for EXT-6663 (TOS Screen logic for enabling agreement checkbox is questionable)
* remove the use of the start_url parameter, and instead store the loading url as a string in the xui, so that there's no chance of the loading screen page completing before we add our observer.
* replace the "load complete count" with explicit state variables for whether the loading screen has completed and whether the site is alive
* don't begin trying to load the real URL until both of the above conditions are met (and begin the load no matter which order they are satisfied in)
Reviewed by Richard at http://codereview.lindenlab.com/1218007
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_tos.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tos.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml index f3665e87ed..cbfaac958b 100644 --- a/indra/newview/skins/default/xui/en/floater_tos.xml +++ b/indra/newview/skins/default/xui/en/floater_tos.xml @@ -11,6 +11,10 @@ name="real_url"> http://secondlife.com/app/tos/ </floater.string> + <floater.string + name="loading_url"> + data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E + </floater.string> <button enabled="false" height="20" @@ -59,7 +63,6 @@ layout="topleft" left_delta="0" name="tos_html" - start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E" top_delta="40" width="568" /> </floater> |