FIRE-21936: Option to disable visual hints for appearance editor Firestorm_5.0.11

Mon, 18 Dec 2017 15:11:47 +0100

author
Ansariel
date
Mon, 18 Dec 2017 15:11:47 +0100
branch
Firestorm_5.0.11
changeset 53580
1ccfdab73dc3
parent 53579
01185fe23ddf
child 53581
9d71aa48a544

FIRE-21936: Option to disable visual hints for appearance editor

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/llpaneleditwearable.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/de/panel_preferences_move.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/panel_preferences_move.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Mon Dec 18 13:28:32 2017 +0100
     1.2 +++ b/indra/newview/app_settings/settings.xml	Mon Dec 18 15:11:47 2017 +0100
     1.3 @@ -24500,6 +24500,17 @@
     1.4        <key>Value</key>
     1.5        <integer>0</integer>
     1.6      </map>
     1.7 +    <key>FSAppearanceShowHints</key>
     1.8 +    <map>
     1.9 +      <key>Comment</key>
    1.10 +      <string>If enabled, show visual hints (avatar images) in appearance editor</string>
    1.11 +      <key>Persist</key>
    1.12 +      <integer>1</integer>
    1.13 +      <key>Type</key>
    1.14 +      <string>Boolean</string>
    1.15 +      <key>Value</key>
    1.16 +      <integer>1</integer>
    1.17 +    </map>
    1.18    </map>
    1.19  </llsd>
    1.20  
     2.1 --- a/indra/newview/llpaneleditwearable.cpp	Mon Dec 18 13:28:32 2017 +0100
     2.2 +++ b/indra/newview/llpaneleditwearable.cpp	Mon Dec 18 15:11:47 2017 +0100
     2.3 @@ -1634,6 +1634,9 @@
     2.4  
     2.5  void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab, LLJoint* jointp)
     2.6  {
     2.7 +        // <FS:Ansariel> FIRE-21936: Option to disable visual hints for appearance editor
     2.8 +        BOOL show_hints = gSavedSettings.getBOOL("FSAppearanceShowHints");
     2.9 +
    2.10          // sorted_params is sorted according to magnitude of effect from
    2.11          // least to greatest.  Adding to the front of the child list
    2.12          // reverses that order.
    2.13 @@ -1647,7 +1650,10 @@
    2.14                          p.name("LLScrollingPanelParam");
    2.15                          LLViewerWearable *wearable = this->getWearable();
    2.16                          LLScrollingPanelParamBase *panel_param = NULL;
    2.17 -                        if (wearable && wearable->getType() == LLWearableType::WT_PHYSICS) // Hack to show a different panel for physics.  Should generalize this later.
    2.18 +                        // <FS:Ansariel> FIRE-21936: Option to disable visual hints for appearance editor
    2.19 +                        //if (wearable && wearable->getType() == LLWearableType::WT_PHYSICS) // Hack to show a different panel for physics.  Should generalize this later.
    2.20 +                        if (!show_hints || (wearable && wearable->getType() == LLWearableType::WT_PHYSICS)) // Hack to show a different panel for physics.  Should generalize this later.
    2.21 +                        // </FS:Ansariel>
    2.22                          {
    2.23                                  panel_param = new LLScrollingPanelParamBase( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
    2.24                          }
     3.1 --- a/indra/newview/skins/default/xui/de/panel_preferences_move.xml	Mon Dec 18 13:28:32 2017 +0100
     3.2 +++ b/indra/newview/skins/default/xui/de/panel_preferences_move.xml	Mon Dec 18 15:11:47 2017 +0100
     3.3 @@ -14,7 +14,8 @@
     3.4  			</text>
     3.5  			<check_box label="Bauen/Bearbeiten" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/>
     3.6  			<check_box label="Aussehen" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/>
     3.7 -			<check_box label="Zusätzliche Beleuchtung aktivieren" name="EditAppearanceLighting" tool_tip="Aktiviert die zusätzliche Beleuchtung, wenn die Form des Avatars bearbeitet wird."/>
     3.8 +			<check_box label="Zusätzliche Beleuchtung" name="EditAppearanceLighting" tool_tip="Aktiviert die zusätzliche Beleuchtung, wenn die Form des Avatars bearbeitet wird."/>
     3.9 +			<check_box label="Visuelle Hilfen" name="FSAppearanceShowHints" tool_tip="Aktiviert die visuellen Hilfen, die die Teile des Avatars anzeigen, die modifiziert werden."/>
    3.10  			<check_box label="Klick auf Avatar hält Kameraposition" name="clickonavatarkeepscamera" tool_tip="Normalerweise wird die Kameraposition beim Anklicken des Avatars zurückgesetzt. Diese Option verhindert dieses Verhalten."/>
    3.11  			<check_box label="Kameraposition nach Teleport zurücksetzen (innerhalb einer Region)" name="FSResetCameraOnTP" tool_tip="Normalerweise wird die Kameraposition beim Teleportieren zurückgesetzt. Diese Option verhindert dieses Verhalten."/>
    3.12  			<check_box label="Kameraposition bei Avatarbewegung zurücksetzen" name="FSResetCameraOnMovement"/>
     4.1 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml	Mon Dec 18 13:28:32 2017 +0100
     4.2 +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml	Mon Dec 18 15:11:47 2017 +0100
     4.3 @@ -148,7 +148,7 @@
     4.4           follows="left|top"
     4.5           label="Build/Edit"
     4.6           layout="topleft"
     4.7 -         left_delta="30"
     4.8 +         left_delta="10"
     4.9           name="edit_camera_movement"
    4.10           tool_tip="Use automatic camera positioning when entering and exiting edit mode"
    4.11           width="280"
    4.12 @@ -172,6 +172,16 @@
    4.13           name="EditAppearanceLighting"
    4.14           tool_tip="Enable or disable the additional lighting used while editing avatar appearance."
    4.15           width="150" />
    4.16 +        <check_box
    4.17 +         control_name="FSAppearanceShowHints"
    4.18 +         follows="left|top"
    4.19 +         height="16"
    4.20 +         label="Show Visual Hints"
    4.21 +         layout="topleft"
    4.22 +         left_pad="10"
    4.23 +         name="FSAppearanceShowHints"
    4.24 +         tool_tip="Enable or disable the visual hints showing the avatar parts being modified."
    4.25 +         width="150" />
    4.26  
    4.27          <check_box
    4.28           top_pad="10"
     5.1 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml	Mon Dec 18 13:28:32 2017 +0100
     5.2 +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml	Mon Dec 18 15:11:47 2017 +0100
     5.3 @@ -9,7 +9,7 @@
     5.4       can_edit_text="true"
     5.5       decimal_digits="0"
     5.6       enabled="false"
     5.7 -     height="12"
     5.8 +     height="16"
     5.9       increment="1"
    5.10       initial_value="0"
    5.11       label="[DESC]"

mercurial