From d07dea27ab1bc2457f8bd2ab24d8cdbfcb0e9e3c Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Wed, 11 Nov 2020 22:41:32 +0200
Subject: Post-merge leftover cleanup; buildfix

---
 indra/newview/lltexturecache.cpp | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index d0e313bfdb..a9f19dc32d 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -2123,30 +2123,7 @@ bool LLTextureCache::writeToFastCache(LLUUID image_id, S32 id, LLPointer<LLImage
 		if(w * h *c > 0) //valid
 		{
             // Make a duplicate to keep the original raw image untouched.
-            // Might be good idea to do a copy during writeToCache() call instead of here
-            try
-            {
-#if LL_WINDOWS
-                // Temporary diagnostics for scale/duplicate crash
-                logExceptionDupplicate(raw);
-#else
-                raw = raw->duplicate();
-#endif
-            }
-            catch (...)
-            {
-                removeFromCache(image_id);
-                LL_ERRS() << "Failed to cache image: " << image_id
-                    << " local id: " << id
-                    << " Exception: " << boost::current_exception_diagnostic_information()
-                    << " Image new width: " << w
-                    << " Image new height: " << h
-                    << " Image new components: " << c
-                    << " Image discard difference: " << i
-                    << LL_ENDL;
-
-                return false;
-            }
+            raw = raw->duplicate();
 
 			if (raw->isBufferInvalid())
 			{
-- 
cgit v1.2.3