summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprofile.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-08 16:20:25 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-08 16:20:25 -0500
commit45b24808657dddfb2a605186416409b453f149e7 (patch)
tree298c49cfd6fb4f645a3a776a75b9bb64601bf9c3 /indra/newview/llpanelprofile.cpp
parent7ce49586881fd078ea8bceeab558b4a156b30f63 (diff)
parent37848d29d9030e00086c3a499d28237cdf943e1b (diff)
merge
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
-rw-r--r--indra/newview/llpanelprofile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 1830d00f68..3274820174 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -220,15 +220,15 @@ void LLPanelProfile::openPanel(LLPanel* panel, const LLSD& params)
panel->setRect(new_rect);
}
-void LLPanelProfile::notifyParent(const LLSD& info)
+S32 LLPanelProfile::notifyParent(const LLSD& info)
{
std::string action = info["action"];
// lets update Picks list after Pick was saved
if("save_new_pick" == action)
{
onOpen(info);
- return;
+ return 1;
}
- LLPanel::notifyParent(info);
+ return LLPanel::notifyParent(info);
}