diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
| commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
| tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/newview/llfloatertopobjects.h | |
| parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) | |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/newview/llfloatertopobjects.h')
| -rw-r--r-- | indra/newview/llfloatertopobjects.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h index 5b23e737d7..a6f07a6a34 100644 --- a/indra/newview/llfloatertopobjects.h +++ b/indra/newview/llfloatertopobjects.h @@ -72,8 +72,8 @@ private: static void onDisableAll(void* data); static void onDisableSelected(void* data); - static void callbackReturnAll(S32 option, void* userdata); - static void callbackDisableAll(S32 option, void* userdata); + static bool callbackReturnAll(const LLSD& notification, const LLSD& response); + static bool callbackDisableAll(const LLSD& notification, const LLSD& response); static void onGetByOwnerName(LLUICtrl* ctrl, void* data); static void onGetByObjectName(LLUICtrl* ctrl, void* data); |