From ed5039ab121bd464c647c3a732cc1c5b0a72ea63 Mon Sep 17 00:00:00 2001 From: David Seikel Date: Sun, 20 Mar 2011 19:34:49 +1000 Subject: We don't need support for the aurora grid in the viewer for the meta 7 grid. It seems like a waste of code anyway. --- linden/indra/llcommon/indra_constants.h | 5 ----- linden/indra/newview/llvlmanager.cpp | 16 ++++------------ 2 files changed, 4 insertions(+), 17 deletions(-) (limited to 'linden') diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h index 84ec455..e64ee62 100644 --- a/linden/indra/llcommon/indra_constants.h +++ b/linden/indra/llcommon/indra_constants.h @@ -154,11 +154,6 @@ const char WATER_LAYER_CODE = 'W'; const char WIND_LAYER_CODE = '7'; const char CLOUD_LAYER_CODE = '8'; -// 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 = ':'; - // keys // Bit masks for various keyboard modifier keys. const MASK MASK_NONE = 0x0000; diff --git a/linden/indra/newview/llvlmanager.cpp b/linden/indra/newview/llvlmanager.cpp index 7f483ca..097b8e8 100644 --- a/linden/indra/newview/llvlmanager.cpp +++ b/linden/indra/newview/llvlmanager.cpp @@ -57,13 +57,11 @@ LLVLManager::~LLVLManager() void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size) { - if (LAND_LAYER_CODE == vl_datap->mType || - AURORA_LAND_LAYER_CODE == vl_datap->mType) + if (LAND_LAYER_CODE == vl_datap->mType) { mLandBits += mesg_size * 8; } - else if (WIND_LAYER_CODE == vl_datap->mType || - AURORA_WIND_LAYER_CODE == vl_datap->mType) + else if (WIND_LAYER_CODE == vl_datap->mType) { mWindBits += mesg_size * 8; } @@ -96,17 +94,11 @@ void LLVLManager::unpackData(const S32 num_packets) { datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE); } - 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) + else if (WIND_LAYER_CODE == datap->mType) { datap->mRegionp->mWind.decompress(bit_pack, &goph); } - else if (CLOUD_LAYER_CODE == datap->mType || - AURORA_CLOUD_LAYER_CODE == datap->mType) + else if (CLOUD_LAYER_CODE == datap->mType) { datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph); } -- cgit v1.1