diff options
Diffstat (limited to 'linden/indra/newview/llvlmanager.cpp')
-rw-r--r-- | linden/indra/newview/llvlmanager.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/linden/indra/newview/llvlmanager.cpp b/linden/indra/newview/llvlmanager.cpp index 68b4d7b..7f483ca 100644 --- a/linden/indra/newview/llvlmanager.cpp +++ b/linden/indra/newview/llvlmanager.cpp | |||
@@ -57,23 +57,23 @@ LLVLManager::~LLVLManager() | |||
57 | 57 | ||
58 | void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size) | 58 | void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size) |
59 | { | 59 | { |
60 | if (LAND_LAYER_CODE == vl_datap->mType || | 60 | if (LAND_LAYER_CODE == vl_datap->mType || |
61 | AURORA_LAND_LAYER_CODE == vl_datap->mType) | 61 | AURORA_LAND_LAYER_CODE == vl_datap->mType) |
62 | { | 62 | { |
63 | mLandBits += mesg_size * 8; | 63 | mLandBits += mesg_size * 8; |
64 | } | 64 | } |
65 | else if (WIND_LAYER_CODE == vl_datap->mType || | 65 | else if (WIND_LAYER_CODE == vl_datap->mType || |
66 | AURORA_WIND_LAYER_CODE == vl_datap->mType) | 66 | AURORA_WIND_LAYER_CODE == vl_datap->mType) |
67 | { | 67 | { |
68 | mWindBits += mesg_size * 8; | 68 | mWindBits += mesg_size * 8; |
69 | } | 69 | } |
70 | else if (CLOUD_LAYER_CODE == vl_datap->mType) | 70 | else if (CLOUD_LAYER_CODE == vl_datap->mType) |
71 | { | 71 | { |
72 | mCloudBits += mesg_size * 8; | 72 | mCloudBits += mesg_size * 8; |
73 | } | 73 | } |
74 | else | 74 | else |
75 | { | 75 | { |
76 | llerrs << "Unknown layer type!" << (S32)vl_datap->mType << llendl; | 76 | llerrs << "Unknown layer type!" << (S32)vl_datap->mType << llendl; |
77 | } | 77 | } |
78 | 78 | ||
79 | mPacketData.put(vl_datap); | 79 | mPacketData.put(vl_datap); |
@@ -92,23 +92,23 @@ void LLVLManager::unpackData(const S32 num_packets) | |||
92 | LLGroupHeader goph; | 92 | LLGroupHeader goph; |
93 | 93 | ||
94 | decode_patch_group_header(bit_pack, &goph); | 94 | decode_patch_group_header(bit_pack, &goph); |
95 | if (LAND_LAYER_CODE == datap->mType) | 95 | if (LAND_LAYER_CODE == datap->mType) |
96 | { | 96 | { |
97 | datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE); | 97 | datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE); |
98 | } | 98 | } |
99 | else if (AURORA_LAND_LAYER_CODE == datap->mType) | 99 | else if (AURORA_LAND_LAYER_CODE == datap->mType) |
100 | { | 100 | { |
101 | datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, TRUE); | 101 | datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, TRUE); |
102 | } | 102 | } |
103 | else if (WIND_LAYER_CODE == datap->mType || | 103 | else if (WIND_LAYER_CODE == datap->mType || |
104 | AURORA_WIND_LAYER_CODE == datap->mType) | 104 | AURORA_WIND_LAYER_CODE == datap->mType) |
105 | { | 105 | { |
106 | datap->mRegionp->mWind.decompress(bit_pack, &goph); | 106 | datap->mRegionp->mWind.decompress(bit_pack, &goph); |
107 | } | 107 | } |
108 | else if (CLOUD_LAYER_CODE == datap->mType || | 108 | else if (CLOUD_LAYER_CODE == datap->mType || |
109 | AURORA_CLOUD_LAYER_CODE == datap->mType) | 109 | AURORA_CLOUD_LAYER_CODE == datap->mType) |
110 | { | 110 | { |
111 | datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph); | 111 | datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph); |
112 | } | 112 | } |
113 | } | 113 | } |
114 | 114 | ||