From 21d5410d1ad607fd4e173b15c9cedaf04668817e Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Tue, 5 Jan 2010 19:32:25 +0200 Subject: Fixed potential crash if LLFlatListView is created as a dummy widget. --HG-- branch : product-engine --- indra/llui/llflatlistview.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llui') 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 -- cgit v1.2.3 From 4a870a0887d0479c18a019a291b4b557a607fd9b Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Tue, 5 Jan 2010 14:33:27 -0800 Subject: =?UTF-8?q?EXT-3649=20EXT-3662=20:=20Move=20media=20controls=20to?= =?UTF-8?q?=20above=20media=20face=20Review=20#69=20This=20changes=20where?= =?UTF-8?q?=20and=20how=20the=20media=20controls=20are=20laid=20out,=20and?= =?UTF-8?q?=20ensures=20that=20all=20of=20the=20media=20region=20(the=20fa?= =?UTF-8?q?ce)=20is=20clickable.=20Also=20moved=20the=20volume=20slider=20?= =?UTF-8?q?to=20below=20the=20controls=20(this=20took=20WAY=20too=20long?= =?UTF-8?q?=20to=20do=20=E2=80=8B:(=20=E2=80=8B),=20and=20adjusted=20the?= =?UTF-8?q?=20window=20region=20in=20which=20the=20media=20controls=20are?= =?UTF-8?q?=20allowed=20to=20be=20displayed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/llui/lllayoutstack.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/llui') 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: -- cgit v1.2.3