diff -r c0c940514b74 -r 45ec8a0c3c8c doc/contributions.txt
--- a/doc/contributions.txt	Wed May 25 15:56:59 2011 -0400
+++ b/doc/contributions.txt	Wed Jun 15 15:48:57 2011 -0400
@@ -440,6 +440,7 @@
 	STORM-1095
 	STORM-1236
 	STORM-1259
+	STORM-899
 Kage Pixel
 	VWR-11
 Ken March
diff -r c0c940514b74 -r 45ec8a0c3c8c indra/newview/llcofwearables.cpp
--- a/indra/newview/llcofwearables.cpp	Wed May 25 15:56:59 2011 -0400
+++ b/indra/newview/llcofwearables.cpp	Wed Jun 15 15:48:57 2011 -0400
@@ -317,7 +317,6 @@
 	mAttachments->setComparator(&WEARABLE_NAME_COMPARATOR);
 	mBodyParts->setComparator(&WEARABLE_NAME_COMPARATOR);
 
-
 	mClothingTab = getChild<LLAccordionCtrlTab>("tab_clothing");
 	mClothingTab->setDropDownStateChangedCallback(boost::bind(&LLCOFWearables::onAccordionTabStateChanged, this, _1, _2));
 
@@ -333,6 +332,8 @@
 
 	mAccordionCtrl = getChild<LLAccordionCtrl>("cof_wearables_accordion");
 
+	mAttachments->setNoItemsCommentText(LLTrans::getString("no_attachments"));
+
 	return LLPanel::postBuild();
 }
 
diff -r c0c940514b74 -r 45ec8a0c3c8c indra/newview/skins/default/xui/en/panel_cof_wearables.xml
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml	Wed May 25 15:56:59 2011 -0400
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml	Wed Jun 15 15:48:57 2011 -0400
@@ -53,9 +53,6 @@
              name="list_attachments"
              top="0"
              width="311">
-              <flat_list_view.no_items_text
-               value="No attachments worn" />
-              </flat_list_view>
         </accordion_tab>
         <accordion_tab
          layout="topleft"
diff -r c0c940514b74 -r 45ec8a0c3c8c indra/newview/skins/default/xui/en/strings.xml
--- a/indra/newview/skins/default/xui/en/strings.xml	Wed May 25 15:56:59 2011 -0400
+++ b/indra/newview/skins/default/xui/en/strings.xml	Wed Jun 15 15:48:57 2011 -0400
@@ -2143,6 +2143,10 @@
 	<string name="Right Pec">Right Pec</string>
 	<string name="Invalid Attachment">Invalid Attachment Point</string>
 
+  <!-- Flatlist sidebar messages -->
+    <!-- My appearance/Edit outfit/Attachments -->
+    <string name="no_attachments">No attachments worn</string>
+
   <!-- Avatar age computation, see LLDateUtil::ageFromDate -->
   <string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string>
   <string name="YearsOld">[AGEYEARS] old</string>