diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
| commit | 74d4f8af01358c0975351f90f044c03bc9c50c4c (patch) | |
| tree | 72b8f043cd5787409718d1ca7be21ec32cf10657 /indra/newview/llviewertexturelist.cpp | |
| parent | 52411f83a1e92d8449f68a6528f5b78e7c391553 (diff) | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
v-r to drano merge conflicts wip
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 385c61f6c7..ddfb89b03b 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -58,7 +58,11 @@ #include "pipeline.h" #include "llappviewer.h" #include "llxuiparser.h" +<<<<<<< local #include "llviewerdisplay.h" +======= +#include "llagent.h" +>>>>>>> other //////////////////////////////////////////////////////////////////////////// @@ -609,15 +613,25 @@ static LLFastTimer::DeclareTimer FTM_IMAGE_STATS("Stats"); void LLViewerTextureList::updateImages(F32 max_time) { +<<<<<<< local static BOOL cleared = FALSE; if(gTeleportDisplay && !cleared) +======= + if(gAgent.getTeleportState() != LLAgent::TELEPORT_NONE) +>>>>>>> other { clearFetchingRequests(); +<<<<<<< local gPipeline.clearRebuildGroups(); cleared = TRUE; +======= +>>>>>>> other return; } +<<<<<<< local cleared = FALSE; +======= +>>>>>>> other LLAppViewer::getTextureFetch()->setTextureBandwidth(LLViewerStats::getInstance()->mTextureKBitStat.getMeanPerSec()); @@ -693,13 +707,24 @@ void LLViewerTextureList::clearFetchingRequests() return; } +<<<<<<< local LLAppViewer::getTextureFetch()->deleteAllRequests(); +======= +>>>>>>> other for (image_priority_list_t::iterator iter = mImageList.begin(); iter != mImageList.end(); ++iter) { +<<<<<<< local LLViewerFetchedTexture* imagep = *iter; imagep->forceToDeleteRequest() ; +======= + LLViewerFetchedTexture* image = *iter; + if(image->hasFetcher()) + { + image->forceToDeleteRequest() ; + } +>>>>>>> other } } @@ -1556,6 +1581,9 @@ LLUIImagePtr LLUIImageList::loadUIImage(LLViewerFetchedTexture* imagep, const st imagep->setAddressMode(LLTexUnit::TAM_CLAMP); + //don't compress UI images + imagep->getGLTexture()->setAllowCompression(false); + //all UI images are non-deletable imagep->setNoDelete(); |