summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-12-08 10:00:32 -0800
committerPalmer <palmer@lindenlab.com>2009-12-08 10:00:32 -0800
commit74f2cb2a70ddad7fe8819fd6855831e0615dc8d5 (patch)
tree61f2ce7a6cfb5963b7517a582164047a6833757b /indra/llui/llview.cpp
parentcd138869d5bfcf40d3d13d7b887e36263e2919d9 (diff)
parente07ef0d0e0e8cbd58afd4c6ee970634bd2f783e7 (diff)
Grabbed more viewer 2 changes that should fix parabuild problem
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r--indra/llui/llview.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 6f8455774d..8917e4b813 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -2850,18 +2850,21 @@ LLView::default_widget_map_t& LLView::getDefaultWidgetMap() const
return *mDefaultWidgets;
}
-void LLView::notifyParent(const LLSD& info)
+S32 LLView::notifyParent(const LLSD& info)
{
LLView* parent = getParent();
if(parent)
- parent->notifyParent(info);
+ return parent->notifyParent(info);
+ return 0;
}
-void LLView::notifyChildren(const LLSD& info)
+bool LLView::notifyChildren(const LLSD& info)
{
+ bool ret = false;
for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
{
- (*child_it)->notifyChildren(info);
+ ret |= (*child_it)->notifyChildren(info);
}
+ return ret;
}
// convenient accessor for draw context