Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext

1 files changed, 18 insertions, 52 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index bbb942f..d232ea8 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -207,6 +207,8 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
+#include "rcmoapradar.h"
+
 #if LL_WINDOWS
 #include "llwindebug.h"
 #include "lldxhardware.h"
@@ -266,7 +268,6 @@ bool LLStartUp::sLoginFailed = false;
 
 void login_show();
 void login_callback(S32 option, void* userdata);
-bool is_hex_string(U8* str, S32 len);
 void show_first_run_dialog();
 bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);
 void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
@@ -352,7 +353,6 @@ bool idle_startup()
         const F32 TIMEOUT_SECONDS = 10.f; // changed from 5 to 10 seconds for OpenSim lag -- MC
         const S32 MAX_TIMEOUT_COUNT = 3;
         static LLTimer timeout;
-        static S32 timeout_count = 0;
 
         static LLTimer login_time;
         static LLTimer connecting_region_timer;
@@ -384,11 +384,10 @@ bool idle_startup()
 
         // last location by default
         static S32  agent_location_id = START_LOCATION_ID_LAST;
-        static S32  location_which = START_LOCATION_ID_LAST;
 
         static bool show_connect_box = true;
 
-        static bool stipend_since_login = false;
+        //static bool stipend_since_login = false;
 
         static bool samename = false;
 
@@ -803,8 +802,6 @@ bool idle_startup()
                 
                 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
 
-                timeout_count = 0;
-                
                 if (LLStartUp::shouldAutoLogin())
                 {
                         show_connect_box = false;
@@ -1118,7 +1115,6 @@ bool idle_startup()
                 {
                         // Force login at the last location
                         agent_location_id = START_LOCATION_ID_LAST;
-                        location_which = START_LOCATION_ID_LAST;
                         gSavedSettings.setBOOL("LoginLastLocation", FALSE);
                         
                         // Clear some things that would cause us to divert to a user-specified location
@@ -1130,21 +1126,14 @@ bool idle_startup()
                 {
                         // a startup URL was specified
                         agent_location_id = START_LOCATION_ID_URL;
-
-                        // doesn't really matter what location_which is, since
-                        // agent_start_look_at will be overwritten when the
-                        // UserLoginLocationReply arrives
-                        location_which = START_LOCATION_ID_LAST;
                 }
                 else if (gSavedSettings.getBOOL("LoginLastLocation"))
                 {
                         agent_location_id = START_LOCATION_ID_LAST;     // last location
-                        location_which = START_LOCATION_ID_LAST;
                 }
                 else
                 {
                         agent_location_id = START_LOCATION_ID_HOME;     // home
-                        location_which = START_LOCATION_ID_HOME;
                 }
 
                 gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);
@@ -1790,11 +1779,11 @@ bool idle_startup()
                                         if((*it).second == "N") gAgent.setFirstLogin(TRUE);
                                         else gAgent.setFirstLogin(FALSE);
                                 }
-                                it = options[0].find("stipend_since_login");
-                                if(it != no_flag)
-                                {
-                                        if((*it).second == "Y") stipend_since_login = true;
-                                }
+                                //it = options[0].find("stipend_since_login");
+                                //if(it != no_flag)
+                                //{
+                                //      if((*it).second == "Y") stipend_since_login = true;
+                                //}
                                 it = options[0].find("gendered");
                                 if(it != no_flag)
                                 {
@@ -2086,6 +2075,16 @@ bool idle_startup()
                 LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0);
                 gViewerWindow->adjustControlRectanglesForFirstUse(window);
 
+                if (gSavedSettings.getBOOL("ShowRadar"))
+                {
+                        LLFloaterAvatarList::showInstance();
+                }
+
+                if (gSavedSettings.getBOOL("ShowMOAPRadar"))
+                {
+                         LLFloaterMOAPRadar::showInstance();
+                }
+
                 if(gSavedSettings.getBOOL("ShowMiniMap"))
                 {
                         LLFloaterMap::showInstance();
@@ -3270,39 +3269,6 @@ void LLStartUp::deletePasswordFromDisk()
         LLFile::remove(filepath);
 }
 
-bool is_hex_string(U8* str, S32 len)
-{
-        bool rv = true;
-        U8* c = str;
-        while(rv && len--)
-        {
-                switch(*c)
-                {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                case 'a':
-                case 'b':
-                case 'c':
-                case 'd':
-                case 'e':
-                case 'f':
-                        ++c;
-                        break;
-                default:
-                        rv = false;
-                        break;
-                }
-        }
-        return rv;
-}
 
 void show_first_run_dialog()
 {