livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Ansariel 2017-12-18 15:11:47 +01:00
parent 3a534140b8
commit 457ebc6c2a
5 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -24500,6 +24500,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSAppearanceShowHints</key>
<map>
<key>Comment</key>
<string>If enabled, show visual hints (avatar images) in appearance editor</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

8
indra/newview/llpaneleditwearable.cpp
View File

@ -1634,6 +1634,9 @@ void LLPanelEditWearable::getSortedParams(value_map_t &sorted_params, const std:
void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab, LLJoint* jointp)
{
// <FS:Ansariel> FIRE-21936: Option to disable visual hints for appearance editor
BOOL show_hints = gSavedSettings.getBOOL("FSAppearanceShowHints");
// sorted_params is sorted according to magnitude of effect from
// least to greatest. Adding to the front of the child list
// reverses that order.
@ -1647,7 +1650,10 @@ void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value
p.name("LLScrollingPanelParam");
LLViewerWearable *wearable = this->getWearable();
LLScrollingPanelParamBase *panel_param = NULL;
if (wearable && wearable->getType() == LLWearableType::WT_PHYSICS) // Hack to show a different panel for physics. Should generalize this later.
// <FS:Ansariel> FIRE-21936: Option to disable visual hints for appearance editor
//if (wearable && wearable->getType() == LLWearableType::WT_PHYSICS) // Hack to show a different panel for physics. Should generalize this later.
if (!show_hints || (wearable && wearable->getType() == LLWearableType::WT_PHYSICS)) // Hack to show a different panel for physics. Should generalize this later.
// </FS:Ansariel>
{
panel_param = new LLScrollingPanelParamBase( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
}

3
indra/newview/skins/default/xui/de/panel_preferences_move.xml
View File

@ -14,7 +14,8 @@
</text>
<check_box label="Bauen/Bearbeiten" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/>
<check_box label="Aussehen" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/>
<check_box label="Zusätzliche Beleuchtung aktivieren" name="EditAppearanceLighting" tool_tip="Aktiviert die zusätzliche Beleuchtung, wenn die Form des Avatars bearbeitet wird."/>
<check_box label="Zusätzliche Beleuchtung" name="EditAppearanceLighting" tool_tip="Aktiviert die zusätzliche Beleuchtung, wenn die Form des Avatars bearbeitet wird."/>
<check_box label="Visuelle Hilfen" name="FSAppearanceShowHints" tool_tip="Aktiviert die visuellen Hilfen, die die Teile des Avatars anzeigen, die modifiziert werden."/>
<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."/>
<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."/>
<check_box label="Kameraposition bei Avatarbewegung zurücksetzen" name="FSResetCameraOnMovement"/>

12
indra/newview/skins/default/xui/en/panel_preferences_move.xml
View File

@ -148,7 +148,7 @@
follows="left|top"
label="Build/Edit"
layout="topleft"
left_delta="30"
left_delta="10"
name="edit_camera_movement"
tool_tip="Use automatic camera positioning when entering and exiting edit mode"
width="280"
@ -172,6 +172,16 @@
name="EditAppearanceLighting"
tool_tip="Enable or disable the additional lighting used while editing avatar appearance."
width="150" />
<check_box
control_name="FSAppearanceShowHints"
follows="left|top"
height="16"
label="Show Visual Hints"
layout="topleft"
left_pad="10"
name="FSAppearanceShowHints"
tool_tip="Enable or disable the visual hints showing the avatar parts being modified."
width="150" />
<check_box
top_pad="10"

2
indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
View File

@ -9,7 +9,7 @@
can_edit_text="true"
decimal_digits="0"
enabled="false"
height="12"
height="16"
increment="1"
initial_value="0"
label="[DESC]"