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

Added explicit texture reloading. Accessable in the 'tools' submenus for the agent, avatars, and selected objects.

Browse Source
This commit is contained in:
Shyotl
2012-12-02 17:06:54 -06:00
parent 8b19f82c0b
commit 0554ecae5c
9 changed files with 156 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llviewertexture.cpp
View File

@@ -1333,6 +1333,30 @@ void LLViewerFetchedTexture::cleanup()
mSavedRawDiscardLevel = -1;
}
void LLViewerFetchedTexture::forceRefetch()
{
bool needs_aux = mNeedsAux;
bool save_raw = mForceToSaveRawImage;
S32 raw_discard = mDesiredSavedRawDiscardLevel;
F32 raw_time = mKeptSavedRawImageTime;
callback_list_t callback_list = mLoadedCallbackList;
mLoadedCallbackList.clear();
LLAppViewer::getTextureFetch()->deleteRequest(getID(), true);
if(mGLTexturep)
mGLTexturep->forceToInvalidateGLTexture();
init(false);
mRawImage = NULL;
mAuxRawImage = NULL;
if(save_raw)
forceToSaveRawImage(raw_discard,raw_time);
for(callback_list_t::iterator iter = callback_list.begin();
iter != callback_list.end(); ++iter)
{
LLLoadedCallbackEntry *entryp = *iter;
setLoadedCallback(entryp->mCallback,entryp->mDesiredDiscard,entryp->mNeedsImageRaw,needs_aux,entryp->mUserData,entryp->mSourceCallbackList,entryp->mPaused);
}
}
void LLViewerFetchedTexture::setForSculpt()
{
static const S32 MAX_INTERVAL = 8 ; //frames