livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more for EXT-7839: texture console is stalled; 

EXT-7500: Texture Jamming problems with http texture off;
meow-7.2.2
Xiaohong Bao 2010-07-01 15:33:06 -06:00
parent a9f2f874c8
commit 9fafe9853a
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llvoavatar.cpp
View File

@ -4228,21 +4228,21 @@ void LLVOAvatar::checkTextureLoading()
static const F32 MAX_INVISIBLE_WAITING_TIME = 30.f ; //seconds
BOOL pause = !isVisible() ;
if(!pause)
{
mInvisibleTimer.reset() ;
}
if(mLoadedCallbacksPaused == pause)
{
return ;
}
if(mCallbackTextureList.empty())
if(mCallbackTextureList.empty()) //when is self or no callbacks. Note: this list for self is always empty.
{
mLoadedCallbacksPaused = pause ;
return ; //nothing to check.
}
if(!pause)
{
mInvisibleTimer.reset() ;
}
if(pause && mInvisibleTimer.getElapsedTimeF32() < MAX_INVISIBLE_WAITING_TIME)
{
return ;
@ -4263,7 +4263,7 @@ void LLVOAvatar::checkTextureLoading()
static const F32 START_AREA = 100.f ;
tex->unpauseLoadedCallbacks(this) ;
tex->addTextureStats(START_AREA); //jump satrt the fetching again
tex->addTextureStats(START_AREA); //jump start the fetching again
}
}
}
@ -4274,6 +4274,7 @@ void LLVOAvatar::checkTextureLoading()
void LLVOAvatar::addBakedTextureStats( LLViewerFetchedTexture* imagep, F32 pixel_area, F32 texel_area_ratio, S32 boost_level)
{
//if this function is not called for the last 512 frames, the texture pipeline will stop fetching this texture.
static const S32 MAX_TEXTURE_VIRTURE_SIZE_RESET_INTERVAL = 512 ; //frames
imagep->resetTextureStats();

3
indra/newview/llwearable.cpp
View File

@ -106,7 +106,6 @@ LLWearable::LLWearable(const LLAssetID& asset_id) :
LLWearable::~LLWearable()
{
LLLoadedCallbackEntry::cleanUpCallbackList(&mCallbackTextureList, this) ;
}
const std::string& LLWearable::getTypeLabel() const
@ -446,7 +445,7 @@ BOOL LLWearable::importFile( LLFILE* file )
}
image->setBoostLevel(LLViewerTexture::BOOST_AVATAR_SELF) ;
image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te), this, &mCallbackTextureList);
image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te), NULL, NULL);
LLUUID textureid(text_buffer);
mTEMap[te] = new LLLocalTextureObject(image, textureid);

3
indra/newview/llwearable.h
View File

@ -164,8 +164,7 @@ private:
te_map_t mTEMap; // maps TE to LocalTextureObject
te_map_t mSavedTEMap; // last saved version of TEMap
LLUUID mItemID; // ID of the inventory item in the agent's inventory
LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ;
LLUUID mItemID; // ID of the inventory item in the agent's inventory
};
#endif // LL_LLWEARABLE_H