summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorsimon <none@none>2013-12-13 10:01:43 -0800
committersimon <none@none>2013-12-13 10:01:43 -0800
commit6f34508aa9408266bfde366aa4e0cb6518ed45b8 (patch)
tree8d9b160ddc5fa82866507a746673c6c5d5825154 /indra/llui
parent99de75c225b5c74478e7a1b5a761924ef2e51f66 (diff)
parent2a1098552e071c625a8c1614a331e9557212d380 (diff)
Merge downstream code
Diffstat (limited to 'indra/llui')
-rwxr-xr-xindra/llui/llfloater.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index c1f8a077b5..acf38afe32 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1951,6 +1951,7 @@ void LLFloater::drawShadow(LLPanel* panel)
void LLFloater::updateTransparency(LLView* view, ETypeTransparency transparency_type)
{
+ if (!view) return;
child_list_t children = *view->getChildList();
child_list_t::iterator it = children.begin();