diff options
| author | Ansariel Hiller <Ansariel@users.noreply.github.com> | 2024-10-02 22:51:10 +0200 |
|---|---|---|
| committer | Ansariel <ansariel.hiller@phoenixviewer.com> | 2025-04-18 01:45:11 +0200 |
| commit | 9c3ce3dec7ad01620213079204d0a43d193bbfb9 (patch) | |
| tree | 8a5831e13a09792cae6a383c7164654ed9b828dc /indra/llui/lllayoutstack.h | |
| parent | c7ebde4ec9d3909c3c2f6503dc9096406297f26d (diff) | |
Clean up LLUI and fix/add suggestions from VS (#2746)
# Conflicts:
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowsdl.cpp
Diffstat (limited to 'indra/llui/lllayoutstack.h')
| -rw-r--r-- | indra/llui/lllayoutstack.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index 8459921c60..9e3536aaff 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -75,9 +75,6 @@ public: /*virtual*/ bool addChild(LLView* child, S32 tab_group = 0); /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); - - static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL); - typedef enum e_animate { NO_ANIMATE, @@ -86,7 +83,7 @@ public: void addPanel(LLLayoutPanel* panel, EAnimate animate = NO_ANIMATE); void collapsePanel(LLPanel* panel, bool collapsed = true); - S32 getNumPanels() { return static_cast<S32>(mPanels.size()); } + S32 getNumPanels() const { return static_cast<S32>(mPanels.size()); } void updateLayout(); @@ -190,7 +187,6 @@ public: bool isCollapsed() const { return mCollapsed;} void setOrientation(LLView::EOrientation orientation); - void storeOriginalDim(); void setIgnoreReshape(bool ignore) { mIgnoreReshape = ignore; } |