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/llpanelgrouproles.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/llpanelgrouproles.h')
| -rw-r--r-- | indra/newview/llpanelgrouproles.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h index f55d70f018..592e585f9e 100644 --- a/indra/newview/llpanelgrouproles.h +++ b/indra/newview/llpanelgrouproles.h @@ -73,9 +73,8 @@ public: void transitionToTab(); // Used by attemptTransition to query the user's response to a tab that needs to apply. - static void onNotifyCallback(S32 option, void* user_data); - void handleNotifyCallback(S32 option); - static void onModalClose(S32 option, void* user_data); + bool handleNotifyCallback(const LLSD& notification, const LLSD& response); + bool onModalClose(const LLSD& notification, const LLSD& response); // Most of these messages are just passed on to the current sub-tab. virtual std::string getHelpText() const; @@ -188,7 +187,7 @@ public: LLRoleMemberChangeType type); void applyMemberChanges(); - static void addOwnerCB(S32 option, void* data); + bool addOwnerCB(const LLSD& notification, const LLSD& response); virtual void activate(); virtual void deactivate(); @@ -250,7 +249,7 @@ public: static void onActionCheck(LLUICtrl*, void*); void handleActionCheck(LLCheckBoxCtrl*, bool force=false); - static void addActionCB(S32 option, void* data); + bool addActionCB(const LLSD& notification, const LLSD& response, LLCheckBoxCtrl* check); static void onPropertiesKey(LLLineEditor*, void*); |