SL-19795 fix inventory list offset

3 files changed, 8 insertions, 3 deletions

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index f3241c6e5e..52cf2f1d54 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -258,6 +258,8 @@ BOOL LLPanelMainInventory::postBuild()
     mListViewPanel = getChild<LLPanel>("single_folder_inventory");
     mGalleryViewPanel = getChild<LLPanel>("gallery_view_inventory");
     mCombinationViewPanel = getChild<LLPanel>("combination_view_inventory");
+    mCombinationGalleryLayoutPanel = getChild<LLLayoutPanel>("comb_gallery_layout");
+    mCombinationListLayoutPanel = getChild<LLLayoutPanel>("comb_inventory_layout");
 
     mSingleFolderPanelInventory = getChild<LLInventorySingleFolderPanel>("single_folder_inv");
     mListViewRootUpdatedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
@@ -2306,8 +2308,8 @@ void LLPanelMainInventory::updateCombinationVisibility()
     {
         bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
         bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty || mForceShowInvLayout;
-        getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
-        getChild<LLLayoutPanel>("comb_inventory_layout")->setVisible(show_inv_pane);
+        mCombinationGalleryLayoutPanel->setVisible(!is_gallery_empty);
+        mCombinationListLayoutPanel->setVisible(show_inv_pane);
         mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
         if(mCombinationInventoryPanel->hasVisibleItems())
         {
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index cc36385e90..daf7cf5ad3 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -210,6 +210,8 @@ private:
     LLInventorySingleFolderPanel* mCombinationInventoryPanel;
     LLInventoryGallery* mCombinationGalleryPanel;
     LLPanel* mCombinationViewPanel;
+    LLPanel* mCombinationGalleryLayoutPanel;
+    LLPanel* mCombinationListLayoutPanel;
 
     boost::signals2::connection mListViewRootUpdatedConnection;
     boost::signals2::connection mGalleryRootUpdatedConnection;
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 1a9816247b..b3ca712aee 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -339,6 +339,7 @@
      width="312">
      <layout_stack
       follows="all"
+      layout="topleft"
       height="372"
       width="312"
       animate="false"
@@ -364,7 +365,7 @@
          class="inventory_gallery"
          filename="panel_inventory_gallery.xml"
          left="0"
-         top_pad="0"
+         top="1"
          height="246"
          width="312"
          name="comb_gallery_view_inv"