diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-13 15:11:10 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-13 15:11:10 -0800 |
| commit | 4ca8b32bceab308411c9ea13552338e9cccd70f4 (patch) | |
| tree | e5ae240f581ff7d70a1bef79f0f1553e49cb74e3 /indra/llui | |
| parent | 6cb4b27897462582428e9d469feb6bf8c9335b06 (diff) | |
| parent | a4addf39e5293e008b534c9c1cfcad14956afe1a (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui')
| -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); |