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

Minimap fluke fix, thx Aleric

Browse Source
This commit is contained in:
Siana Gearz
2011-05-11 23:06:19 +02:00
parent 6b61e2dd2a
commit 29feeccf0d
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
indra/newview/llworld.cpp
View File

@@ -1386,26 +1386,17 @@ void send_agent_resume()
LLAppViewer::instance()->resumeMainloopTimeout(); LLAppViewer::instance()->resumeMainloopTimeout();
} }
static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin) static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin)
{ {
LLVector3d pos_global; LLVector3d pos_global(region_origin);
LLVector3 pos_local; LLVector3d pos_local;
U8 bits;
pos_local.mdV[VZ] = (compact_local & 0xFFU) * 4;
bits = compact_local & 0xFF; pos_local.mdV[VY] = (compact_local >> 8) & 0xFFU;
pos_local.mV[VZ] = F32(bits) * 4.f; pos_local.mdV[VX] = (compact_local >> 16) & 0xFFU;
compact_local >>= 8;
pos_global += pos_local;
bits = compact_local & 0xFF; return pos_global;
pos_local.mV[VY] = (F32)bits;
compact_local >>= 8;
bits = compact_local & 0xFF;
pos_local.mV[VX] = (F32)bits;
pos_global.setVec( pos_local );
pos_global += region_origin;
return pos_global;
} }
void LLWorld::getAvatars(std::vector<LLUUID>* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const void LLWorld::getAvatars(std::vector<LLUUID>* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const