diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-26 22:28:18 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 14:48:03 +0300 |
| commit | 2532a2ee9ee9003e2c6b72f8da19979a9e3dd2f6 (patch) | |
| tree | 73205ed8bedfc5855082205ee5334d7e06f45d80 /indra/newview/skins | |
| parent | 4ae2165c4516a74012d30610b4c53de6d3ccaf90 (diff) | |
SL-6109 Conflict resolution
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_controls.xml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml index 0c652845f0..ac4be34be2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml @@ -274,10 +274,6 @@ label="Sitting" name="sitting" value="4"/> - <combo_box.item - label="General" - name="general" - value="5"/> </combo_box> <button @@ -301,6 +297,7 @@ right="-3" can_sort="false" multi_select="false" + bg_selected_color="Transparent" name="controls_list"> <scroll_list.columns relative_width="0.34" |