diff -r 34d957a19aa4 -r 69de172236a6 doc/contributions.txt
--- a/doc/contributions.txt	Fri Dec 16 09:39:55 2011 -0500
+++ b/doc/contributions.txt	Sat Dec 17 13:27:20 2011 -0500
@@ -595,6 +595,7 @@
 	STORM-1719
 	STORM-1712
 	STORM-1728
+	STORM-653
 Kadah Coba
 	STORM-1060
 Jondan Lundquist
diff -r 34d957a19aa4 -r 69de172236a6 indra/newview/llcofwearables.h
--- a/indra/newview/llcofwearables.h	Fri Dec 16 09:39:55 2011 -0500
+++ b/indra/newview/llcofwearables.h	Sat Dec 17 13:27:20 2011 -0500
@@ -91,6 +91,8 @@
 	 */
 	void selectClothing(LLWearableType::EType clothing_type);
 
+	void setAttachmentsTitle();
+
 protected:
 
 	void populateAttachmentsAndBodypartsLists(const LLInventoryModel::item_array_t& cof_items);
diff -r 34d957a19aa4 -r 69de172236a6 indra/newview/llcofwearables.cpp
--- a/indra/newview/llcofwearables.cpp	Fri Dec 16 09:39:55 2011 -0500
+++ b/indra/newview/llcofwearables.cpp	Sat Dec 17 13:27:20 2011 -0500
@@ -328,6 +328,19 @@
 	return LLPanel::postBuild();
 }
 
+void LLCOFWearables::setAttachmentsTitle()
+{
+	if (mAttachmentsTab)
+	{
+		U32 free_slots = MAX_AGENT_ATTACHMENTS - mAttachments->size();
+
+		LLStringUtil::format_map_t args_attachments;
+		args_attachments["[COUNT]"] = llformat ("%d", free_slots);
+		std::string attachments_title = LLTrans::getString("Attachments remain", args_attachments);
+		mAttachmentsTab->setTitle(attachments_title);
+	}
+}
+
 void LLCOFWearables::onSelectionChange(LLFlatListView* selected_list)
 {
 	if (!selected_list) return;
@@ -490,6 +503,7 @@
 	{
 		mAttachments->sort();
 		mAttachments->notify(REARRANGE); //notifying the parent about the list's size change (cause items were added with rearrange=false)
+		setAttachmentsTitle();
 	}
 	else
 	{
diff -r 34d957a19aa4 -r 69de172236a6 indra/newview/skins/default/xui/en/panel_cof_wearables.xml
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml	Fri Dec 16 09:39:55 2011 -0500
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml	Sat Dec 17 13:27:20 2011 -0500
@@ -37,6 +37,7 @@
              top="0"
              width="311" />
         </accordion_tab>
+         <!-- The Attachments title is overwritten by the definition of "Attachments remain" in strings.xml -->
         <accordion_tab
          layout="topleft"
          name="tab_attachments"
diff -r 34d957a19aa4 -r 69de172236a6 indra/newview/skins/default/xui/en/strings.xml
--- a/indra/newview/skins/default/xui/en/strings.xml	Fri Dec 16 09:39:55 2011 -0500
+++ b/indra/newview/skins/default/xui/en/strings.xml	Sat Dec 17 13:27:20 2011 -0500
@@ -2133,6 +2133,7 @@
 	<string name="InvFolder All">All</string>
 
 	<string name="no_attachments">No attachments worn</string>
+    <string name="Attachments remain">Attachments ([COUNT] slots remain)</string>
 
 	<!-- inventory FVBridge -->
 	<!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->