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

Merge branch 'FMODStudio'

Browse Source 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
This commit is contained in:
Shyotl
2015-01-26 17:15:46 -06:00
parent 2132978c41 6e4ef6f8a1
commit b865b92a6a
224 changed files with 4964 additions and 4731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewermessage.cpp
View File

@@ -3961,9 +3961,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
const LLViewerObject* obj(chatter ? chatter : gObjectList.findObject(owner_id));
// Compute the object SLURL.
LLVector3 pos = obj ? obj->getPositionRegion() : LLVector3::zero;
S32 x = llround((F32)fmod((F64)pos.mV[VX], (F64)REGION_WIDTH_METERS));
S32 y = llround((F32)fmod((F64)pos.mV[VY], (F64)REGION_WIDTH_METERS));
S32 z = llround((F32)pos.mV[VZ]);
S32 x = llmath::llround((F32)fmod((F64)pos.mV[VX], (F64)REGION_WIDTH_METERS));
S32 y = llmath::llround((F32)fmod((F64)pos.mV[VY], (F64)REGION_WIDTH_METERS));
S32 z = llmath::llround((F32)pos.mV[VZ]);
std::ostringstream location;
location << (obj ? obj->getRegion() : gAgent.getRegion())->getName() << "/" << x << "/" << y << "/" << z;
if (chatter != obj) location << "?owner_not_object";