summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-13 18:28:20 -0800
committerrichard <none@none>2009-11-13 18:28:20 -0800
commit4c4f329acb7792e4713b7e38bd437b9a7d239ec5 (patch)
treecf15c27f8e66a3dfc95644a8673dead729e040d8 /indra/llui
parent890da1d3914ffb52d0899c333fe8b8c280fe4d34 (diff)
parentf4fdaa8ee9d8016ca23957e78fe246206579723f (diff)
merge
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lllayoutstack.h5
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);