summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-05-02 23:07:46 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-05-03 00:42:51 +0300
commit171b8dbeb32e49d43f40189ae55df05693804fbf (patch)
tree6847ed2651c0bd56d01d94a500b0033204d6d6f3 /indra/newview/llpanelmaininventory.h
parentade8c96e5c68f672d33802f4a82ce46ccffd7816 (diff)
SL-19583 Fix rename's width and update frequency
This way of calculating scroll turns out to be one large hack. Probably needs a proper combination view instead of combining two different views that have own scrolls or those views need to support not having personal scroll.
Diffstat (limited to 'indra/newview/llpanelmaininventory.h')
-rw-r--r--indra/newview/llpanelmaininventory.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 8e7ad776b0..4f792878a5 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -83,8 +83,9 @@ public:
EAcceptance* accept,
std::string& tooltip_msg);
/*virtual*/ void changed(U32);
+ /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
/*virtual*/ void draw();
- /*virtual*/ void onVisibilityChange ( BOOL new_visibility );
+ /*virtual*/ void onVisibilityChange ( BOOL new_visibility );
LLInventoryPanel* getPanel() { return mActivePanel; }
LLInventoryPanel* getActivePanel() { return mActivePanel; }
@@ -192,6 +193,7 @@ private:
LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
LLInventoryGallery* mInventoryGalleryPanel;
+ LLUICtrl* mCombinationScrollPanel;
LLInventorySingleFolderPanel* mCombinationInventoryPanel;
LLInventoryGallery* mCombinationGalleryPanel;
LLView* mCombinationScroller;
@@ -232,6 +234,7 @@ private:
bool mNeedUploadCost;
bool mForceShowInvLayout;
+ bool mCombinationShapeDirty;
// List Commands //
////////////////////////////////////////////////////////////////////////////////
};