Merge remote-tracking branch 'origin/DRTVWR-559' into DRTVWR-559

1 files changed, 0 insertions, 30 deletions

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index c2e09b2882..0fd796afba 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -659,8 +659,6 @@ S8 LLViewerTexture::getType() const
 
 void LLViewerTexture::cleanup()
 {
-	notifyAboutMissingAsset();
-
     if (LLAppViewer::getTextureFetch())
     {
         LLAppViewer::getTextureFetch()->updateRequestPriority(mID, 0.f);
@@ -673,30 +671,6 @@ void LLViewerTexture::cleanup()
 	mVolumeList[LLRender::SCULPT_TEX].clear();
 }
 
-void LLViewerTexture::notifyAboutCreatingTexture()
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-	for(U32 ch = 0; ch < LLRender::NUM_TEXTURE_CHANNELS; ++ch)
-	{
-		for(U32 f = 0; f < mNumFaces[ch]; f++)
-		{
-			mFaceList[ch][f]->notifyAboutCreatingTexture(this);
-		}
-	}
-}
-
-void LLViewerTexture::notifyAboutMissingAsset()
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-	for(U32 ch = 0; ch < LLRender::NUM_TEXTURE_CHANNELS; ++ch)
-	{
-		for(U32 f = 0; f < mNumFaces[ch]; f++)
-		{
-			mFaceList[ch][f]->notifyAboutMissingAsset(this);
-		}
-	}
-}
-
 // virtual
 void LLViewerTexture::dump()
 {
@@ -1579,8 +1553,6 @@ void LLViewerFetchedTexture::postCreateTexture()
     mGLTexturep->checkActiveThread();
 #endif
 
-    notifyAboutCreatingTexture();
-
     setActive();
 
     if (!needsToSaveRawImage())
@@ -2221,8 +2193,6 @@ void LLViewerFetchedTexture::setIsMissingAsset(BOOL is_missing)
 	}
 	if (is_missing)
 	{
-		notifyAboutMissingAsset();
-
 		if (mUrl.empty())
 		{
 			LL_WARNS() << mID << ": Marking image as missing" << LL_ENDL;