Fix a bunch of XUI warnings and as a result the long-standing bug of camera not switching properly when editing appearance

Wed, 06 Dec 2017 15:28:30 +0100

author
Ansariel
date
Wed, 06 Dec 2017 15:28:30 +0100
changeset 53547
874431ad4d78
parent 53546
70d57db53987
child 53548
8fa22a2b9b78

Fix a bunch of XUI warnings and as a result the long-standing bug of camera not switching properly when editing appearance

LLView::getChild: Found child named "wearable_accordion" but of wrong type class LLTabContainer, expecting class LLAccordionCtrl * __ptr64
LLView::getChild: Making dummy class LLAccordionCtrl named "wearable_accordion" in edit_shape_panel
LLView::getChild: Found child named "wearable_accordion" but of wrong type class LLTabContainer, expecting class LLAccordionCtrl * __ptr64
LLView::getChild: Making dummy class LLAccordionCtrl named "wearable_accordion" in edit_skin_panel
LLView::getChild: Making dummy class LLAccordionCtrl named "wearable_accordion" in edit_eyes_panel
LLView::getChild: Found child named "wearable_accordion" but of wrong type class LLTabContainer, expecting class LLAccordionCtrl * __ptr64
LLView::getChild: Making dummy class LLAccordionCtrl named "wearable_accordion" in edit_hair_panel
LLView::getChild: Making dummy class LLAccordionCtrlTab named "shape_ears_tab" in panel_edit_wearable
LLView::getChild: Making dummy class LLAccordionCtrlTab named "alpha_main_tab" in panel_edit_wearable
LLView::getChild: Making dummy class LLAccordionCtrlTab named "tattoo_main_tab" in panel_edit_wearable
LLView::getChild: Making dummy class LLAccordionCtrlTab named "physics_belly_updown_tab" in panel_edit_wearable
LLView::getChild: Making dummy class LLAccordionCtrlTab named "physics_butt_updown_tab" in panel_edit_wearable

indra/newview/llpaneleditwearable.cpp file | annotate | diff | revisions
indra/newview/llpaneleditwearable.h file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/de/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/en/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/es/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/pl/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/ru/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/de/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/en/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/es/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/fr/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/it/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/pl/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/ru/panel_edit_shape.xml file | annotate | diff | revisions
indra/newview/skins/vintage/xui/en/panel_edit_shape.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llpaneleditwearable.cpp	Wed Dec 06 11:32:28 2017 +0100
     1.2 +++ b/indra/newview/llpaneleditwearable.cpp	Wed Dec 06 15:28:30 2017 +0100
     1.3 @@ -64,6 +64,7 @@
     1.4  
     1.5  // [FS:CR] FIRE-10986
     1.6  #include "llfilepicker.h"
     1.7 +#include "lltabcontainer.h"
     1.8  
     1.9  // register panel with appropriate XML
    1.10  static LLPanelInjector<LLPanelEditWearable> t_edit_wearable("panel_edit_wearable");
    1.11 @@ -315,13 +316,21 @@
    1.12          addEntry(SUBPART_GLOVES, new SubpartEntry(SUBPART_GLOVES, "mTorso", "gloves", "gloves_main_param_list", "gloves_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-1.f, 0.15f, 0.f),SEX_BOTH));
    1.13          addEntry(SUBPART_UNDERSHIRT, new SubpartEntry(SUBPART_UNDERSHIRT, "mTorso", "undershirt", "undershirt_main_param_list", "undershirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
    1.14          addEntry(SUBPART_UNDERPANTS, new SubpartEntry(SUBPART_UNDERPANTS, "mPelvis", "underpants", "underpants_main_param_list", "underpants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
    1.15 -        addEntry(SUBPART_ALPHA, new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "alpha_main_param_list", "alpha_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
    1.16 -        addEntry(SUBPART_TATTOO, new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "tattoo_main_param_list", "tattoo_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
    1.17 +        // <FS:Ansariel> Alpha and tattoo don't adhere to the usual panel layout and don't have a param list and main tab
    1.18 +        //addEntry(SUBPART_ALPHA, new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "alpha_main_param_list", "alpha_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
    1.19 +        //addEntry(SUBPART_TATTOO, new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "tattoo_main_param_list", "tattoo_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
    1.20 +        addEntry(SUBPART_ALPHA, new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "", "", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
    1.21 +        addEntry(SUBPART_TATTOO, new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "", "", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
    1.22 +        // </FS:Ansariel>
    1.23          addEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, "mTorso", "physics_breasts_updown", "physics_breasts_updown_param_list", "physics_breasts_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
    1.24          addEntry(SUBPART_PHYSICS_BREASTS_INOUT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_INOUT, "mTorso", "physics_breasts_inout", "physics_breasts_inout_param_list", "physics_breasts_inout_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
    1.25          addEntry(SUBPART_PHYSICS_BREASTS_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_LEFTRIGHT, "mTorso", "physics_breasts_leftright", "physics_breasts_leftright_param_list", "physics_breasts_leftright_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
    1.26 -        addEntry(SUBPART_PHYSICS_BELLY_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BELLY_UPDOWN, "mTorso", "physics_belly_updown", "physics_belly_updown_param_list", "physics_belly_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
    1.27 -        addEntry(SUBPART_PHYSICS_BUTT_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BUTT_UPDOWN, "mTorso", "physics_butt_updown", "physics_butt_updown_param_list", "physics_butt_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
    1.28 +        // <FS:Ansariel> Fix XUI warning
    1.29 +        //addEntry(SUBPART_PHYSICS_BELLY_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BELLY_UPDOWN, "mTorso", "physics_belly_updown", "physics_belly_updown_param_list", "physics_belly_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
    1.30 +        //addEntry(SUBPART_PHYSICS_BUTT_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BUTT_UPDOWN, "mTorso", "physics_butt_updown", "physics_butt_updown_param_list", "physics_butt_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
    1.31 +        addEntry(SUBPART_PHYSICS_BELLY_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BELLY_UPDOWN, "mTorso", "physics_belly_updown", "physics_belly_updown_param_list", "physics_belly_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
    1.32 +        addEntry(SUBPART_PHYSICS_BUTT_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BUTT_UPDOWN, "mTorso", "physics_butt_updown", "physics_butt_updown_param_list", "physics_butt_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
    1.33 +        // </FS:Ansariel>
    1.34          addEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, "mTorso", "physics_butt_leftright", "physics_butt_leftright_param_list", "physics_butt_leftright_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
    1.35          addEntry(SUBPART_PHYSICS_ADVANCED, new SubpartEntry(SUBPART_PHYSICS_ADVANCED, "mTorso", "physics_advanced", "physics_advanced_param_list", "physics_advanced_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
    1.36  }
    1.37 @@ -748,10 +757,16 @@
    1.38          // Setting the visibility callback is applied only to the bodyparts panel
    1.39          // because currently they are the only ones whose 'wearable_accordion' has
    1.40          // multiple accordion tabs (see EXT-8164 for details).
    1.41 -        setWearablePanelVisibilityChangeCallback(mPanelShape);
    1.42 -        setWearablePanelVisibilityChangeCallback(mPanelSkin);
    1.43 -        setWearablePanelVisibilityChangeCallback(mPanelEyes);
    1.44 -        setWearablePanelVisibilityChangeCallback(mPanelHair);
    1.45 +        // <FS:Ansariel> Commenting out these calls fix XUI parser warnings.
    1.46 +        //               While it would be easy to fix those by using the correct
    1.47 +        //               widget classes, we comment it out because the LL default
    1.48 +        //               behavior is to always switch to the first tab when editing
    1.49 +        //               appearance which is highly annoying when fine-tuning shapes
    1.50 +        //setWearablePanelVisibilityChangeCallback(mPanelShape);
    1.51 +        //setWearablePanelVisibilityChangeCallback(mPanelSkin);
    1.52 +        //setWearablePanelVisibilityChangeCallback(mPanelEyes);
    1.53 +        //setWearablePanelVisibilityChangeCallback(mPanelHair);
    1.54 +        // </FS:Ansariel>
    1.55  
    1.56          //clothes
    1.57          mPanelShirt = getChild<LLPanel>("edit_shirt_panel");
    1.58 @@ -788,6 +803,9 @@
    1.59                          continue;
    1.60                  }
    1.61                  U8 num_subparts = wearable_entry->mSubparts.size();
    1.62 +
    1.63 +                // <FS:Ansariel> Appearance panel not updating camera position
    1.64 +                bool tab_container_cb_set = false;
    1.65          
    1.66                  for (U8 index = 0; index < num_subparts; ++index)
    1.67                  {
    1.68 @@ -803,7 +821,16 @@
    1.69          
    1.70                          const std::string accordion_tab = subpart_entry->mAccordionTab;
    1.71          
    1.72 -                        LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
    1.73 +                        // <FS:Ansariel> Alpha and tattoo don't adhere to the usual panel layout and don't have a param list and main tab
    1.74 +                        //               We can safely skip here as the wearables having no accordion tabs only have one sub-part,
    1.75 +                        //               so no camera switch is needed
    1.76 +                        //LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
    1.77 +                        if (accordion_tab.empty())
    1.78 +                        {
    1.79 +                            continue;
    1.80 +                        }
    1.81 +                        LLAccordionCtrlTab *tab = findChild<LLAccordionCtrlTab>(accordion_tab);
    1.82 +                        // </FS:Ansariel>
    1.83          
    1.84                          if (!tab)
    1.85                          {
    1.86 @@ -813,6 +840,19 @@
    1.87          
    1.88                          // initialize callback to ensure camera view changes appropriately.
    1.89                          tab->setDropDownStateChangedCallback(boost::bind(&LLPanelEditWearable::onTabExpandedCollapsed,this,_2,index));
    1.90 +
    1.91 +                        // <FS:Ansariel> Appearance panel not updating camera position; Some skins use tabs - in this case
    1.92 +                        //               set a callback on the tab container when the tab is changed to switch the camera position
    1.93 +                        if (!tab_container_cb_set)
    1.94 +                        {
    1.95 +                            LLTabContainer* tab_container = dynamic_cast<LLTabContainer*>(tab->getParent()->getParent()->getParent());
    1.96 +                            if (tab_container)
    1.97 +                            {
    1.98 +                                tab_container->setCommitCallback(boost::bind(&LLPanelEditWearable::onTabChanged, this, _1, type));
    1.99 +                                tab_container_cb_set = true;
   1.100 +                            }
   1.101 +                        }
   1.102 +                        // </FS:Ansariel>
   1.103                  }
   1.104  
   1.105                  // initialize texture and color picker controls
   1.106 @@ -1227,6 +1267,14 @@
   1.107          
   1.108                          const std::string scrolling_panel = subpart_entry->mParamList;
   1.109                          const std::string accordion_tab = subpart_entry->mAccordionTab;
   1.110 +
   1.111 +                        // <FS:Ansariel> Alpha and tattoo don't adhere to the usual panel layout and don't have a param list and main tab
   1.112 +                        //               Since there are no sex-based differences, we can skip here
   1.113 +                        if (scrolling_panel.empty() || accordion_tab.empty())
   1.114 +                        {
   1.115 +                            continue;
   1.116 +                        }
   1.117 +                        // </FS:Ansariel>
   1.118          
   1.119                          LLScrollingPanelList *panel_list = getChild<LLScrollingPanelList>(scrolling_panel);
   1.120                          LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
   1.121 @@ -1306,6 +1354,42 @@
   1.122  
   1.123  }
   1.124  
   1.125 +// <FS:Ansariel> Appearance panel not updating camera position
   1.126 +void LLPanelEditWearable::onTabChanged(LLUICtrl* ctrl, LLWearableType::EType type)
   1.127 +{
   1.128 +	LLTabContainer* container = dynamic_cast<LLTabContainer*>(ctrl);
   1.129 +	if (!container)
   1.130 +	{
   1.131 +		return;
   1.132 +	}
   1.133 +
   1.134 +	if (!mWearablePtr || !gAgentCamera.cameraCustomizeAvatar())
   1.135 +	{
   1.136 +		// we don't have a valid wearable we're editing, or we've left the wearable editor
   1.137 +		return;
   1.138 +	}
   1.139 +
   1.140 +	const LLEditWearableDictionary::WearableEntry* wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type);
   1.141 +	if (!wearable_entry)
   1.142 +	{
   1.143 +		return;
   1.144 +	}
   1.145 +
   1.146 +	U8 num_subparts = wearable_entry->mSubparts.size();
   1.147 +	for (U8 index = 0; index < num_subparts; ++index)
   1.148 +	{
   1.149 +		ESubpart subpart_e = wearable_entry->mSubparts[index];
   1.150 +		const LLEditWearableDictionary::SubpartEntry* subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
   1.151 +
   1.152 +		if (subpart_entry && container->getCurrentPanel()->hasChild(subpart_entry->mAccordionTab, TRUE))
   1.153 +		{
   1.154 +			changeCamera(index);
   1.155 +			break;
   1.156 +		}
   1.157 +	}
   1.158 +}
   1.159 +// </FS:Ansariel>
   1.160 +
   1.161  void LLPanelEditWearable::changeCamera(U8 subpart)
   1.162  {
   1.163  	// Don't change the camera if this type doesn't have a camera switch.
     2.1 --- a/indra/newview/llpaneleditwearable.h	Wed Dec 06 11:32:28 2017 +0100
     2.2 +++ b/indra/newview/llpaneleditwearable.h	Wed Dec 06 15:28:30 2017 +0100
     2.3 @@ -72,6 +72,7 @@
     2.4  
     2.5  	void				showDefaultSubpart();
     2.6  	void				onTabExpandedCollapsed(const LLSD& param, U8 index);
     2.7 +	void				onTabChanged(LLUICtrl* ctrl, LLWearableType::EType type); // <FS:Ansariel> Appearance panel not updating camera position
     2.8  
     2.9  	void 				updateScrollingPanelList();
    2.10  
     3.1 --- a/indra/newview/skins/ansastorm/xui/de/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
     3.2 +++ b/indra/newview/skins/ansastorm/xui/de/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
     3.3 @@ -29,7 +29,7 @@
     3.4  		</panel>
     3.5  		<panel name="shape_ears_tab_holder" title="Ohren">
     3.6  			<accordion name="shape_ears_accordion">
     3.7 -				<accordion_tab name="shape_head_tab" title="Ohren"/>
     3.8 +				<accordion_tab name="shape_ears_tab" title="Ohren"/>
     3.9  			</accordion>
    3.10  		</panel>
    3.11  		<panel name="shape_nose_tab_holder" title="Nase">
     4.1 --- a/indra/newview/skins/ansastorm/xui/en/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
     4.2 +++ b/indra/newview/skins/ansastorm/xui/en/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
     4.3 @@ -184,7 +184,7 @@
     4.4         header_visible="false"
     4.5         layout="topleft"
     4.6         min_height="150"
     4.7 -       name="shape_head_tab"
     4.8 +       name="shape_ears_tab"
     4.9         fit_panel="false"
    4.10         title="Ears">
    4.11        <!-- Viewer will replace things here with tiled editing views -->
     5.1 --- a/indra/newview/skins/ansastorm/xui/es/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
     5.2 +++ b/indra/newview/skins/ansastorm/xui/es/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
     5.3 @@ -27,7 +27,7 @@
     5.4  		</panel>
     5.5  		<panel name="shape_ears_tab_holder" title="Orejas">
     5.6  			<accordion name="shape_ears_accordion">
     5.7 -				<accordion_tab name="shape_head_tab" title="Orejas"/>
     5.8 +				<accordion_tab name="shape_ears_tab" title="Orejas"/>
     5.9  			</accordion>
    5.10  		</panel>
    5.11  		<panel name="shape_nose_tab_holder" title="Nariz">
     6.1 --- a/indra/newview/skins/ansastorm/xui/pl/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
     6.2 +++ b/indra/newview/skins/ansastorm/xui/pl/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
     6.3 @@ -27,7 +27,7 @@
     6.4  		</panel>
     6.5  		<panel name="shape_ears_tab_holder" title="Uszy">
     6.6  			<accordion name="shape_ears_accordion">
     6.7 -				<accordion_tab name="shape_head_tab" title="Uszy"/>
     6.8 +				<accordion_tab name="shape_ears_tab" title="Uszy"/>
     6.9  			</accordion>
    6.10  		</panel>
    6.11  		<panel name="shape_nose_tab_holder" title="Nos">
     7.1 --- a/indra/newview/skins/ansastorm/xui/ru/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
     7.2 +++ b/indra/newview/skins/ansastorm/xui/ru/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
     7.3 @@ -27,7 +27,7 @@
     7.4  		</panel>
     7.5  		<panel name="shape_ears_tab_holder" title="Уши">
     7.6  			<accordion name="shape_ears_accordion">
     7.7 -				<accordion_tab name="shape_head_tab" title="Уши"/>
     7.8 +				<accordion_tab name="shape_ears_tab" title="Уши"/>
     7.9  			</accordion>
    7.10  		</panel>
    7.11  		<panel name="shape_nose_tab_holder" title="Нос">
     8.1 --- a/indra/newview/skins/firestorm/xui/de/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
     8.2 +++ b/indra/newview/skins/firestorm/xui/de/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
     8.3 @@ -29,7 +29,7 @@
     8.4  		</panel>
     8.5  		<panel name="shape_ears_tab_holder" title="Ohren">
     8.6  			<accordion name="shape_ears_accordion">
     8.7 -				<accordion_tab name="shape_head_tab" title="Ohren"/>
     8.8 +				<accordion_tab name="shape_ears_tab" title="Ohren"/>
     8.9  			</accordion>
    8.10  		</panel>
    8.11  		<panel name="shape_nose_tab_holder" title="Nase">
     9.1 --- a/indra/newview/skins/firestorm/xui/en/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
     9.2 +++ b/indra/newview/skins/firestorm/xui/en/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
     9.3 @@ -180,7 +180,7 @@
     9.4        <accordion_tab
     9.5         layout="topleft"
     9.6         min_height="150"
     9.7 -       name="shape_head_tab"
     9.8 +       name="shape_ears_tab"
     9.9         fit_panel="false"
    9.10         title="Ears">
    9.11        <!-- Viewer will replace things here with tiled editing views -->
    10.1 --- a/indra/newview/skins/firestorm/xui/es/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
    10.2 +++ b/indra/newview/skins/firestorm/xui/es/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
    10.3 @@ -24,7 +24,7 @@
    10.4  		</panel>
    10.5  		<panel name="shape_ears_tab_holder" title="Orejas">
    10.6  			<accordion name="shape_ears_accordion">
    10.7 -				<accordion_tab name="shape_head_tab" title="Orejas"/>
    10.8 +				<accordion_tab name="shape_ears_tab" title="Orejas"/>
    10.9  			</accordion>
   10.10  		</panel>
   10.11  		<panel name="shape_nose_tab_holder" title="Nariz">
    11.1 --- a/indra/newview/skins/firestorm/xui/fr/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
    11.2 +++ b/indra/newview/skins/firestorm/xui/fr/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
    11.3 @@ -21,7 +21,7 @@
    11.4  		</panel>
    11.5  		<panel name="shape_ears_tab_holder" title="Oreilles">
    11.6  			<accordion name="shape_ears_accordion">
    11.7 -				<accordion_tab name="shape_head_tab" title="Oreilles"/>
    11.8 +				<accordion_tab name="shape_ears_tab" title="Oreilles"/>
    11.9  			</accordion>
   11.10  		</panel>
   11.11  		<panel name="shape_nose_tab_holder" title="Nez">
    12.1 --- a/indra/newview/skins/firestorm/xui/it/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
    12.2 +++ b/indra/newview/skins/firestorm/xui/it/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
    12.3 @@ -24,7 +24,7 @@
    12.4  		</panel>
    12.5  		<panel name="shape_ears_tab_holder" title="Orecchie">
    12.6  			<accordion name="shape_ears_accordion">
    12.7 -				<accordion_tab name="shape_head_tab" title="Orecchie"/>
    12.8 +				<accordion_tab name="shape_ears_tab" title="Orecchie"/>
    12.9  			</accordion>
   12.10  		</panel>
   12.11  		<panel name="shape_nose_tab_holder" title="Naso">
    13.1 --- a/indra/newview/skins/firestorm/xui/pl/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
    13.2 +++ b/indra/newview/skins/firestorm/xui/pl/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
    13.3 @@ -27,7 +27,7 @@
    13.4  		</panel>
    13.5  		<panel name="shape_ears_tab_holder" title="Uszy">
    13.6  			<accordion name="shape_ears_accordion">
    13.7 -				<accordion_tab name="shape_head_tab" title="Uszy"/>
    13.8 +				<accordion_tab name="shape_ears_tab" title="Uszy"/>
    13.9  			</accordion>
   13.10  		</panel>
   13.11  		<panel name="shape_nose_tab_holder" title="Nos">
    14.1 --- a/indra/newview/skins/firestorm/xui/ru/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
    14.2 +++ b/indra/newview/skins/firestorm/xui/ru/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
    14.3 @@ -27,7 +27,7 @@
    14.4  		</panel>
    14.5  		<panel name="shape_ears_tab_holder" title="Уши">
    14.6  			<accordion name="shape_ears_accordion">
    14.7 -				<accordion_tab name="shape_head_tab" title="Уши"/>
    14.8 +				<accordion_tab name="shape_ears_tab" title="Уши"/>
    14.9  			</accordion>
   14.10  		</panel>
   14.11  		<panel name="shape_nose_tab_holder" title="Нос">
    15.1 --- a/indra/newview/skins/vintage/xui/en/panel_edit_shape.xml	Wed Dec 06 11:32:28 2017 +0100
    15.2 +++ b/indra/newview/skins/vintage/xui/en/panel_edit_shape.xml	Wed Dec 06 15:28:30 2017 +0100
    15.3 @@ -180,7 +180,7 @@
    15.4        <accordion_tab
    15.5         layout="topleft"
    15.6         min_height="150"
    15.7 -       name="shape_head_tab"
    15.8 +       name="shape_ears_tab"
    15.9         fit_panel="false"
   15.10         title="Ears">
   15.11        <!-- Viewer will replace things here with tiled editing views -->

mercurial