Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 132 insertions, 132 deletions

diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 39ca861026..b3dc79b538 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -1,132 +1,132 @@
-/** 
- * @file llpanellogin.h
- * @brief Login username entry fields.
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLPANELLOGIN_H
-#define LL_LLPANELLOGIN_H
-
-#include "llpanel.h"
-#include "llpointer.h"			// LLPointer<>
-#include "llmediactrl.h"	// LLMediaCtrlObserver
-#include <boost/scoped_ptr.hpp>
-
-class LLLineEditor;
-class LLUIImage;
-class LLPanelLoginListener;
-class LLSLURL;
-class LLCredential;
-
-class LLPanelLogin:	
-	public LLPanel,
-	public LLViewerMediaObserver
-{
-	LOG_CLASS(LLPanelLogin);
-public:
-	LLPanelLogin(const LLRect &rect,
-				void (*callback)(S32 option, void* user_data),
-				void *callback_data);
-	~LLPanelLogin();
-
-	virtual void setFocus( bool b );
-
-	static void show(const LLRect &rect,
-		void (*callback)(S32 option, void* user_data), 
-		void* callback_data);
-	static void reshapePanel();
-
-	static void populateFields(LLPointer<LLCredential> credential, bool remember_user, bool remember_psswrd);
-	static void resetFields();
-	static void getFields(LLPointer<LLCredential>& credential, bool& remember_user, bool& remember_psswrd);
-
-	static bool isCredentialSet() { return sCredentialSet; }
-
-	static bool areCredentialFieldsDirty();
-	static void setLocation(const LLSLURL& slurl);
-	static void autologinToLocation(const LLSLURL& slurl);
-	
-	/// Call when preferences that control visibility may have changed
-	static void updateLocationSelectorsVisibility();
-
-	static void closePanel();
-
-	static void loadLoginPage();	
-	static void giveFocus();
-	static void setAlwaysRefresh(bool refresh); 
-	
-	// inherited from LLViewerMediaObserver
-	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
-	static void updateServer();  // update the combo box, change the login page to the new server, clear the combo
-
-	/// to be called from LLStartUp::setStartSLURL
-	static void onUpdateStartSLURL(const LLSLURL& new_start_slurl);
-
-	// called from prefs when initializing panel
-	static bool getShowFavorites();
-
-	// extract name from cred in a format apropriate for username field
-	static std::string getUserName(LLPointer<LLCredential> &cred);
-
-private:
-	friend class LLPanelLoginListener;
-	void addFavoritesToStartLocation();
-	void onSelectServer();
-	void onLocationSLURL();
-
-	static void setFields(LLPointer<LLCredential> credential);
-
-	static void onClickConnect(bool commit_fields = true);
-	static void onClickVersion(void*);
-	static void onClickForgotPassword(void*);
-	static void onClickSignUp(void*);
-	static void onUserNameTextEnty(void*);
-	static void onUserListCommit(void*);
-	static void onRememberUserCheck(void*);
-    static void onRememberPasswordCheck(void*);
-	static void onPassKey(LLLineEditor* caller, void* user_data);
-
-private:
-	std::unique_ptr<LLPanelLoginListener> mListener;
-
-	void updateLoginButtons();
-	void populateUserList(LLPointer<LLCredential> credential);
-
-	void			(*mCallback)(S32 option, void *userdata);
-	void*			mCallbackData;
-
-	bool            mPasswordModified;
-	bool			mShowFavorites;
-
-	static LLPanelLogin* sInstance;
-	static bool		sCapslockDidNotification;
-	bool			mFirstLoginThisInstall;
-    
-    static bool sCredentialSet;
-
-	unsigned int mUsernameLength;
-	unsigned int mPasswordLength;
-	unsigned int mLocationLength;
-};
-
-#endif
+/**

+ * @file llpanellogin.h

+ * @brief Login username entry fields.

+ *

+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ *

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLPANELLOGIN_H

+#define LL_LLPANELLOGIN_H

+

+#include "llpanel.h"

+#include "llpointer.h"          // LLPointer<>

+#include "llmediactrl.h"    // LLMediaCtrlObserver

+#include <boost/scoped_ptr.hpp>

+

+class LLLineEditor;

+class LLUIImage;

+class LLPanelLoginListener;

+class LLSLURL;

+class LLCredential;

+

+class LLPanelLogin:

+    public LLPanel,

+    public LLViewerMediaObserver

+{

+    LOG_CLASS(LLPanelLogin);

+public:

+    LLPanelLogin(const LLRect &rect,

+                void (*callback)(S32 option, void* user_data),

+                void *callback_data);

+    ~LLPanelLogin();

+

+    virtual void setFocus( bool b );

+

+    static void show(const LLRect &rect,

+        void (*callback)(S32 option, void* user_data),

+        void* callback_data);

+    static void reshapePanel();

+

+    static void populateFields(LLPointer<LLCredential> credential, bool remember_user, bool remember_psswrd);

+    static void resetFields();

+    static void getFields(LLPointer<LLCredential>& credential, bool& remember_user, bool& remember_psswrd);

+

+    static bool isCredentialSet() { return sCredentialSet; }

+

+    static bool areCredentialFieldsDirty();

+    static void setLocation(const LLSLURL& slurl);

+    static void autologinToLocation(const LLSLURL& slurl);

+

+    /// Call when preferences that control visibility may have changed

+    static void updateLocationSelectorsVisibility();

+

+    static void closePanel();

+

+    static void loadLoginPage();

+    static void giveFocus();

+    static void setAlwaysRefresh(bool refresh);

+

+    // inherited from LLViewerMediaObserver

+    /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);

+    static void updateServer();  // update the combo box, change the login page to the new server, clear the combo

+

+    /// to be called from LLStartUp::setStartSLURL

+    static void onUpdateStartSLURL(const LLSLURL& new_start_slurl);

+

+    // called from prefs when initializing panel

+    static bool getShowFavorites();

+

+    // extract name from cred in a format apropriate for username field

+    static std::string getUserName(LLPointer<LLCredential> &cred);

+

+private:

+    friend class LLPanelLoginListener;

+    void addFavoritesToStartLocation();

+    void onSelectServer();

+    void onLocationSLURL();

+

+    static void setFields(LLPointer<LLCredential> credential);

+

+    static void onClickConnect(bool commit_fields = true);

+    static void onClickVersion(void*);

+    static void onClickForgotPassword(void*);

+    static void onClickSignUp(void*);

+    static void onUserNameTextEnty(void*);

+    static void onUserListCommit(void*);

+    static void onRememberUserCheck(void*);

+    static void onRememberPasswordCheck(void*);

+    static void onPassKey(LLLineEditor* caller, void* user_data);

+

+private:

+    std::unique_ptr<LLPanelLoginListener> mListener;

+

+    void updateLoginButtons();

+    void populateUserList(LLPointer<LLCredential> credential);

+

+    void            (*mCallback)(S32 option, void *userdata);

+    void*           mCallbackData;

+

+    bool            mPasswordModified;

+    bool            mShowFavorites;

+

+    static LLPanelLogin* sInstance;

+    static bool     sCapslockDidNotification;

+    bool            mFirstLoginThisInstall;

+

+    static bool sCredentialSet;

+

+    unsigned int mUsernameLength;

+    unsigned int mPasswordLength;

+    unsigned int mLocationLength;

+};

+

+#endif