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, 125 insertions, 125 deletions

diff --git a/indra/llmath/lltreenode.h b/indra/llmath/lltreenode.h
index ce104b88a0..5875e9e8e0 100644
--- a/indra/llmath/lltreenode.h
+++ b/indra/llmath/lltreenode.h
@@ -1,125 +1,125 @@
-/** 
- * @file lltreenode.h
- *
- * $LicenseInfo:firstyear=2005&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_LLTREENODE_H
-#define LL_LLTREENODE_H
-
-#include "stdtypes.h"
-#include "xform.h"
-#include "llpointer.h"
-#include "llrefcount.h"
-
-#include <vector>
-
-template <class T> class LLTreeNode;
-template <class T> class LLTreeTraveler;
-template <class T> class LLTreeListener;
-
-template <class T>
-class LLTreeListener: public LLRefCount
-{
-public:
-	virtual void handleInsertion(const LLTreeNode<T>* node, T* data) = 0;
-	virtual void handleRemoval(const LLTreeNode<T>* node, T* data) = 0;
-	virtual void handleDestruction(const LLTreeNode<T>* node) = 0;
-	virtual void handleStateChange(const LLTreeNode<T>* node) = 0;
-};
-
-template <class T>
-class LLTreeNode 
-{
-public:
-	virtual ~LLTreeNode();
-	
-	virtual bool insert(T* data);
-	virtual bool remove(T* data);
-	virtual void notifyRemoval(T* data);
-	virtual U32 hasListeners() const { return !mListeners.empty(); }
-	virtual U32 getListenerCount() const { return mListeners.size(); }
-	virtual LLTreeListener<T>* getListener(U32 index) const 
-	{
-		if (index < mListeners.size())
-		{
-			return mListeners[index]; 
-		}
-		return NULL;
-	}
-	virtual void addListener(LLTreeListener<T>* listener) { mListeners.push_back(listener); }
-
-protected:
-	void destroyListeners()
-	{
-		for (U32 i = 0; i < mListeners.size(); i++)
-		{
-			mListeners[i]->handleDestruction(this);
-		}
-		mListeners.clear();
-	}
-	
-public:
-	std::vector<LLPointer<LLTreeListener<T> > > mListeners;
-};
-
-template <class T>
-class LLTreeTraveler
-{
-public:
-	virtual ~LLTreeTraveler() { }; 
-	virtual void traverse(const LLTreeNode<T>* node) = 0;
-	virtual void visit(const LLTreeNode<T>* node) = 0;
-};
-
-template <class T>
-LLTreeNode<T>::~LLTreeNode()
-{ 
-	destroyListeners();
-};
-
-template <class T>
-bool LLTreeNode<T>::insert(T* data)
-{ 
-	for (U32 i = 0; i < mListeners.size(); i++)
-	{
-		mListeners[i]->handleInsertion(this, data);
-	}
-	return true;
-};
-
-template <class T>
-bool LLTreeNode<T>::remove(T* data)
-{
-	return true;
-};
-
-template <class T>
-void LLTreeNode<T>::notifyRemoval(T* data)
-{
-	for (U32 i = 0; i < mListeners.size(); i++)
-	{
-		mListeners[i]->handleRemoval(this, data);
-	}
-}
-
-#endif
+/**

+ * @file lltreenode.h

+ *

+ * $LicenseInfo:firstyear=2005&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_LLTREENODE_H

+#define LL_LLTREENODE_H

+

+#include "stdtypes.h"

+#include "xform.h"

+#include "llpointer.h"

+#include "llrefcount.h"

+

+#include <vector>

+

+template <class T> class LLTreeNode;

+template <class T> class LLTreeTraveler;

+template <class T> class LLTreeListener;

+

+template <class T>

+class LLTreeListener: public LLRefCount

+{

+public:

+    virtual void handleInsertion(const LLTreeNode<T>* node, T* data) = 0;

+    virtual void handleRemoval(const LLTreeNode<T>* node, T* data) = 0;

+    virtual void handleDestruction(const LLTreeNode<T>* node) = 0;

+    virtual void handleStateChange(const LLTreeNode<T>* node) = 0;

+};

+

+template <class T>

+class LLTreeNode

+{

+public:

+    virtual ~LLTreeNode();

+

+    virtual bool insert(T* data);

+    virtual bool remove(T* data);

+    virtual void notifyRemoval(T* data);

+    virtual U32 hasListeners() const { return !mListeners.empty(); }

+    virtual U32 getListenerCount() const { return mListeners.size(); }

+    virtual LLTreeListener<T>* getListener(U32 index) const

+    {

+        if (index < mListeners.size())

+        {

+            return mListeners[index];

+        }

+        return NULL;

+    }

+    virtual void addListener(LLTreeListener<T>* listener) { mListeners.push_back(listener); }

+

+protected:

+    void destroyListeners()

+    {

+        for (U32 i = 0; i < mListeners.size(); i++)

+        {

+            mListeners[i]->handleDestruction(this);

+        }

+        mListeners.clear();

+    }

+

+public:

+    std::vector<LLPointer<LLTreeListener<T> > > mListeners;

+};

+

+template <class T>

+class LLTreeTraveler

+{

+public:

+    virtual ~LLTreeTraveler() { };

+    virtual void traverse(const LLTreeNode<T>* node) = 0;

+    virtual void visit(const LLTreeNode<T>* node) = 0;

+};

+

+template <class T>

+LLTreeNode<T>::~LLTreeNode()

+{

+    destroyListeners();

+};

+

+template <class T>

+bool LLTreeNode<T>::insert(T* data)

+{

+    for (U32 i = 0; i < mListeners.size(); i++)

+    {

+        mListeners[i]->handleInsertion(this, data);

+    }

+    return true;

+};

+

+template <class T>

+bool LLTreeNode<T>::remove(T* data)

+{

+    return true;

+};

+

+template <class T>

+void LLTreeNode<T>::notifyRemoval(T* data)

+{

+    for (U32 i = 0; i < mListeners.size(); i++)

+    {

+        mListeners[i]->handleRemoval(this, data);

+    }

+}

+

+#endif