diff --git a/indra/newview/app_settings/settings_alchemy.xml b/indra/newview/app_settings/settings_alchemy.xml index 85f657b29891c747d7c54c6a5694b81f8154e49f..27e7738dd3e923918f0e5f0c3f288c25a0712f70 100644 --- a/indra/newview/app_settings/settings_alchemy.xml +++ b/indra/newview/app_settings/settings_alchemy.xml @@ -2,6 +2,17 @@ <llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd"> <map> + <key>AlchemyAppearanceShowHints</key> + <map> + <key>Comment</key> + <string>Show visual param hints in appearance editors.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>AlchemyLinuxVoiceVariant</key> <map> <key>Comment</key> diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 280e41c3480da1bff95b012e52a674539e7813a4..6d431d64a405cdea7838f3cc5b1da7f95f519e4f 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -1518,6 +1518,7 @@ 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) { + BOOL show_hints = gSavedSettings.getBOOL("AlchemyAppearanceShowHints"); // sorted_params is sorted according to magnitude of effect from // least to greatest. Adding to the front of the child list // reverses that order. @@ -1531,7 +1532,7 @@ 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. + if (!show_hints || (wearable && wearable->getType() == LLWearableType::WT_PHYSICS)) // Hack to show a different panel for physics. Should generalize this later. { panel_param = new LLScrollingPanelParamBase( p, NULL, (*it).second, TRUE, this->getWearable(), jointp); } diff --git a/indra/newview/skins/default/xui/en/panel_preferences_interface.xml b/indra/newview/skins/default/xui/en/panel_preferences_interface.xml index 4335551ce82d050d603417243d641b93aebec3a3..77f86489bbe56b6729bd2f9f2e1507b1444b3ee6 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_interface.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_interface.xml @@ -112,7 +112,7 @@ layout="topleft" left="45" name="HideHoverTextInCinematicMode" - top_pad="7" + top_pad="4" width="256"> <check_box.commit_callback function="Pref.RenderOptionUpdate" /> @@ -139,7 +139,7 @@ layout="topleft" left="45" name="DoubleClickAttachmentAddCheck" - top_pad="7" + top_pad="4" width="256"/> <check_box control_name="DoubleClickWearableAdd" @@ -151,6 +151,31 @@ name="DoubleClickWearableAddCheck" top_pad="4" width="256"/> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="Appearance Editor" + mouse_opaque="false" + top_pad="5" + width="300" + font="SansSerifSmall"> + Appearance Editor: + </text> + <check_box + follows="left|top" + height="16" + label="Show visual hints in wearable editors" + layout="topleft" + tool_tip="Enable or disable the visual hints showing the avatar parts being modified." + left="45" + top_pad="4" + name="AlchemyAppearanceShowHints" + width="275" + control_name="AlchemyAppearanceShowHints"/> <text type="string" length="1" @@ -170,7 +195,7 @@ height="16" label="Block left-click sitting on Objects" left="45" - top_pad="7" + top_pad="4" name="AlchemyDisableClickToSit" width="275" control_name="AlchemyDisableClickToSit"/> @@ -255,7 +280,7 @@ layout="topleft" tool_tip="If enabled scripted objects display swirling particle lights when the scripts communicate" left="45" - top_pad="7" + top_pad="4" name="EffectScriptChatParticles" width="275" control_name="EffectScriptChatParticles"/>