Merge branch 'main' into release/luau-scripting.

1 files changed, 6 insertions, 11 deletions

diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index a7019ea2a3..46c4c9b10e 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -49,7 +49,7 @@ public:
                 void *callback_data);
     ~LLPanelLogin();
 
-    virtual void setFocus( BOOL b );
+    virtual void setFocus( bool b );
 
     static void show(const LLRect &rect,
         void (*callback)(S32 option, void* user_data),
@@ -60,9 +60,9 @@ public:
     static void resetFields();
     static void getFields(LLPointer<LLCredential>& credential, bool& remember_user, bool& remember_psswrd);
 
-    static BOOL isCredentialSet() { return sCredentialSet; }
+    static bool isCredentialSet() { return sCredentialSet; }
 
-    static BOOL areCredentialFieldsDirty();
+    static bool areCredentialFieldsDirty();
     static void setLocation(const LLSLURL& slurl);
     static void autologinToLocation(const LLSLURL& slurl);
 
@@ -71,8 +71,6 @@ public:
 
     static void closePanel();
 
-    void setSiteIsAlive( bool alive );
-
     static void loadLoginPage();
     static void giveFocus();
     static void setAlwaysRefresh(bool refresh);
@@ -93,14 +91,12 @@ public:
 private:
     friend class LLPanelLoginListener;
     void addFavoritesToStartLocation();
-    void addUsersWithFavoritesToUsername();
     void onSelectServer();
     void onLocationSLURL();
 
     static void setFields(LLPointer<LLCredential> credential);
 
     static void onClickConnect(bool commit_fields = true);
-    static void onClickNewAccount(void*);
     static void onClickVersion(void*);
     static void onClickForgotPassword(void*);
     static void onClickSignUp(void*);
@@ -109,7 +105,6 @@ private:
     static void onRememberUserCheck(void*);
     static void onRememberPasswordCheck(void*);
     static void onPassKey(LLLineEditor* caller, void* user_data);
-    static void updateServerCombo();
 
 private:
     std::unique_ptr<LLPanelLoginListener> mListener;
@@ -120,14 +115,14 @@ private:
     void            (*mCallback)(S32 option, void *userdata);
     void*           mCallbackData;
 
-    BOOL            mPasswordModified;
+    bool            mPasswordModified;
     bool            mShowFavorites;
 
     static LLPanelLogin* sInstance;
-    static BOOL     sCapslockDidNotification;
+    static bool     sCapslockDidNotification;
     bool            mFirstLoginThisInstall;
 
-    static BOOL sCredentialSet;
+    static bool sCredentialSet;
 
     unsigned int mUsernameLength;
     unsigned int mPasswordLength;