From e197b0f8669fea58bbbad747c03866d3bee43ca3 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 2 Oct 2010 18:09:34 -0700
Subject: Preview temporary textures on upload (by Henri Beauchamp from the
 Cool Viewer). TODO: add 'temporary' to the window title for temp textures

---
 linden/indra/newview/llviewermenufile.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 364dcfd..432fcc5 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -43,6 +43,7 @@
 #include "llfloaternamedesc.h"
 #include "llfloatersnapshot.h"
 #include "llinventorymodel.h"	// gInventory
+#include "llinventoryview.h"	// open_texture()
 #include "llresourcedata.h"
 #include "llfloaterperms.h"
 #include "llstatusbar.h"
@@ -875,7 +876,9 @@ void temp_upload_done_callback(const LLUUID& uuid, void* user_data, S32 result,
 		item->updateServer(TRUE);
 		gInventory.updateItem(item);
 		gInventory.notifyObservers();
-	}else // 	if(result >= 0)
+		open_texture(item_id, std::string("Texture: ") + item->getName(), TRUE, LLUUID::null, FALSE);
+	}
+	else // if(result >= 0)
 	{
 		LLSD args;
 		args["FILE"] = LLInventoryType::lookupHumanReadable(data->mInventoryType);
-- 
cgit v1.1