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

LLAgentCamera transition (1/2)

Browse Source
This commit is contained in:
Shyotl
2011-06-07 21:35:10 -05:00
parent 278cfbdb67
commit a07e399801
89 changed files with 616 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lltexlayer.cpp
View File

@@ -34,6 +34,7 @@
#include "imageids.h"
#include "llagent.h"
#include "llagentcamera.h"
#include "llcrc.h"
#include "lldir.h"
#include "llglheaders.h"
@@ -189,7 +190,7 @@ void LLTexLayerSetBuffer::cancelUpload()
// do we need to upload, and do we have sufficient data to create an uploadable composite?
BOOL LLTexLayerSetBuffer::needsUploadNow() const
{
BOOL upload = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal() && (gAgent.mNumPendingQueries == 0);
BOOL upload = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal() && gAgentQueryManager.hasNoPendingQueries();
return (upload && (LLFrameTimer::getTotalTime() > mUploadAfter));
}
@@ -2006,7 +2007,7 @@ void LLTexLayerParamAlpha::setWeight(F32 weight, BOOL set_by_user)
LLVOAvatar* avatar = mTexLayer->getTexLayerSet()->getAvatar();
if( avatar->getSex() & getSex() )
{
if ( gAgent.cameraCustomizeAvatar() )
if ( gAgentCamera.cameraCustomizeAvatar() )
{
set_by_user = FALSE;
}