Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the map changes to use new blocks rather than adding fields and update the 'real' message template with the changes.

Browse Source
This commit is contained in:
Siana Gearz
2011-10-06 03:52:04 +02:00
parent df7f37d0eb
commit 619748ed1e
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llworldmap.cpp
View File

@@ -674,8 +674,8 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
{ {
U16 x_regions; U16 x_regions;
U16 y_regions; U16 y_regions;
U16 x_size; U16 x_size = 256;
U16 y_size; U16 y_size = 256;
std::string name; std::string name;
U8 accesscode; U8 accesscode;
U32 region_flags; 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_WaterHeight, water_height, block);
msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block); msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block);
msg->getUUIDFast(_PREHASH_Data, _PREHASH_MapImageID, image_id, block); msg->getUUIDFast(_PREHASH_Data, _PREHASH_MapImageID, image_id, block);
msg->getU16Fast(_PREHASH_Data, _PREHASH_SizeX, x_size, block); if(msg->getNumberOfBlocksFast(_PREHASH_Size) > 0)
msg->getU16Fast(_PREHASH_Data, _PREHASH_SizeY, y_size, block); {
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) if(x_size == 0 || (x_size % 16) != 0|| (y_size % 16) != 0)
{ {
x_size = 256; x_size = 256;

7
scripts/messages/message_template.msg
View File

@@ -2061,7 +2061,7 @@ version 2.0
{ IsPhantom BOOL } { IsPhantom BOOL }
{ CastsShadows BOOL } { CastsShadows BOOL }
} }
{ {
ExtraPhysics Variable ExtraPhysics Variable
{ PhysicsShapeType U8 } { PhysicsShapeType U8 }
{ Density F32 } { Density F32 }
@@ -8654,6 +8654,11 @@ version 2.0
{ Agents U8 } { Agents U8 }
{ MapImageID LLUUID } { MapImageID LLUUID }
} }
{
Size Variable
{ SizeX U16 }
{ SizeY U16 }
}
} }
// viewer -> sim // viewer -> sim