diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-06 17:23:08 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-06 17:23:08 +0200 |
| commit | 3a7e3c4328684f9f52f14f7d4cb13ecf5d803ff4 (patch) | |
| tree | 61320af8ba979cec97b53c1b76ce96a2769d064f /indra/llui | |
| parent | 6ee29d8c2a2b7a47f62d7a391106084e704cd544 (diff) | |
| parent | fc785febb332442533c20b638132b8ab378732a9 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llflatlistview.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/lllayoutstack.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index 3754d155cf..9cfc67af14 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -906,7 +906,8 @@ void LLFlatListView::notifyParentItemsRectChanged() params["width"] = req_rect.getWidth(); params["height"] = req_rect.getHeight(); - getParent()->notifyParent(params); + if (getParent()) // dummy widgets don't have a parent + getParent()->notifyParent(params); } void LLFlatListView::setNoItemsCommentVisible(bool visible) const diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index cde383b047..aba35773ee 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -91,6 +91,9 @@ public: bool getPanelMinSize(const std::string& panel_name, S32* min_widthp, S32* min_heightp); void updateLayout(BOOL force_resize = FALSE); + + S32 getPanelSpacing() const { return mPanelSpacing; } + static void updateClass(); protected: |