diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-15 11:56:18 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-15 11:56:18 -0400 |
| commit | 83cb59e45b56cd6b3f42de760bc64a8203913251 (patch) | |
| tree | 9ab51eae79cd0d75a660dd05b33a3dee73be7443 /indra/newview/skins | |
| parent | b6e69570dc69b6e4f2a6e9362510d5ff3cd169e5 (diff) | |
| parent | 9134ec0197cd53ad6a0690c2cbfda406c7d9dbcb (diff) | |
merge changes for storm-899
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_cof_wearables.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml index f438e3d42d..bbeb592e96 100644 --- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml @@ -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 --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 339f14eacb..71f48c833d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2101,6 +2101,8 @@ Returns a string with the requested data about the region <string name="InvFolder Friends">Friends</string> <string name="InvFolder All">All</string> + <string name="no_attachments">No attachments worn</string> + <!-- inventory FVBridge --> <!-- This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale --> <string name="Buy">Buy</string> |