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

Merge branch 'master' into meshupload

Browse Source 
Conflicts:
	indra/llcommon/llhash.h
	indra/newview/CMakeLists.txt
	indra/newview/llfloatermodelpreview.cpp
	indra/newview/llfloatermodelpreview.h
	indra/newview/llpanelprofile.h
This commit is contained in:
Latif Khalifa
2013-01-30 00:36:31 +01:00
parent 1d673df1bd 237f84cde0
commit 8584e6da4c
439 changed files with 20586 additions and 17478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llinventorybackup.cpp
View File

@@ -305,7 +305,7 @@ void LLInventoryBackup::download(LLInventoryItem* item, LLFloater* floater, load
switch(item->getType())
{
case LLAssetType::AT_TEXTURE:
imagep = LLViewerTextureManager::getFetchedTexture(item->getAssetUUID(), MIPMAP_TRUE, LLViewerTexture::BOOST_UI);
imagep = LLViewerTextureManager::getFetchedTexture(item->getAssetUUID(), MIPMAP_TRUE, LLGLTexture::BOOST_UI);
imagep->setLoadedCallback( onImage, 0, TRUE, FALSE, userdata, NULL ); // was setLoadedCallbackNoAuth
break;
case LLAssetType::AT_NOTECARD:
@@ -363,7 +363,7 @@ void LLInventoryBackup::imageCallback(BOOL success,
}
else
{
src_vi->setBoostLevel(LLViewerTexture::BOOST_UI);
src_vi->setBoostLevel(LLGLTexture::BOOST_UI);
}
}
@@ -738,7 +738,7 @@ void LLFloaterInventoryBackup::imageCallback(BOOL success,
}
else
{
src_vi->setBoostLevel(LLViewerTexture::BOOST_UI);
src_vi->setBoostLevel(LLGLTexture::BOOST_UI);
}
}