summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelmaininventory.cpp1
-rw-r--r--indra/newview/skins/default/xui/en/panel_main_inventory.xml18
2 files changed, 8 insertions, 11 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 18f80d5d55..dfcfc94cea 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2194,7 +2194,6 @@ void LLPanelMainInventory::updateCombinationVisibility()
{
bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
- getChild<LLView>("border")->setVisible(!is_gallery_empty);
if(is_gallery_empty)
{
mCombinationGalleryPanel->handleModifiedFilter();
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 6eb1cf0498..551e9835df 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -342,6 +342,13 @@
height="372"
width="312"
animate="false"
+ drag_handle_gap="13"
+ drag_handle_thickness="6"
+ drag_handle_first_indent="18"
+ drag_handle_second_indent="18"
+ drag_handle_color="AddPaymentPanel"
+ drag_handle_shift="5"
+ show_drag_handle="true"
top="0"
left="0"
orientation="vertical">
@@ -359,22 +366,13 @@
filename="panel_inventory_gallery.xml"
left="0"
top_pad="0"
- height="178"
+ height="186"
width="312"
name="comb_gallery_view_inv"
background_visible="true"
follows="all"
layout="topleft">
</panel>
- <view_border
- bevel_style="none"
- height="0"
- follows="left|bottom|right"
- layout="topleft"
- left="6"
- name="border"
- top_pad="8"
- width="300"/>
</layout_panel>
<layout_panel
border="false"