diff options
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index bbb942f..12fde5c 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -207,6 +207,8 @@ | |||
207 | #include "rlvhandler.h" | 207 | #include "rlvhandler.h" |
208 | // [/RLVa:KB] | 208 | // [/RLVa:KB] |
209 | 209 | ||
210 | #include "rcmoapradar.h" | ||
211 | |||
210 | #if LL_WINDOWS | 212 | #if LL_WINDOWS |
211 | #include "llwindebug.h" | 213 | #include "llwindebug.h" |
212 | #include "lldxhardware.h" | 214 | #include "lldxhardware.h" |
@@ -352,7 +354,6 @@ bool idle_startup() | |||
352 | const F32 TIMEOUT_SECONDS = 10.f; // changed from 5 to 10 seconds for OpenSim lag -- MC | 354 | const F32 TIMEOUT_SECONDS = 10.f; // changed from 5 to 10 seconds for OpenSim lag -- MC |
353 | const S32 MAX_TIMEOUT_COUNT = 3; | 355 | const S32 MAX_TIMEOUT_COUNT = 3; |
354 | static LLTimer timeout; | 356 | static LLTimer timeout; |
355 | static S32 timeout_count = 0; | ||
356 | 357 | ||
357 | static LLTimer login_time; | 358 | static LLTimer login_time; |
358 | static LLTimer connecting_region_timer; | 359 | static LLTimer connecting_region_timer; |
@@ -384,11 +385,10 @@ bool idle_startup() | |||
384 | 385 | ||
385 | // last location by default | 386 | // last location by default |
386 | static S32 agent_location_id = START_LOCATION_ID_LAST; | 387 | static S32 agent_location_id = START_LOCATION_ID_LAST; |
387 | static S32 location_which = START_LOCATION_ID_LAST; | ||
388 | 388 | ||
389 | static bool show_connect_box = true; | 389 | static bool show_connect_box = true; |
390 | 390 | ||
391 | static bool stipend_since_login = false; | 391 | //static bool stipend_since_login = false; |
392 | 392 | ||
393 | static bool samename = false; | 393 | static bool samename = false; |
394 | 394 | ||
@@ -803,8 +803,6 @@ bool idle_startup() | |||
803 | 803 | ||
804 | gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW); | 804 | gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW); |
805 | 805 | ||
806 | timeout_count = 0; | ||
807 | |||
808 | if (LLStartUp::shouldAutoLogin()) | 806 | if (LLStartUp::shouldAutoLogin()) |
809 | { | 807 | { |
810 | show_connect_box = false; | 808 | show_connect_box = false; |
@@ -1118,7 +1116,6 @@ bool idle_startup() | |||
1118 | { | 1116 | { |
1119 | // Force login at the last location | 1117 | // Force login at the last location |
1120 | agent_location_id = START_LOCATION_ID_LAST; | 1118 | agent_location_id = START_LOCATION_ID_LAST; |
1121 | location_which = START_LOCATION_ID_LAST; | ||
1122 | gSavedSettings.setBOOL("LoginLastLocation", FALSE); | 1119 | gSavedSettings.setBOOL("LoginLastLocation", FALSE); |
1123 | 1120 | ||
1124 | // Clear some things that would cause us to divert to a user-specified location | 1121 | // Clear some things that would cause us to divert to a user-specified location |
@@ -1130,21 +1127,14 @@ bool idle_startup() | |||
1130 | { | 1127 | { |
1131 | // a startup URL was specified | 1128 | // a startup URL was specified |
1132 | agent_location_id = START_LOCATION_ID_URL; | 1129 | agent_location_id = START_LOCATION_ID_URL; |
1133 | |||
1134 | // doesn't really matter what location_which is, since | ||
1135 | // agent_start_look_at will be overwritten when the | ||
1136 | // UserLoginLocationReply arrives | ||
1137 | location_which = START_LOCATION_ID_LAST; | ||
1138 | } | 1130 | } |
1139 | else if (gSavedSettings.getBOOL("LoginLastLocation")) | 1131 | else if (gSavedSettings.getBOOL("LoginLastLocation")) |
1140 | { | 1132 | { |
1141 | agent_location_id = START_LOCATION_ID_LAST; // last location | 1133 | agent_location_id = START_LOCATION_ID_LAST; // last location |
1142 | location_which = START_LOCATION_ID_LAST; | ||
1143 | } | 1134 | } |
1144 | else | 1135 | else |
1145 | { | 1136 | { |
1146 | agent_location_id = START_LOCATION_ID_HOME; // home | 1137 | agent_location_id = START_LOCATION_ID_HOME; // home |
1147 | location_which = START_LOCATION_ID_HOME; | ||
1148 | } | 1138 | } |
1149 | 1139 | ||
1150 | gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT); | 1140 | gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT); |
@@ -1790,11 +1780,11 @@ bool idle_startup() | |||
1790 | if((*it).second == "N") gAgent.setFirstLogin(TRUE); | 1780 | if((*it).second == "N") gAgent.setFirstLogin(TRUE); |
1791 | else gAgent.setFirstLogin(FALSE); | 1781 | else gAgent.setFirstLogin(FALSE); |
1792 | } | 1782 | } |
1793 | it = options[0].find("stipend_since_login"); | 1783 | //it = options[0].find("stipend_since_login"); |
1794 | if(it != no_flag) | 1784 | //if(it != no_flag) |
1795 | { | 1785 | //{ |
1796 | if((*it).second == "Y") stipend_since_login = true; | 1786 | // if((*it).second == "Y") stipend_since_login = true; |
1797 | } | 1787 | //} |
1798 | it = options[0].find("gendered"); | 1788 | it = options[0].find("gendered"); |
1799 | if(it != no_flag) | 1789 | if(it != no_flag) |
1800 | { | 1790 | { |
@@ -2086,6 +2076,16 @@ bool idle_startup() | |||
2086 | LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0); | 2076 | LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0); |
2087 | gViewerWindow->adjustControlRectanglesForFirstUse(window); | 2077 | gViewerWindow->adjustControlRectanglesForFirstUse(window); |
2088 | 2078 | ||
2079 | if (gSavedSettings.getBOOL("ShowRadar")) | ||
2080 | { | ||
2081 | LLFloaterAvatarList::showInstance(); | ||
2082 | } | ||
2083 | |||
2084 | if (gSavedSettings.getBOOL("ShowMOAPRadar")) | ||
2085 | { | ||
2086 | LLFloaterMOAPRadar::showInstance(); | ||
2087 | } | ||
2088 | |||
2089 | if(gSavedSettings.getBOOL("ShowMiniMap")) | 2089 | if(gSavedSettings.getBOOL("ShowMiniMap")) |
2090 | { | 2090 | { |
2091 | LLFloaterMap::showInstance(); | 2091 | LLFloaterMap::showInstance(); |