diff options
| author | McCabe Maxsted | 2010-06-11 12:23:46 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-19 02:43:38 -0500 |
| commit | 65a5856f9567074886f28df59a26433c4b447576 (patch) | |
| tree | 9674bd1952fd01bc9febc686ea7b15cc8065d517 /linden/indra/newview/llstartup.cpp | |
| parent | Tidied up a little const correctness in llimage (diff) | |
| download | meta-impy-65a5856f9567074886f28df59a26433c4b447576.zip meta-impy-65a5856f9567074886f28df59a26433c4b447576.tar.gz meta-impy-65a5856f9567074886f28df59a26433c4b447576.tar.bz2 meta-impy-65a5856f9567074886f28df59a26433c4b447576.tar.xz | |
wip forcing region disconnects to log you out
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llstartup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 82b950e..8882773 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
| @@ -2080,7 +2080,7 @@ bool idle_startup() | |||
| 2080 | LLHUDManager::getInstance()->sendEffects(); | 2080 | LLHUDManager::getInstance()->sendEffects(); |
| 2081 | } | 2081 | } |
| 2082 | 2082 | ||
| 2083 | // Drop out if we can't connect after TIMEOUT_SECONDS -- MC | 2083 | // Drop out if we can't connect -- MC |
| 2084 | connecting_region_timer.start(); | 2084 | connecting_region_timer.start(); |
| 2085 | LLStartUp::setStartupState( STATE_AGENT_WAIT ); // Go to STATE_AGENT_WAIT | 2085 | LLStartUp::setStartupState( STATE_AGENT_WAIT ); // Go to STATE_AGENT_WAIT |
| 2086 | 2086 | ||
| @@ -2095,7 +2095,7 @@ bool idle_startup() | |||
| 2095 | if (STATE_AGENT_WAIT == LLStartUp::getStartupState()) | 2095 | if (STATE_AGENT_WAIT == LLStartUp::getStartupState()) |
| 2096 | { | 2096 | { |
| 2097 | LL_DEBUGS("AppInitStartupState") << "STATE_AGENT_WAIT" << LL_ENDL; | 2097 | LL_DEBUGS("AppInitStartupState") << "STATE_AGENT_WAIT" << LL_ENDL; |
| 2098 | if (connecting_region_timer.getElapsedTimeF32() > TIMEOUT_SECONDS) | 2098 | if (connecting_region_timer.getElapsedTimeF32() > 15.0f) |
| 2099 | { | 2099 | { |
| 2100 | // Bounce back to the login screen -- MC | 2100 | // Bounce back to the login screen -- MC |
| 2101 | LL_WARNS("AppInit") << "Bad login - can't connect to this region for some reason" << LL_ENDL; | 2101 | LL_WARNS("AppInit") << "Bad login - can't connect to this region for some reason" << LL_ENDL; |