From 5cc44523f79b6cf495d2649fce9bf9e5181787e8 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 9 Feb 2007 23:35:12 +0000
Subject: Result of svn merge -r57350:57790
 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.

---
 indra/newview/lltexturectrl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index be33de3cca..5eae8c2ff1 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -319,7 +319,8 @@ void LLFloaterTexturePicker::updateImageStats()
 		}
 		if (gAgent.isGodlike())
 		{
-			LLString tstring = "Pick: " + mTexturep->getID().getString();
+			LLString tstring = "Pick: ";
+			tstring.append(mTexturep->getID().asString());
 			setTitle(tstring);
 		}
 	}
-- 
cgit v1.2.3