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

diff --git a/indra/llcommon/llkeyusetracker.h b/indra/llcommon/llkeyusetracker.h
index 1fb222dd40..790c7b713b 100644
--- a/indra/llcommon/llkeyusetracker.h
+++ b/indra/llcommon/llkeyusetracker.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llkeyusetracker.h
  * @brief Declaration of the LLKeyUseTracker class.
  *
  * $LicenseInfo:firstyear=2003&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$
  */
@@ -40,176 +40,176 @@ template <class TKey, class TData>
 class KeyUseTrackerNodeImpl
 {
 public:
-	U64 mLastUse;
-	U32 mUseCount;
-	TKey mKey;
-	TData mData;
-
-	KeyUseTrackerNodeImpl( TKey k, TData d ) :
-		mLastUse(0),
-		mUseCount(0),
-		mKey( k ),
-		mData( d )
-	{
-	}
+    U64 mLastUse;
+    U32 mUseCount;
+    TKey mKey;
+    TData mData;
+
+    KeyUseTrackerNodeImpl( TKey k, TData d ) :
+        mLastUse(0),
+        mUseCount(0),
+        mKey( k ),
+        mData( d )
+    {
+    }
 };
 
 
 template <class TKey, class TData>
 class LLKeyUseTracker
 {
-	typedef KeyUseTrackerNodeImpl<TKey,TData> TKeyUseTrackerNode;
-	typedef std::list<TKeyUseTrackerNode *> TKeyList;
-	TKeyList mKeyList;
-	U64 mMemUsecs;
-	U64 mLastExpire;
-	U32 mMaxCount;
-	U32 mCount;
-
-	static U64 getTime()
-	{
-		// This function operates on a frame basis, not instantaneous.
-		// We can rely on its output for determining first use in a
-		// frame.
-		return LLFrameTimer::getTotalTime();
-	}
-
-	void ageKeys()
-	{
-		U64 now = getTime();
-		if( now == mLastExpire )
-		{
-			return;
-		}
-		mLastExpire = now;
-
-		while( !mKeyList.empty() && (now - mKeyList.front()->mLastUse > mMemUsecs ) )
-		{
-			delete mKeyList.front();
-			mKeyList.pop_front();
-			mCount--;
-		}
-	}
-
-	TKeyUseTrackerNode *findNode( TKey key )
-	{
-		ageKeys();
-
-		typename TKeyList::iterator i;
-		for( i = mKeyList.begin(); i != mKeyList.end(); i++ )
-		{
-			if( (*i)->mKey == key )
-				return *i;
-		}
-
-		return NULL;
-	}
-
-	TKeyUseTrackerNode *removeNode( TKey key )
-	{
-		TKeyUseTrackerNode *i;
-		i = findNode( key );
-		if( i )
-		{
-			mKeyList.remove( i );
-			mCount--;
-			return i;
-		}
-
-		return NULL;
-	}
+    typedef KeyUseTrackerNodeImpl<TKey,TData> TKeyUseTrackerNode;
+    typedef std::list<TKeyUseTrackerNode *> TKeyList;
+    TKeyList mKeyList;
+    U64 mMemUsecs;
+    U64 mLastExpire;
+    U32 mMaxCount;
+    U32 mCount;
+
+    static U64 getTime()
+    {
+        // This function operates on a frame basis, not instantaneous.
+        // We can rely on its output for determining first use in a
+        // frame.
+        return LLFrameTimer::getTotalTime();
+    }
+
+    void ageKeys()
+    {
+        U64 now = getTime();
+        if( now == mLastExpire )
+        {
+            return;
+        }
+        mLastExpire = now;
+
+        while( !mKeyList.empty() && (now - mKeyList.front()->mLastUse > mMemUsecs ) )
+        {
+            delete mKeyList.front();
+            mKeyList.pop_front();
+            mCount--;
+        }
+    }
+
+    TKeyUseTrackerNode *findNode( TKey key )
+    {
+        ageKeys();
+
+        typename TKeyList::iterator i;
+        for( i = mKeyList.begin(); i != mKeyList.end(); i++ )
+        {
+            if( (*i)->mKey == key )
+                return *i;
+        }
+
+        return NULL;
+    }
+
+    TKeyUseTrackerNode *removeNode( TKey key )
+    {
+        TKeyUseTrackerNode *i;
+        i = findNode( key );
+        if( i )
+        {
+            mKeyList.remove( i );
+            mCount--;
+            return i;
+        }
+
+        return NULL;
+    }
 
 public:
-	LLKeyUseTracker( U32 memory_seconds, U32 max_count ) :
-		mLastExpire(0),
-		mMaxCount( max_count ),
-		mCount(0)
-	{
-		mMemUsecs = ((U64)memory_seconds) * 1000000;
-	}
-
-	~LLKeyUseTracker()
-	{
-		// Flush list
-		while( !mKeyList.empty() )
-		{
-			delete mKeyList.front();
-			mKeyList.pop_front();
-			mCount--;
-		}
-	}
-
-	void markUse( TKey key, TData data )
-	{
-		TKeyUseTrackerNode *node = removeNode( key );
-		if( !node )
-		{
-			node = new TKeyUseTrackerNode(key, data);
-		}
-		else
-		{
-			// Update data
-			node->mData = data;
-		}
-		node->mLastUse = getTime();
-		node->mUseCount++;
-		mKeyList.push_back( node );
-		mCount++;
-
-		// Too many items? Drop head
-		if( mCount > mMaxCount )
-		{
-			delete mKeyList.front();
-			mKeyList.pop_front();
-			mCount--;
-		}
-	}
-
-	void forgetKey( TKey key )
-	{
-		TKeyUseTrackerNode *node = removeNode( key );
-		if( node )
-		{
-			delete node;
-		}
-	}
-
-	U32 getUseCount( TKey key )
-	{
-		TKeyUseTrackerNode *node = findNode( key );
-		if( node )
-		{
-			return node->mUseCount;
-		}
-		return 0;
-	}
-
-	U64 getTimeSinceUse( TKey key )
-	{
-		TKeyUseTrackerNode *node = findNode( key );
-		if( node )
-		{
-			U64 now = getTime();
-			U64 delta = now - node->mLastUse;
-			return (U32)( delta / 1000000 );
-		}
-		return 0;
-	}
-
-	TData *getLastUseData( TKey key )
-	{
-		TKeyUseTrackerNode *node = findNode( key );
-		if( node )
-		{
-			return &node->mData;
-		}
-		return NULL;
-	}
-
-	U32 getKeyCount()
-	{
-		return mCount;
-	}
+    LLKeyUseTracker( U32 memory_seconds, U32 max_count ) :
+        mLastExpire(0),
+        mMaxCount( max_count ),
+        mCount(0)
+    {
+        mMemUsecs = ((U64)memory_seconds) * 1000000;
+    }
+
+    ~LLKeyUseTracker()
+    {
+        // Flush list
+        while( !mKeyList.empty() )
+        {
+            delete mKeyList.front();
+            mKeyList.pop_front();
+            mCount--;
+        }
+    }
+
+    void markUse( TKey key, TData data )
+    {
+        TKeyUseTrackerNode *node = removeNode( key );
+        if( !node )
+        {
+            node = new TKeyUseTrackerNode(key, data);
+        }
+        else
+        {
+            // Update data
+            node->mData = data;
+        }
+        node->mLastUse = getTime();
+        node->mUseCount++;
+        mKeyList.push_back( node );
+        mCount++;
+
+        // Too many items? Drop head
+        if( mCount > mMaxCount )
+        {
+            delete mKeyList.front();
+            mKeyList.pop_front();
+            mCount--;
+        }
+    }
+
+    void forgetKey( TKey key )
+    {
+        TKeyUseTrackerNode *node = removeNode( key );
+        if( node )
+        {
+            delete node;
+        }
+    }
+
+    U32 getUseCount( TKey key )
+    {
+        TKeyUseTrackerNode *node = findNode( key );
+        if( node )
+        {
+            return node->mUseCount;
+        }
+        return 0;
+    }
+
+    U64 getTimeSinceUse( TKey key )
+    {
+        TKeyUseTrackerNode *node = findNode( key );
+        if( node )
+        {
+            U64 now = getTime();
+            U64 delta = now - node->mLastUse;
+            return (U32)( delta / 1000000 );
+        }
+        return 0;
+    }
+
+    TData *getLastUseData( TKey key )
+    {
+        TKeyUseTrackerNode *node = findNode( key );
+        if( node )
+        {
+            return &node->mData;
+        }
+        return NULL;
+    }
+
+    U32 getKeyCount()
+    {
+        return mCount;
+    }
 };
 
 #endif