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

diff --git a/indra/newview/llvlmanager.cpp b/indra/newview/llvlmanager.cpp
index b8f41fa197..cbaeb66e59 100644
--- a/indra/newview/llvlmanager.cpp
+++ b/indra/newview/llvlmanager.cpp
@@ -1,168 +1,168 @@
-/** 
- * @file llvlmanager.cpp
- * @brief LLVLManager class implementation
- *
- * $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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llvlmanager.h"
-
-#include "indra_constants.h"
-#include "patch_code.h"
-#include "patch_dct.h"
-#include "llviewerregion.h"
-#include "llframetimer.h"
-#include "llsurface.h"
-#include "llbitpack.h"
-
-const	char	LAND_LAYER_CODE					= 'L';
-const	char	WIND_LAYER_CODE					= '7';
-const	char	CLOUD_LAYER_CODE				= '8';
-
-LLVLManager gVLManager;
-
-LLVLManager::~LLVLManager()
-{
-	S32 i;
-	for (i = 0; i < mPacketData.size(); i++)
-	{
-		delete mPacketData[i];
-	}
-	mPacketData.clear();
-}
-
-void LLVLManager::addLayerData(LLVLData *vl_datap, const S32Bytes mesg_size)
-{
-	if (LAND_LAYER_CODE == vl_datap->mType)
-	{
-		mLandBits += mesg_size;
-	}
-	else if (WIND_LAYER_CODE == vl_datap->mType)
-	{
-		mWindBits += mesg_size;
-	}
-	else if (CLOUD_LAYER_CODE == vl_datap->mType)
-	{
-		mCloudBits += mesg_size;
-	}
-	else
-	{
-		LL_ERRS() << "Unknown layer type!" << (S32)vl_datap->mType << LL_ENDL;
-	}
-
-	mPacketData.push_back(vl_datap);
-}
-
-void LLVLManager::unpackData(const S32 num_packets)
-{
-	static LLFrameTimer decode_timer;
-	
-	S32 i;
-	for (i = 0; i < mPacketData.size(); i++)
-	{
-		LLVLData *datap = mPacketData[i];
-
-		LLBitPack bit_pack(datap->mData, datap->mSize);
-		LLGroupHeader goph;
-
-		decode_patch_group_header(bit_pack, &goph);
-		if (LAND_LAYER_CODE == datap->mType)
-		{
-			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, false);
-		}
-		else if (WIND_LAYER_CODE == datap->mType)
-		{
-			datap->mRegionp->mWind.decompress(bit_pack, &goph);
-
-		}
-		else if (CLOUD_LAYER_CODE == datap->mType)
-		{
-
-		}
-	}
-
-	for (i = 0; i < mPacketData.size(); i++)
-	{
-		delete mPacketData[i];
-	}
-	mPacketData.clear();
-
-}
-
-void LLVLManager::resetBitCounts()
-{
-	mLandBits = mWindBits = mCloudBits = (S32Bits)0;
-}
-
-U32Bits LLVLManager::getLandBits() const
-{
-	return mLandBits;
-}
-
-U32Bits LLVLManager::getWindBits() const
-{
-	return mWindBits;
-}
-
-U32Bits LLVLManager::getCloudBits() const
-{
-	return mCloudBits;
-}
-
-S32Bytes LLVLManager::getTotalBytes() const
-{
-	return mLandBits + mWindBits + mCloudBits;
-}
-
-void LLVLManager::cleanupData(LLViewerRegion *regionp)
-{
-	S32 cur = 0;
-	while (cur < mPacketData.size())
-	{
-		if (mPacketData[cur]->mRegionp == regionp)
-		{
-			delete mPacketData[cur];
-			mPacketData.erase(mPacketData.begin() + cur);
-		}
-		else
-		{
-			cur++;
-		}
-	}
-}
-
-LLVLData::LLVLData(LLViewerRegion *regionp, const S8 type, U8 *data, const S32 size)
-{
-	mType = type;
-	mData = data;
-	mRegionp = regionp;
-	mSize = size;
-}
-
-LLVLData::~LLVLData()
-{
-	delete [] mData;
-	mData = NULL;
-	mRegionp = NULL;
-}
+/**

+ * @file llvlmanager.cpp

+ * @brief LLVLManager class implementation

+ *

+ * $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$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llvlmanager.h"

+

+#include "indra_constants.h"

+#include "patch_code.h"

+#include "patch_dct.h"

+#include "llviewerregion.h"

+#include "llframetimer.h"

+#include "llsurface.h"

+#include "llbitpack.h"

+

+const   char    LAND_LAYER_CODE                 = 'L';

+const   char    WIND_LAYER_CODE                 = '7';

+const   char    CLOUD_LAYER_CODE                = '8';

+

+LLVLManager gVLManager;

+

+LLVLManager::~LLVLManager()

+{

+    S32 i;

+    for (i = 0; i < mPacketData.size(); i++)

+    {

+        delete mPacketData[i];

+    }

+    mPacketData.clear();

+}

+

+void LLVLManager::addLayerData(LLVLData *vl_datap, const S32Bytes mesg_size)

+{

+    if (LAND_LAYER_CODE == vl_datap->mType)

+    {

+        mLandBits += mesg_size;

+    }

+    else if (WIND_LAYER_CODE == vl_datap->mType)

+    {

+        mWindBits += mesg_size;

+    }

+    else if (CLOUD_LAYER_CODE == vl_datap->mType)

+    {

+        mCloudBits += mesg_size;

+    }

+    else

+    {

+        LL_ERRS() << "Unknown layer type!" << (S32)vl_datap->mType << LL_ENDL;

+    }

+

+    mPacketData.push_back(vl_datap);

+}

+

+void LLVLManager::unpackData(const S32 num_packets)

+{

+    static LLFrameTimer decode_timer;

+

+    S32 i;

+    for (i = 0; i < mPacketData.size(); i++)

+    {

+        LLVLData *datap = mPacketData[i];

+

+        LLBitPack bit_pack(datap->mData, datap->mSize);

+        LLGroupHeader goph;

+

+        decode_patch_group_header(bit_pack, &goph);

+        if (LAND_LAYER_CODE == datap->mType)

+        {

+            datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, false);

+        }

+        else if (WIND_LAYER_CODE == datap->mType)

+        {

+            datap->mRegionp->mWind.decompress(bit_pack, &goph);

+

+        }

+        else if (CLOUD_LAYER_CODE == datap->mType)

+        {

+

+        }

+    }

+

+    for (i = 0; i < mPacketData.size(); i++)

+    {

+        delete mPacketData[i];

+    }

+    mPacketData.clear();

+

+}

+

+void LLVLManager::resetBitCounts()

+{

+    mLandBits = mWindBits = mCloudBits = (S32Bits)0;

+}

+

+U32Bits LLVLManager::getLandBits() const

+{

+    return mLandBits;

+}

+

+U32Bits LLVLManager::getWindBits() const

+{

+    return mWindBits;

+}

+

+U32Bits LLVLManager::getCloudBits() const

+{

+    return mCloudBits;

+}

+

+S32Bytes LLVLManager::getTotalBytes() const

+{

+    return mLandBits + mWindBits + mCloudBits;

+}

+

+void LLVLManager::cleanupData(LLViewerRegion *regionp)

+{

+    S32 cur = 0;

+    while (cur < mPacketData.size())

+    {

+        if (mPacketData[cur]->mRegionp == regionp)

+        {

+            delete mPacketData[cur];

+            mPacketData.erase(mPacketData.begin() + cur);

+        }

+        else

+        {

+            cur++;

+        }

+    }

+}

+

+LLVLData::LLVLData(LLViewerRegion *regionp, const S8 type, U8 *data, const S32 size)

+{

+    mType = type;

+    mData = data;

+    mRegionp = regionp;

+    mSize = size;

+}

+

+LLVLData::~LLVLData()

+{

+    delete [] mData;

+    mData = NULL;

+    mRegionp = NULL;

+}