diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
commit | ac1b723fd79b63a9dab94c839d3c0acb2ddde129 (patch) | |
tree | 4da36d5bae02191ce86dea8b5b074b48f516a3ae /indra/newview/skins/default/xui/en/floater_customize.xml | |
parent | d53725ece11eb3403128dd77834742a1d084138f (diff) |
svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
This merges in all appearance side panel bug fixes.
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_customize.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_customize.xml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index 41bd417c12..824df082d8 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -3561,14 +3561,4 @@ scratch and wear it. name="Ok" right="-116" width="100" /> - <button - follows="left|bottom" - height="20" - label="Make Outfit..." - label_selected="Make Outfit..." - layout="topleft" - left_delta="-178" - name="Make Outfit" - top_delta="0" - width="100" /> </floater> |