diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-12-22 15:37:31 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-12-22 15:37:31 -0500 |
| commit | 53698d5c10a868abd883a0a4b4222d2e2d4bab96 (patch) | |
| tree | 9a4c50e17c4d8e0de094c4352ec9df5944240c02 /indra/llui | |
| parent | 616ca198143e7cc3f925add2c3b83aaf5d2fe244 (diff) | |
| parent | 0a98034641267ea57360fdd369acb8b94ff9bc20 (diff) | |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 10 | ||||
| -rw-r--r-- | indra/llui/lllayoutstack.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 7d8c102750..1aaba88c49 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -414,6 +414,16 @@ void LLLayoutStack::updatePanelAutoResize(const std::string& panel_name, BOOL au } } +void LLLayoutStack::setPanelUserResize(const std::string& panel_name, BOOL user_resize) +{ + LayoutPanel* panel = findEmbeddedPanelByName(panel_name); + + if (panel) + { + panel->mUserResize = user_resize; + } +} + bool LLLayoutStack::getPanelMinSize(const std::string& panel_name, S32* min_widthp, S32* min_heightp) { LayoutPanel* panel = findEmbeddedPanelByName(panel_name); diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index c1af428674..cde383b047 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -80,6 +80,7 @@ public: S32 getNumPanels() { return mPanels.size(); } void updatePanelAutoResize(const std::string& panel_name, BOOL auto_resize); + void setPanelUserResize(const std::string& panel_name, BOOL user_resize); /** * Gets minimal width and/or height of the specified by name panel. |