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

LLTexLayer now using shaders if applicable. Also added misc tidbits missed earlier.

Browse Source
This commit is contained in:
Shyotl
2011-12-10 22:51:52 -06:00
parent 918d527b14
commit a726de0e99
5 changed files with 116 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/llhudeffectpointat.cpp
View File

@@ -161,6 +161,7 @@ void LLHUDEffectPointAt::unpackData(LLMessageSystem *mesgsys, S32 blocknum)
LLHUDEffect::unpackData(mesgsys, blocknum);
LLUUID source_id;
LLUUID target_id;
U8 pointAtTypeUnpacked = 0;
S32 size = mesgsys->getSizeFast(_PREHASH_Effect, blocknum, _PREHASH_TypeData);
if (size != PKT_SIZE)
{
@@ -170,23 +171,22 @@ void LLHUDEffectPointAt::unpackData(LLMessageSystem *mesgsys, S32 blocknum)
mesgsys->getBinaryDataFast(_PREHASH_Effect, _PREHASH_TypeData, packed_data, PKT_SIZE, blocknum);
htonmemcpy(source_id.mData, &(packed_data[SOURCE_AVATAR]), MVT_LLUUID, 16);
htonmemcpy(target_id.mData, &(packed_data[TARGET_OBJECT]), MVT_LLUUID, 16);
htonmemcpy(new_target.mdV, &(packed_data[TARGET_POS]), MVT_LLVector3d, 24);
htonmemcpy(&pointAtTypeUnpacked, &(packed_data[POINTAT_TYPE]), MVT_U8, 1);
LLVOAvatar *avatarp = gObjectList.findAvatar(source_id);
if (avatarp)
{
LLVOAvatar *avatarp = gObjectList.findAvatar(source_id);
if (avatarp)
setSourceObject(avatarp);
else
{
//llwarns << "Could not find source avatar for pointat effect" << llendl;
return;
}
setSourceObject(avatarp);
}
else
{
//llwarns << "Could not find source avatar for pointat effect" << llendl;
return;
}
htonmemcpy(target_id.mData, &(packed_data[TARGET_OBJECT]), MVT_LLUUID, 16);
LLViewerObject* objp = gObjectList.findObject(target_id);
htonmemcpy(new_target.mdV, &(packed_data[TARGET_POS]), MVT_LLVector3d, 24);
LLViewerObject *objp = gObjectList.findObject(target_id);
if (objp)
{
@@ -197,8 +197,6 @@ void LLHUDEffectPointAt::unpackData(LLMessageSystem *mesgsys, S32 blocknum)
setTargetPosGlobal(new_target);
}
U8 pointAtTypeUnpacked = 0;
htonmemcpy(&pointAtTypeUnpacked, &(packed_data[POINTAT_TYPE]), MVT_U8, 1);
mTargetType = (EPointAtType)pointAtTypeUnpacked;
// mKillTime = mTimer.getElapsedTimeF32() + mDuration;