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

diff --git a/indra/llprimitive/tests/llprimitive_test.cpp b/indra/llprimitive/tests/llprimitive_test.cpp
index 284edc5901..cee30cff14 100644
--- a/indra/llprimitive/tests/llprimitive_test.cpp
+++ b/indra/llprimitive/tests/llprimitive_test.cpp
@@ -1,271 +1,271 @@
-/** 
- * @file llprimitive_test.cpp
- * @brief llprimitive tests
- *
- * $LicenseInfo:firstyear=2001&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 "linden_common.h"
-
-#include "../test/lltut.h"
-
-#include "../llprimitive.h"
-
-#include "../../llmath/llvolumemgr.h"
-
-class DummyVolumeMgr : public LLVolumeMgr
-{
-public:
-	DummyVolumeMgr() : LLVolumeMgr(), mVolumeTest(NULL), mCurrDetailTest(0) {}
-	~DummyVolumeMgr() 
-	{
-	}
-	
-	
-	virtual LLVolume *refVolume(const LLVolumeParams &volume_params, const S32 detail) 
-	{
-		if (mVolumeTest.isNull() || volume_params != mCurrParamsTest || detail != mCurrDetailTest)
-		{
-			F32 volume_detail = LLVolumeLODGroup::getVolumeScaleFromDetail(detail);
-			mVolumeTest = new LLVolume(volume_params, volume_detail, false, false);
-			mCurrParamsTest = volume_params;
-			mCurrDetailTest = detail;
-			return mVolumeTest;
-		} 
-		else 
-		{
-			return mVolumeTest;
-		}
-	}
-	
-	virtual void unrefVolume(LLVolume *volumep) 
-	{
-		if (mVolumeTest == volumep)
-		{
-			mVolumeTest = NULL;
-		}
-	}
-	
-private:
-	LLPointer<LLVolume> mVolumeTest;
-	LLVolumeParams mCurrParamsTest;
-	S32 mCurrDetailTest;
-};
-
-LLMaterialID::LLMaterialID() {}
-LLMaterialID::LLMaterialID(LLMaterialID const &m) = default;
-LLMaterialID::~LLMaterialID() {}
-void LLMaterialID::set(void const*) { }
-U8 const * LLMaterialID::get() const { return mID; }
-
-LLPrimTextureList::LLPrimTextureList() { }
-LLPrimTextureList::~LLPrimTextureList() { }
-S32 LLPrimTextureList::setBumpMap(const U8 index, const U8 bump) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setOffsetS(const U8 index, const F32 s) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setOffsetT(const U8 index, const F32 t) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry &te) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setRotation(const U8 index, const F32 r) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setBumpShiny(const U8 index, const U8 bump_shiny) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setFullbright(const U8 index, const U8 t) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setMaterialID(const U8 index, const LLMaterialID& pMaterialID) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setMediaFlags(const U8 index, const U8 media_flags) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setMediaTexGen(const U8 index, const U8 media) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setBumpShinyFullbright(const U8 index, const U8 bump) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setID(const U8 index, const LLUUID& id) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setGlow(const U8 index, const F32 glow) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setAlpha(const U8 index, const F32 alpha) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setColor(const U8 index, const LLColor3& color) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setColor(const U8 index, const LLColor4& color) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setScale(const U8 index, const F32 s, const F32 t) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setScaleS(const U8 index, const F32 s) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setScaleT(const U8 index, const F32 t) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setShiny(const U8 index, const U8 shiny) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setOffset(const U8 index, const F32 s, const F32 t) { return TEM_CHANGE_NONE; }
-S32 LLPrimTextureList::setTexGen(const U8 index, const U8 texgen) { return TEM_CHANGE_NONE; }
-
-LLMaterialPtr LLPrimTextureList::getMaterialParams(const U8 index) { return LLMaterialPtr(); }
-void LLPrimTextureList::copy(LLPrimTextureList const & ptl) { mEntryList = ptl.mEntryList; } // do we need to call getTexture()->newCopy()?
-void LLPrimTextureList::take(LLPrimTextureList &other_list) { }
-void LLPrimTextureList::setSize(S32 new_size) { mEntryList.resize(new_size); }
-void LLPrimTextureList::setAllIDs(const LLUUID &id) { }
-LLTextureEntry * LLPrimTextureList::getTexture(const U8 index) const { return nullptr; }
-S32 LLPrimTextureList::size() const { return mEntryList.size(); }
-
-class PRIMITIVE_TEST_SETUP
-{
-public:
-	PRIMITIVE_TEST_SETUP()
-	{
-		volume_manager_test = new DummyVolumeMgr();
-		LLPrimitive::setVolumeManager(volume_manager_test);
-	}
-	
-	~PRIMITIVE_TEST_SETUP()
-	{
-		LLPrimitive::cleanupVolumeManager();
-	}
-	DummyVolumeMgr * volume_manager_test;
-}; 
-
-namespace tut
-{
-	struct llprimitive
-	{
-		PRIMITIVE_TEST_SETUP setup_class;
-	};
-    
-	typedef test_group<llprimitive> llprimitive_t;
-	typedef llprimitive_t::object llprimitive_object_t;
-	tut::llprimitive_t tut_llprimitive("LLPrimitive");
-
-	template<> template<>
-	void llprimitive_object_t::test<1>()
-	{
-		set_test_name("Test LLPrimitive Instantiation");
-		LLPrimitive test;
-	}
-	
-	template<> template<>
-	void llprimitive_object_t::test<2>()
-	{
-		set_test_name("Test LLPrimitive PCode setter and getter.");
-		LLPrimitive test;
-		ensure_equals(test.getPCode(), 0);
-		LLPCode code = 1;
-		test.setPCode(code);
-		ensure_equals(test.getPCode(), code);
-	}
-	
-	template<> template<>
-	void llprimitive_object_t::test<3>()
-	{
-		set_test_name("Test llprimitive constructor and initer.");
-		LLPCode code = 1;
-		LLPrimitive primitive;
-		primitive.init_primitive(code);
-		ensure_equals(primitive.getPCode(), code);
-	}
-	
-	template<> template<>
-	void llprimitive_object_t::test<4>()
-	{
-		set_test_name("Test Static llprimitive constructor and initer.");
-		LLPCode code = 1;
-		LLPrimitive * primitive = LLPrimitive::createPrimitive(code);
-		ensure(primitive != NULL);
-		ensure_equals(primitive->getPCode(), code);
-	}
-
-	template<> template<>
-	void llprimitive_object_t::test<5>()
-	{
-		set_test_name("Test setVolume creation of new unique volume.");
-		LLPrimitive primitive;
-		LLVolumeParams params;
-		
-		// Make sure volume starts off null
-		ensure(primitive.getVolume() == NULL);
-		
-		// Make sure we have no texture entries before setting the volume
-		ensure_equals(primitive.getNumTEs(), 0);
-		
-		// Test that GEOMETRY has not been flagged as changed.
-		ensure(!primitive.isChanged(LLXform::GEOMETRY));
-		
-		// Make sure setVolume returns true
-		ensure(primitive.setVolume(params, 0, true) == true);
-		LLVolume* new_volume = primitive.getVolume();
-		
-		// make sure new volume was actually created
-		ensure(new_volume != NULL);
-		
-		// Make sure that now that we've set the volume we have texture entries
-		ensure_not_equals(primitive.getNumTEs(), 0);
-		
-		// Make sure that the number of texture entries equals the number of faces in the volume (should be 6)
-		ensure_equals(new_volume->getNumFaces(), 6);
-		ensure_equals(primitive.getNumTEs(), new_volume->getNumFaces());
-		
-		// Test that GEOMETRY has been flagged as changed.
-		ensure(primitive.isChanged(LLXform::GEOMETRY));
-		
-		// Run it twice to make sure it doesn't create a different one if params are the same
-		ensure(primitive.setVolume(params, 0, true) == false);
-		ensure(new_volume == primitive.getVolume());
-		
-		// Change the param definition and try setting it again.
-		params.setRevolutions(4);
-		ensure(primitive.setVolume(params, 0, true) == true);
-		
-		// Ensure that we now have a different volume
-		ensure(new_volume != primitive.getVolume());
-	}
-	
-	template<> template<>
-	void llprimitive_object_t::test<6>()
-	{
-		set_test_name("Test setVolume creation of new NOT-unique volume.");
-		LLPrimitive primitive;
-		LLVolumeParams params;
-		
-		// Make sure volume starts off null
-		ensure(primitive.getVolume() == NULL);
-		
-		// Make sure we have no texture entries before setting the volume
-		ensure_equals(primitive.getNumTEs(), 0);
-		
-		// Test that GEOMETRY has not been flagged as changed.
-		ensure(!primitive.isChanged(LLXform::GEOMETRY));
-		
-		// Make sure setVolume returns true
-		ensure(primitive.setVolume(params, 0, false) == true);
-		
-		LLVolume* new_volume = primitive.getVolume();
-		
-		// make sure new volume was actually created
-		ensure(new_volume != NULL);
-		
-		// Make sure that now that we've set the volume we have texture entries
-		ensure_not_equals(primitive.getNumTEs(), 0);
-		
-		// Make sure that the number of texture entries equals the number of faces in the volume (should be 6)
-		ensure_equals(new_volume->getNumFaces(), 6);
-		ensure_equals(primitive.getNumTEs(), new_volume->getNumFaces());
-		
-		// Test that GEOMETRY has been flagged as changed.
-		ensure(primitive.isChanged(LLXform::GEOMETRY));
-		
-		// Run it twice to make sure it doesn't create a different one if params are the same
-		ensure(primitive.setVolume(params, 0, false) == false);
-		ensure(new_volume == primitive.getVolume());
-		
-		// Change the param definition and try setting it again.
-		params.setRevolutions(4);
-		ensure(primitive.setVolume(params, 0, false) == true);
-		
-		// Ensure that we now have a different volume
-		ensure(new_volume != primitive.getVolume());
-	}
-}
-
-#include "llmessagesystem_stub.cpp"
+/**

+ * @file llprimitive_test.cpp

+ * @brief llprimitive tests

+ *

+ * $LicenseInfo:firstyear=2001&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 "linden_common.h"

+

+#include "../test/lltut.h"

+

+#include "../llprimitive.h"

+

+#include "../../llmath/llvolumemgr.h"

+

+class DummyVolumeMgr : public LLVolumeMgr

+{

+public:

+    DummyVolumeMgr() : LLVolumeMgr(), mVolumeTest(NULL), mCurrDetailTest(0) {}

+    ~DummyVolumeMgr()

+    {

+    }

+

+

+    virtual LLVolume *refVolume(const LLVolumeParams &volume_params, const S32 detail)

+    {

+        if (mVolumeTest.isNull() || volume_params != mCurrParamsTest || detail != mCurrDetailTest)

+        {

+            F32 volume_detail = LLVolumeLODGroup::getVolumeScaleFromDetail(detail);

+            mVolumeTest = new LLVolume(volume_params, volume_detail, false, false);

+            mCurrParamsTest = volume_params;

+            mCurrDetailTest = detail;

+            return mVolumeTest;

+        }

+        else

+        {

+            return mVolumeTest;

+        }

+    }

+

+    virtual void unrefVolume(LLVolume *volumep)

+    {

+        if (mVolumeTest == volumep)

+        {

+            mVolumeTest = NULL;

+        }

+    }

+

+private:

+    LLPointer<LLVolume> mVolumeTest;

+    LLVolumeParams mCurrParamsTest;

+    S32 mCurrDetailTest;

+};

+

+LLMaterialID::LLMaterialID() {}

+LLMaterialID::LLMaterialID(LLMaterialID const &m) = default;

+LLMaterialID::~LLMaterialID() {}

+void LLMaterialID::set(void const*) { }

+U8 const * LLMaterialID::get() const { return mID; }

+

+LLPrimTextureList::LLPrimTextureList() { }

+LLPrimTextureList::~LLPrimTextureList() { }

+S32 LLPrimTextureList::setBumpMap(const U8 index, const U8 bump) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setOffsetS(const U8 index, const F32 s) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setOffsetT(const U8 index, const F32 t) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry &te) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setRotation(const U8 index, const F32 r) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setBumpShiny(const U8 index, const U8 bump_shiny) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setFullbright(const U8 index, const U8 t) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setMaterialID(const U8 index, const LLMaterialID& pMaterialID) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setMediaFlags(const U8 index, const U8 media_flags) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setMediaTexGen(const U8 index, const U8 media) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setBumpShinyFullbright(const U8 index, const U8 bump) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setID(const U8 index, const LLUUID& id) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setGlow(const U8 index, const F32 glow) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setAlpha(const U8 index, const F32 alpha) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setColor(const U8 index, const LLColor3& color) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setColor(const U8 index, const LLColor4& color) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setScale(const U8 index, const F32 s, const F32 t) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setScaleS(const U8 index, const F32 s) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setScaleT(const U8 index, const F32 t) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setShiny(const U8 index, const U8 shiny) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setOffset(const U8 index, const F32 s, const F32 t) { return TEM_CHANGE_NONE; }

+S32 LLPrimTextureList::setTexGen(const U8 index, const U8 texgen) { return TEM_CHANGE_NONE; }

+

+LLMaterialPtr LLPrimTextureList::getMaterialParams(const U8 index) { return LLMaterialPtr(); }

+void LLPrimTextureList::copy(LLPrimTextureList const & ptl) { mEntryList = ptl.mEntryList; } // do we need to call getTexture()->newCopy()?

+void LLPrimTextureList::take(LLPrimTextureList &other_list) { }

+void LLPrimTextureList::setSize(S32 new_size) { mEntryList.resize(new_size); }

+void LLPrimTextureList::setAllIDs(const LLUUID &id) { }

+LLTextureEntry * LLPrimTextureList::getTexture(const U8 index) const { return nullptr; }

+S32 LLPrimTextureList::size() const { return mEntryList.size(); }

+

+class PRIMITIVE_TEST_SETUP

+{

+public:

+    PRIMITIVE_TEST_SETUP()

+    {

+        volume_manager_test = new DummyVolumeMgr();

+        LLPrimitive::setVolumeManager(volume_manager_test);

+    }

+

+    ~PRIMITIVE_TEST_SETUP()

+    {

+        LLPrimitive::cleanupVolumeManager();

+    }

+    DummyVolumeMgr * volume_manager_test;

+};

+

+namespace tut

+{

+    struct llprimitive

+    {

+        PRIMITIVE_TEST_SETUP setup_class;

+    };

+

+    typedef test_group<llprimitive> llprimitive_t;

+    typedef llprimitive_t::object llprimitive_object_t;

+    tut::llprimitive_t tut_llprimitive("LLPrimitive");

+

+    template<> template<>

+    void llprimitive_object_t::test<1>()

+    {

+        set_test_name("Test LLPrimitive Instantiation");

+        LLPrimitive test;

+    }

+

+    template<> template<>

+    void llprimitive_object_t::test<2>()

+    {

+        set_test_name("Test LLPrimitive PCode setter and getter.");

+        LLPrimitive test;

+        ensure_equals(test.getPCode(), 0);

+        LLPCode code = 1;

+        test.setPCode(code);

+        ensure_equals(test.getPCode(), code);

+    }

+

+    template<> template<>

+    void llprimitive_object_t::test<3>()

+    {

+        set_test_name("Test llprimitive constructor and initer.");

+        LLPCode code = 1;

+        LLPrimitive primitive;

+        primitive.init_primitive(code);

+        ensure_equals(primitive.getPCode(), code);

+    }

+

+    template<> template<>

+    void llprimitive_object_t::test<4>()

+    {

+        set_test_name("Test Static llprimitive constructor and initer.");

+        LLPCode code = 1;

+        LLPrimitive * primitive = LLPrimitive::createPrimitive(code);

+        ensure(primitive != NULL);

+        ensure_equals(primitive->getPCode(), code);

+    }

+

+    template<> template<>

+    void llprimitive_object_t::test<5>()

+    {

+        set_test_name("Test setVolume creation of new unique volume.");

+        LLPrimitive primitive;

+        LLVolumeParams params;

+

+        // Make sure volume starts off null

+        ensure(primitive.getVolume() == NULL);

+

+        // Make sure we have no texture entries before setting the volume

+        ensure_equals(primitive.getNumTEs(), 0);

+

+        // Test that GEOMETRY has not been flagged as changed.

+        ensure(!primitive.isChanged(LLXform::GEOMETRY));

+

+        // Make sure setVolume returns true

+        ensure(primitive.setVolume(params, 0, true) == true);

+        LLVolume* new_volume = primitive.getVolume();

+

+        // make sure new volume was actually created

+        ensure(new_volume != NULL);

+

+        // Make sure that now that we've set the volume we have texture entries

+        ensure_not_equals(primitive.getNumTEs(), 0);

+

+        // Make sure that the number of texture entries equals the number of faces in the volume (should be 6)

+        ensure_equals(new_volume->getNumFaces(), 6);

+        ensure_equals(primitive.getNumTEs(), new_volume->getNumFaces());

+

+        // Test that GEOMETRY has been flagged as changed.

+        ensure(primitive.isChanged(LLXform::GEOMETRY));

+

+        // Run it twice to make sure it doesn't create a different one if params are the same

+        ensure(primitive.setVolume(params, 0, true) == false);

+        ensure(new_volume == primitive.getVolume());

+

+        // Change the param definition and try setting it again.

+        params.setRevolutions(4);

+        ensure(primitive.setVolume(params, 0, true) == true);

+

+        // Ensure that we now have a different volume

+        ensure(new_volume != primitive.getVolume());

+    }

+

+    template<> template<>

+    void llprimitive_object_t::test<6>()

+    {

+        set_test_name("Test setVolume creation of new NOT-unique volume.");

+        LLPrimitive primitive;

+        LLVolumeParams params;

+

+        // Make sure volume starts off null

+        ensure(primitive.getVolume() == NULL);

+

+        // Make sure we have no texture entries before setting the volume

+        ensure_equals(primitive.getNumTEs(), 0);

+

+        // Test that GEOMETRY has not been flagged as changed.

+        ensure(!primitive.isChanged(LLXform::GEOMETRY));

+

+        // Make sure setVolume returns true

+        ensure(primitive.setVolume(params, 0, false) == true);

+

+        LLVolume* new_volume = primitive.getVolume();

+

+        // make sure new volume was actually created

+        ensure(new_volume != NULL);

+

+        // Make sure that now that we've set the volume we have texture entries

+        ensure_not_equals(primitive.getNumTEs(), 0);

+

+        // Make sure that the number of texture entries equals the number of faces in the volume (should be 6)

+        ensure_equals(new_volume->getNumFaces(), 6);

+        ensure_equals(primitive.getNumTEs(), new_volume->getNumFaces());

+

+        // Test that GEOMETRY has been flagged as changed.

+        ensure(primitive.isChanged(LLXform::GEOMETRY));

+

+        // Run it twice to make sure it doesn't create a different one if params are the same

+        ensure(primitive.setVolume(params, 0, false) == false);

+        ensure(new_volume == primitive.getVolume());

+

+        // Change the param definition and try setting it again.

+        params.setRevolutions(4);

+        ensure(primitive.setVolume(params, 0, false) == true);

+

+        // Ensure that we now have a different volume

+        ensure(new_volume != primitive.getVolume());

+    }

+}

+

+#include "llmessagesystem_stub.cpp"