diff -r 767757e005e3 doc/contributions.txt
--- a/doc/contributions.txt	Mon Jan 30 16:45:50 2012 -0500
+++ b/doc/contributions.txt	Wed Feb 08 13:23:00 2012 -0500
@@ -610,6 +610,7 @@
 	STORM-1788
 	STORM-1799
 	STORM-1796
+	STORM-1809
 Kadah Coba
 	STORM-1060
 Jondan Lundquist
diff -r 767757e005e3 indra/newview/lltexturectrl.cpp
--- a/indra/newview/lltexturectrl.cpp	Mon Jan 30 16:45:50 2012 -0500
+++ b/indra/newview/lltexturectrl.cpp	Wed Feb 08 13:23:00 2012 -0500
@@ -929,6 +929,13 @@
 	tentative_label_p.rect(LLRect (0, image_middle + line_height / 2, getRect().getWidth(), image_middle - line_height / 2 ));
 	tentative_label_p.follows.flags(FOLLOWS_ALL);
 	mTentativeLabel = LLUICtrlFactory::create<LLTextBox> (tentative_label_p);
+
+	// It is no longer possible to associate a style with a textbox, so it has to be done in this fashion
+	LLStyle::Params style_params;
+	style_params.color = LLColor4::white;
+
+	mTentativeLabel->setText(LLTrans::getString("multiple_textures"), style_params);
+	mTentativeLabel->setHAlign(LLFontGL::HCENTER);
 	addChild( mTentativeLabel );
 
 	LLRect border_rect = getLocalRect();
diff -r 767757e005e3 indra/newview/skins/default/xui/en/strings.xml
--- a/indra/newview/skins/default/xui/en/strings.xml	Mon Jan 30 16:45:50 2012 -0500
+++ b/indra/newview/skins/default/xui/en/strings.xml	Wed Feb 08 13:23:00 2012 -0500
@@ -369,6 +369,9 @@
 	<string name="anim_yes_happy">Yes (Happy)</string>
 	<string name="anim_yes_head">Yes</string>
 
+	<!-- build floater -->
+	<string name="multiple_textures">Multiple</string>
+
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
 	<string name="worldmap_offline">Offline</string>