diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-13 19:26:20 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-13 19:26:20 -0500 |
| commit | 3194c89177e75db524c2c4e09cd40f239426a774 (patch) | |
| tree | 6b042ef3c8a9e983659d128296aeeedefa62fefd /indra/llui/lllayoutstack.h | |
| parent | 4bb5cd169b297efbcf1bdb58a45be24932cf8241 (diff) | |
| parent | c5732c824fcde73953cfdf971ba35a88abd54d0c (diff) | |
Merging viewer2 changes into avp branch
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llui/lllayoutstack.h')
| -rw-r--r-- | indra/llui/lllayoutstack.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index 3a073fa1b2..9cbcb285dc 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -81,8 +81,8 @@ public: S32 getNumPanels() { return mPanels.size(); } void updatePanelAutoResize(const std::string& panel_name, BOOL auto_resize); - - + + void updateLayout(BOOL force_resize = FALSE); static void updateClass(); protected: @@ -92,7 +92,6 @@ protected: private: struct LayoutPanel; - void updateLayout(BOOL force_resize = FALSE); void calcMinExtents(); S32 getDefaultHeight(S32 cur_height); S32 getDefaultWidth(S32 cur_width); |