From 619748ed1e876c724e0d827750c1ef4ad95ef3f2 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Thu, 6 Oct 2011 03:52:04 +0200 Subject: [PATCH] Fix the map changes to use new blocks rather than adding fields and update the 'real' message template with the changes. --- indra/newview/llworldmap.cpp | 11 +++++++---- scripts/messages/message_template.msg | 7 ++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp index b1493ab5f..0a8996f5d 100644 --- a/indra/newview/llworldmap.cpp +++ b/indra/newview/llworldmap.cpp @@ -674,8 +674,8 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**) { U16 x_regions; U16 y_regions; - U16 x_size; - U16 y_size; + U16 x_size = 256; + U16 y_size = 256; std::string name; U8 accesscode; U32 region_flags; @@ -690,8 +690,11 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**) msg->getU8Fast(_PREHASH_Data, _PREHASH_WaterHeight, water_height, block); msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block); msg->getUUIDFast(_PREHASH_Data, _PREHASH_MapImageID, image_id, block); - msg->getU16Fast(_PREHASH_Data, _PREHASH_SizeX, x_size, block); - msg->getU16Fast(_PREHASH_Data, _PREHASH_SizeY, y_size, block); + if(msg->getNumberOfBlocksFast(_PREHASH_Size) > 0) + { + msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeX, x_size, block); + msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeY, y_size, block); + } if(x_size == 0 || (x_size % 16) != 0|| (y_size % 16) != 0) { x_size = 256; diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index d3acb611e..3e748330d 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -2061,7 +2061,7 @@ version 2.0 { IsPhantom BOOL } { CastsShadows BOOL } } - { + { ExtraPhysics Variable { PhysicsShapeType U8 } { Density F32 } @@ -8654,6 +8654,11 @@ version 2.0 { Agents U8 } { MapImageID LLUUID } } + { + Size Variable + { SizeX U16 } + { SizeY U16 } + } } // viewer -> sim