From 728056acdb5448b46e7d6666f4ba7156eff3b4bd Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 1 Jan 2013 20:15:21 -0500
Subject: [PATCH] Add support for Aurora's extended land layer codes to
 llvlmanager.cpp

---
 indra/newview/llvlmanager.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llvlmanager.cpp b/indra/newview/llvlmanager.cpp
index b586ab673..88afc9cc3 100644
--- a/indra/newview/llvlmanager.cpp
+++ b/indra/newview/llvlmanager.cpp
@@ -44,6 +44,11 @@
 
 LLVLManager gVLManager;
 
+// Extended land layer for Aurora Sim
+const char AURORA_LAND_LAYER_CODE = 'M';
+const char AURORA_WIND_LAYER_CODE = '9';
+const char AURORA_CLOUD_LAYER_CODE = ':';
+
 LLVLManager::~LLVLManager()
 {
 	S32 i;
@@ -56,15 +61,15 @@ LLVLManager::~LLVLManager()
 
 void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size)
 {
-	if (LAND_LAYER_CODE == vl_datap->mType)
+	if (LAND_LAYER_CODE == vl_datap->mType || AURORA_LAND_LAYER_CODE == vl_datap->mType)
 	{
 		mLandBits += mesg_size * 8;
 	}
-	else if (WIND_LAYER_CODE == vl_datap->mType)
+	else if (WIND_LAYER_CODE == vl_datap->mType || AURORA_WIND_LAYER_CODE == vl_datap->mType)
 	{
 		mWindBits += mesg_size * 8;
 	}
-	else if (CLOUD_LAYER_CODE == vl_datap->mType)
+	else if (CLOUD_LAYER_CODE == vl_datap->mType || AURORA_CLOUD_LAYER_CODE == vl_datap->mType)
 	{
 		mCloudBits += mesg_size * 8;
 	}
@@ -93,12 +98,16 @@ void LLVLManager::unpackData(const S32 num_packets)
 		{
 			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE);
 		}
-		else if (WIND_LAYER_CODE == datap->mType)
+		else if (AURORA_LAND_LAYER_CODE == datap->mType)
+		{
+			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, TRUE);
+		}
+		else if (WIND_LAYER_CODE == datap->mType || AURORA_WIND_LAYER_CODE == datap->mType)
 		{
 			datap->mRegionp->mWind.decompress(bit_pack, &goph);
 
 		}
-		else if (CLOUD_LAYER_CODE == datap->mType)
+		else if (CLOUD_LAYER_CODE == datap->mType || AURORA_CLOUD_LAYER_CODE == datap->mType)
 		{
 #if ENABLE_CLASSIC_CLOUDS
 			datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph);