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

Viewer tag fix for silliness on other avatars not showing tags I blame clothing protection

Browse Source
This commit is contained in:
cryogenic
2010-05-10 15:57:32 -05:00
parent efc658ccf1
commit ac593b1261
3 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterexport.cpp
View File

@@ -186,7 +186,7 @@ LLSD LLExportable::asLLSD()
return llsd;
}
return NULL;
return LLSD();
}

52
indra/newview/llviewerobjectlist.cpp
View File

@@ -75,10 +75,10 @@
#include "llappviewer.h"
// <edit>
#include "llimportobject.h"
// <edit>
#include "llimportobject.h"
// </edit>
extern F32 gMinObjectDistance;
extern BOOL gAnimateTextures;
@@ -548,28 +548,28 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
}
processUpdateCore(objectp, user_data, i, update_type, NULL, justCreated);
}
// <edit>
if(justCreated && LLXmlImport::sImportInProgress)
{
if(objectp)
{
LLViewerObject* parent = (LLViewerObject*)objectp->getParent();
if(parent)
{
if(parent->getID() == gAgent.getID())
{
LLXmlImport::onNewAttachment(objectp);
}
}
else if( objectp->permYouOwner()
&& (objectp->getPCode() == LLXmlImport::sSupplyParams->getPCode())
&& (objectp->getScale() == LLXmlImport::sSupplyParams->getScale()))
{
LLXmlImport::onNewPrim(objectp);
}
}
}
// </edit>
// <edit>
if(justCreated && LLXmlImport::sImportInProgress)
{
if(objectp)
{
LLViewerObject* parent = (LLViewerObject*)objectp->getParent();
if(parent)
{
if(parent->getID() == gAgent.getID())
{
LLXmlImport::onNewAttachment(objectp);
}
}
else if( objectp->permYouOwner()
&& (objectp->getPCode() == LLXmlImport::sSupplyParams->getPCode())
&& (objectp->getScale() == LLXmlImport::sSupplyParams->getScale()))
{
LLXmlImport::onNewPrim(objectp);
}
}
}
// </edit>
}
LLVOAvatar::cullAvatarsByPixelArea();
@@ -668,7 +668,7 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
mCurLazyUpdateIndex = 0;
}
mCurBin = (++mCurBin) % NUM_BINS;
mCurBin = (mCurBin + 1) % NUM_BINS;
LLVOAvatar::cullAvatarsByPixelArea();
}

17
indra/newview/llvoavatar.cpp
View File

@@ -1577,6 +1577,7 @@ void LLVOAvatar::getSpatialExtents(LLVector3& newMin, LLVector3& newMax)
//-----------------------------------------------------------------------------
void LLVOAvatar::renderCollisionVolumes()
{
LLGLDepthTest gls_depth(GL_FALSE);
for (S32 i = 0; i < mNumCollisionVolumes; i++)
{
mCollisionVolumes[i].renderCollision();
@@ -3163,7 +3164,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
mNameText->setColor(LLColor4(1.f, 1.0f, 1.0f));
line += " (Unknown viewer)";
}
else
else if(isFullyLoaded() && !mIsSelf)
{
std::string uuid_str = getTE(0)->getID().asString();
@@ -3267,6 +3268,12 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
mNameText->setColor(avatar_name_color);
}
}
else
{
LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
avatar_name_color.setAlpha(1.f);
mNameText->setColor(avatar_name_color);
}
// </edit>
if (is_away || is_muted || is_busy)
{
@@ -8152,12 +8159,16 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
}
setCompositeUpdatesEnabled( FALSE );
// <edit>
/*
if (!mIsSelf)
{
releaseUnnecessaryTextures();
}
*/
// </edit>
updateMeshTextures(); // enables updates for laysets without baked textures.
// parse visual params