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

Inconsistent line endings in newview/llviewermessage.cpp

Browse Source
This commit is contained in:
Shyotl
2011-10-14 23:15:28 -05:00
parent 04828032f6
commit ae0196e2c3
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
indra/newview/llviewermessage.cpp
View File

@@ -3681,17 +3681,17 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
U32 teleport_flags; U32 teleport_flags;
msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags); msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
U32 region_size_x = 256; U32 region_size_x = 256;
msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x); msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
U32 region_size_y = 256; U32 region_size_y = 256;
msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y); msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
//and a little hack for Second Life compatibility //and a little hack for Second Life compatibility
if (region_size_y == 0 || region_size_x == 0) if (region_size_y == 0 || region_size_x == 0)
{ {
region_size_x = 256; region_size_x = 256;
region_size_y = 256; region_size_y = 256;
} }
std::string seedCap; std::string seedCap;
@@ -4018,17 +4018,17 @@ void process_crossed_region(LLMessageSystem* msg, void**)
std::string seedCap; std::string seedCap;
msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap); msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
U32 region_size_x = 256; U32 region_size_x = 256;
msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x); msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
U32 region_size_y = 256; U32 region_size_y = 256;
msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y); msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
//and a little hack for Second Life compatibility //and a little hack for Second Life compatibility
if (region_size_y == 0 || region_size_x == 0) if (region_size_y == 0 || region_size_x == 0)
{ {
region_size_x = 256; region_size_x = 256;
region_size_y = 256; region_size_y = 256;
} }
send_complete_agent_movement(sim_host); send_complete_agent_movement(sim_host);