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

diff --git a/indra/newview/llregioninfomodel.cpp b/indra/newview/llregioninfomodel.cpp
index a03c66bef7..88b3614b4d 100644
--- a/indra/newview/llregioninfomodel.cpp
+++ b/indra/newview/llregioninfomodel.cpp
@@ -1,254 +1,254 @@
-/** 
- * @file llregioninfomodel.cpp
- * @brief Region info model
- *
- * $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, 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 "llregioninfomodel.h"
-
-// libs
-#include "message.h"
-#include "llregionflags.h"
-
-// viewer
-#include "llagent.h"
-#include "llviewerregion.h"
-
-void LLRegionInfoModel::reset()
-{
-	mSimAccess			= 0;
-	mAgentLimit			= 0;
-	mHardAgentLimit		= 100;
-
-	mRegionFlags		= 0;
-	mEstateID			= 0;
-	mParentEstateID		= 0;
-
-	mPricePerMeter		= 0;
-	mRedirectGridX		= 0;
-	mRedirectGridY		= 0;
-
-	mBillableFactor		= 0.0f;
-	mObjectBonusFactor	= 0.0f;
-	mWaterHeight		= 0.0f;
-	mTerrainRaiseLimit	= 0.0f;
-	mTerrainLowerLimit	= 0.0f;
-	mSunHour			= 0.0f;
-
-	mUseEstateSun		= false;
-
-	mSimType.clear();
-	mSimName.clear();
-}
-
-LLRegionInfoModel::LLRegionInfoModel()
-{
-	reset();
-}
-
-boost::signals2::connection LLRegionInfoModel::setUpdateCallback(const update_signal_t::slot_type& cb)
-{
-	return mUpdateSignal.connect(cb);
-}
-
-void LLRegionInfoModel::sendRegionTerrain(const LLUUID& invoice) const
-{
-	std::string buffer;
-	std::vector<std::string> strings;
-
-	// ==========================================
-	// Assemble and send setregionterrain message
-	// "setregionterrain"
-	// strings[0] = float water height
-	// strings[1] = float terrain raise
-	// strings[2] = float terrain lower
-	// strings[3] = 'Y' use estate time
-	// strings[4] = 'Y' fixed sun
-	// strings[5] = float sun_hour
-	// strings[6] = from estate, 'Y' use global time
-	// strings[7] = from estate, 'Y' fixed sun
-	// strings[8] = from estate, float sun_hour
-
-	// *NOTE: this resets estate sun info.
-	bool estate_global_time = true;
-	bool estate_fixed_sun = false;
-	F32 estate_sun_hour = 0.f;
-
-	buffer = llformat("%f", mWaterHeight);
-	strings.push_back(buffer);
-	buffer = llformat("%f", mTerrainRaiseLimit);
-	strings.push_back(buffer);
-	buffer = llformat("%f", mTerrainLowerLimit);
-	strings.push_back(buffer);
-	buffer = llformat("%s", (mUseEstateSun ? "Y" : "N"));
-	strings.push_back(buffer);
-	buffer = llformat("%s", (getUseFixedSun() ? "Y" : "N"));
-	strings.push_back(buffer);
-	buffer = llformat("%f", mSunHour);
-	strings.push_back(buffer);
-	buffer = llformat("%s", (estate_global_time ? "Y" : "N") );
-	strings.push_back(buffer);
-	buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );
-	strings.push_back(buffer);
-	buffer = llformat("%f", estate_sun_hour);
-	strings.push_back(buffer);
-
-	sendEstateOwnerMessage(gMessageSystem, "setregionterrain", invoice, strings);
-}
-
-bool LLRegionInfoModel::getUseFixedSun() const
-{
-	return ((mRegionFlags & REGION_FLAGS_SUN_FIXED) != 0);
-}
-
-void LLRegionInfoModel::setUseFixedSun(bool fixed)
-{
-	if (fixed)
-	{
-		mRegionFlags |= REGION_FLAGS_SUN_FIXED;
-	}
-	else
-	{
-		mRegionFlags &= ~REGION_FLAGS_SUN_FIXED;
-	}
-}
-
-void LLRegionInfoModel::update(LLMessageSystem* msg)
-{
-	reset();
-
-	msg->getStringFast(_PREHASH_RegionInfo, _PREHASH_SimName, mSimName);
-	msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_EstateID, mEstateID);
-	msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_ParentEstateID, mParentEstateID);
-	msg->getU8Fast(_PREHASH_RegionInfo, _PREHASH_SimAccess, mSimAccess);
-	msg->getU8Fast(_PREHASH_RegionInfo, _PREHASH_MaxAgents, mAgentLimit);
-
-	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_ObjectBonusFactor, mObjectBonusFactor);
-	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_BillableFactor, mBillableFactor);
-	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_WaterHeight, mWaterHeight);
-	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainRaiseLimit, mTerrainRaiseLimit);
-	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainLowerLimit, mTerrainLowerLimit);
-	msg->getS32Fast(_PREHASH_RegionInfo, _PREHASH_PricePerMeter, mPricePerMeter);
-	msg->getS32Fast(_PREHASH_RegionInfo, _PREHASH_RedirectGridX, mRedirectGridX);
-	msg->getS32Fast(_PREHASH_RegionInfo, _PREHASH_RedirectGridY, mRedirectGridY);
-
-	msg->getBOOL(_PREHASH_RegionInfo, _PREHASH_UseEstateSun, mUseEstateSun);
-
-	// actually the "last set" sun hour, not the current sun hour. JC
-	msg->getF32(_PREHASH_RegionInfo, _PREHASH_SunHour, mSunHour);
-	LL_DEBUGS("WindlightSync") << "Got region sun hour: " << mSunHour << LL_ENDL;
-
-	msg->getS32Fast(_PREHASH_RegionInfo2, _PREHASH_HardMaxAgents, mHardAgentLimit);
-
-	if (msg->has(_PREHASH_RegionInfo3))
-	{
-		msg->getU64Fast(_PREHASH_RegionInfo3, _PREHASH_RegionFlagsExtended, mRegionFlags);
-	}
-	else
-	{
-		U32 flags = 0;
-		msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_RegionFlags, flags);
-		mRegionFlags = flags;
-	}
-
-	if (msg->has(_PREHASH_RegionInfo5))
-	{
-		F32 chat_whisper_range;
-		F32 chat_normal_range;
-		F32 chat_shout_range;
-		F32 chat_whisper_offset;
-		F32 chat_normal_offset;
-		F32 chat_shout_offset;
-		U32 chat_flags;
-
-		msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatWhisperRange, chat_whisper_range);
-		msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatNormalRange, chat_normal_range);
-		msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatShoutRange, chat_shout_range);
-		msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatWhisperOffset, chat_whisper_offset);
-		msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatNormalOffset, chat_normal_offset);
-		msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatShoutOffset, chat_shout_offset);
-		msg->getU32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatFlags, chat_flags);
-
-		LL_INFOS() << "Whisper range: " << chat_whisper_range << " normal range: " << chat_normal_range << " shout range: " << chat_shout_range
-			<< " whisper offset: " << chat_whisper_offset << " normal offset: " << chat_normal_offset << " shout offset: " << chat_shout_offset
-			<< " chat flags: " << chat_flags << LL_ENDL;
-	}
-
-	// the only reasonable way to decide if we actually have any data is to
-	// check to see if any of these fields have nonzero sizes
-	if (msg->getSize(_PREHASH_RegionInfo2, _PREHASH_ProductSKU) > 0 ||
-		msg->getSize(_PREHASH_RegionInfo2, "ProductName") > 0)
-	{
-		msg->getString(_PREHASH_RegionInfo2, "ProductName", mSimType);
-	}
-
-	// Let interested parties know that region info has been updated.
-	mUpdateSignal();
-}
-
-// static
-void LLRegionInfoModel::sendEstateOwnerMessage(
-	LLMessageSystem* msg,
-	const std::string& request,
-	const LLUUID& invoice,
-	const std::vector<std::string>& strings)
-{
-	LLViewerRegion* cur_region = gAgent.getRegion();
-
-	if (!cur_region)
-	{
-		LL_WARNS() << "Agent region not set" << LL_ENDL;
-		return;
-	}
-
-	LL_INFOS() << "Sending estate request '" << request << "'" << LL_ENDL;
-	msg->newMessage("EstateOwnerMessage");
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-	msg->nextBlock("MethodData");
-	msg->addString("Method", request);
-	msg->addUUID("Invoice", invoice);
-
-	if (strings.empty())
-	{
-		msg->nextBlock("ParamList");
-		msg->addString("Parameter", NULL);
-	}
-	else
-	{
-		std::vector<std::string>::const_iterator it = strings.begin();
-		std::vector<std::string>::const_iterator end = strings.end();
-		for (unsigned i = 0; it != end; ++it, ++i)
-		{
-			LL_DEBUGS() << "- [" << i << "] " << (*it) << LL_ENDL;
-			msg->nextBlock("ParamList");
-			msg->addString("Parameter", *it);
-		}
-	}
-
-	msg->sendReliable(cur_region->getHost());
-}
+/**

+ * @file llregioninfomodel.cpp

+ * @brief Region info model

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2011, 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 "llregioninfomodel.h"

+

+// libs

+#include "message.h"

+#include "llregionflags.h"

+

+// viewer

+#include "llagent.h"

+#include "llviewerregion.h"

+

+void LLRegionInfoModel::reset()

+{

+    mSimAccess          = 0;

+    mAgentLimit         = 0;

+    mHardAgentLimit     = 100;

+

+    mRegionFlags        = 0;

+    mEstateID           = 0;

+    mParentEstateID     = 0;

+

+    mPricePerMeter      = 0;

+    mRedirectGridX      = 0;

+    mRedirectGridY      = 0;

+

+    mBillableFactor     = 0.0f;

+    mObjectBonusFactor  = 0.0f;

+    mWaterHeight        = 0.0f;

+    mTerrainRaiseLimit  = 0.0f;

+    mTerrainLowerLimit  = 0.0f;

+    mSunHour            = 0.0f;

+

+    mUseEstateSun       = false;

+

+    mSimType.clear();

+    mSimName.clear();

+}

+

+LLRegionInfoModel::LLRegionInfoModel()

+{

+    reset();

+}

+

+boost::signals2::connection LLRegionInfoModel::setUpdateCallback(const update_signal_t::slot_type& cb)

+{

+    return mUpdateSignal.connect(cb);

+}

+

+void LLRegionInfoModel::sendRegionTerrain(const LLUUID& invoice) const

+{

+    std::string buffer;

+    std::vector<std::string> strings;

+

+    // ==========================================

+    // Assemble and send setregionterrain message

+    // "setregionterrain"

+    // strings[0] = float water height

+    // strings[1] = float terrain raise

+    // strings[2] = float terrain lower

+    // strings[3] = 'Y' use estate time

+    // strings[4] = 'Y' fixed sun

+    // strings[5] = float sun_hour

+    // strings[6] = from estate, 'Y' use global time

+    // strings[7] = from estate, 'Y' fixed sun

+    // strings[8] = from estate, float sun_hour

+

+    // *NOTE: this resets estate sun info.

+    bool estate_global_time = true;

+    bool estate_fixed_sun = false;

+    F32 estate_sun_hour = 0.f;

+

+    buffer = llformat("%f", mWaterHeight);

+    strings.push_back(buffer);

+    buffer = llformat("%f", mTerrainRaiseLimit);

+    strings.push_back(buffer);

+    buffer = llformat("%f", mTerrainLowerLimit);

+    strings.push_back(buffer);

+    buffer = llformat("%s", (mUseEstateSun ? "Y" : "N"));

+    strings.push_back(buffer);

+    buffer = llformat("%s", (getUseFixedSun() ? "Y" : "N"));

+    strings.push_back(buffer);

+    buffer = llformat("%f", mSunHour);

+    strings.push_back(buffer);

+    buffer = llformat("%s", (estate_global_time ? "Y" : "N") );

+    strings.push_back(buffer);

+    buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );

+    strings.push_back(buffer);

+    buffer = llformat("%f", estate_sun_hour);

+    strings.push_back(buffer);

+

+    sendEstateOwnerMessage(gMessageSystem, "setregionterrain", invoice, strings);

+}

+

+bool LLRegionInfoModel::getUseFixedSun() const

+{

+    return ((mRegionFlags & REGION_FLAGS_SUN_FIXED) != 0);

+}

+

+void LLRegionInfoModel::setUseFixedSun(bool fixed)

+{

+    if (fixed)

+    {

+        mRegionFlags |= REGION_FLAGS_SUN_FIXED;

+    }

+    else

+    {

+        mRegionFlags &= ~REGION_FLAGS_SUN_FIXED;

+    }

+}

+

+void LLRegionInfoModel::update(LLMessageSystem* msg)

+{

+    reset();

+

+    msg->getStringFast(_PREHASH_RegionInfo, _PREHASH_SimName, mSimName);

+    msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_EstateID, mEstateID);

+    msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_ParentEstateID, mParentEstateID);

+    msg->getU8Fast(_PREHASH_RegionInfo, _PREHASH_SimAccess, mSimAccess);

+    msg->getU8Fast(_PREHASH_RegionInfo, _PREHASH_MaxAgents, mAgentLimit);

+

+    msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_ObjectBonusFactor, mObjectBonusFactor);

+    msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_BillableFactor, mBillableFactor);

+    msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_WaterHeight, mWaterHeight);

+    msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainRaiseLimit, mTerrainRaiseLimit);

+    msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainLowerLimit, mTerrainLowerLimit);

+    msg->getS32Fast(_PREHASH_RegionInfo, _PREHASH_PricePerMeter, mPricePerMeter);

+    msg->getS32Fast(_PREHASH_RegionInfo, _PREHASH_RedirectGridX, mRedirectGridX);

+    msg->getS32Fast(_PREHASH_RegionInfo, _PREHASH_RedirectGridY, mRedirectGridY);

+

+    msg->getBOOL(_PREHASH_RegionInfo, _PREHASH_UseEstateSun, mUseEstateSun);

+

+    // actually the "last set" sun hour, not the current sun hour. JC

+    msg->getF32(_PREHASH_RegionInfo, _PREHASH_SunHour, mSunHour);

+    LL_DEBUGS("WindlightSync") << "Got region sun hour: " << mSunHour << LL_ENDL;

+

+    msg->getS32Fast(_PREHASH_RegionInfo2, _PREHASH_HardMaxAgents, mHardAgentLimit);

+

+    if (msg->has(_PREHASH_RegionInfo3))

+    {

+        msg->getU64Fast(_PREHASH_RegionInfo3, _PREHASH_RegionFlagsExtended, mRegionFlags);

+    }

+    else

+    {

+        U32 flags = 0;

+        msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_RegionFlags, flags);

+        mRegionFlags = flags;

+    }

+

+    if (msg->has(_PREHASH_RegionInfo5))

+    {

+        F32 chat_whisper_range;

+        F32 chat_normal_range;

+        F32 chat_shout_range;

+        F32 chat_whisper_offset;

+        F32 chat_normal_offset;

+        F32 chat_shout_offset;

+        U32 chat_flags;

+

+        msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatWhisperRange, chat_whisper_range);

+        msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatNormalRange, chat_normal_range);

+        msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatShoutRange, chat_shout_range);

+        msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatWhisperOffset, chat_whisper_offset);

+        msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatNormalOffset, chat_normal_offset);

+        msg->getF32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatShoutOffset, chat_shout_offset);

+        msg->getU32Fast(_PREHASH_RegionInfo5, _PREHASH_ChatFlags, chat_flags);

+

+        LL_INFOS() << "Whisper range: " << chat_whisper_range << " normal range: " << chat_normal_range << " shout range: " << chat_shout_range

+            << " whisper offset: " << chat_whisper_offset << " normal offset: " << chat_normal_offset << " shout offset: " << chat_shout_offset

+            << " chat flags: " << chat_flags << LL_ENDL;

+    }

+

+    // the only reasonable way to decide if we actually have any data is to

+    // check to see if any of these fields have nonzero sizes

+    if (msg->getSize(_PREHASH_RegionInfo2, _PREHASH_ProductSKU) > 0 ||

+        msg->getSize(_PREHASH_RegionInfo2, "ProductName") > 0)

+    {

+        msg->getString(_PREHASH_RegionInfo2, "ProductName", mSimType);

+    }

+

+    // Let interested parties know that region info has been updated.

+    mUpdateSignal();

+}

+

+// static

+void LLRegionInfoModel::sendEstateOwnerMessage(

+    LLMessageSystem* msg,

+    const std::string& request,

+    const LLUUID& invoice,

+    const std::vector<std::string>& strings)

+{

+    LLViewerRegion* cur_region = gAgent.getRegion();

+

+    if (!cur_region)

+    {

+        LL_WARNS() << "Agent region not set" << LL_ENDL;

+        return;

+    }

+

+    LL_INFOS() << "Sending estate request '" << request << "'" << LL_ENDL;

+    msg->newMessage("EstateOwnerMessage");

+    msg->nextBlockFast(_PREHASH_AgentData);

+    msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

+    msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());

+    msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used

+    msg->nextBlock("MethodData");

+    msg->addString("Method", request);

+    msg->addUUID("Invoice", invoice);

+

+    if (strings.empty())

+    {

+        msg->nextBlock("ParamList");

+        msg->addString("Parameter", NULL);

+    }

+    else

+    {

+        std::vector<std::string>::const_iterator it = strings.begin();

+        std::vector<std::string>::const_iterator end = strings.end();

+        for (unsigned i = 0; it != end; ++it, ++i)

+        {

+            LL_DEBUGS() << "- [" << i << "] " << (*it) << LL_ENDL;

+            msg->nextBlock("ParamList");

+            msg->addString("Parameter", *it);

+        }

+    }

+

+    msg->sendReliable(cur_region->getHost());

+}