From df4d167cd13fd89a85e4d30dca94e40c934707d7 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 21 Dec 2007 06:44:41 +0000
Subject: svn merge -r74200:76302
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer -->
 release

Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
---
 indra/newview/lltexturectrl.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra/newview/lltexturectrl.cpp')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 706587abb0..c17f0007c2 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -351,12 +351,6 @@ void LLFloaterTexturePicker::updateImageStats()
 		{
 			mResolutionLabel->setTextArg("[DIMENSIONS]", LLString("[? x ?]"));
 		}
-		if (gAgent.isGodlike())
-		{
-			LLString tstring = "Pick: ";
-			tstring.append(mTexturep->getID().asString());
-			setTitle(tstring);
-		}
 	}
 }
 
-- 
cgit v1.2.3