Second Life viewer sources 1.23.0-RC

1 files changed, 5 insertions, 5 deletions

diff --git a/linden/indra/newview/llpanelgroupgeneral.h b/linden/indra/newview/llpanelgroupgeneral.h
index f06a46e..7135667 100644
--- a/linden/indra/newview/llpanelgroupgeneral.h
+++ b/linden/indra/newview/llpanelgroupgeneral.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -57,8 +58,7 @@ public:
         virtual bool needsApply(std::string& mesg);
         virtual bool apply(std::string& mesg);
         virtual void cancel();
-        static void createGroupCallback(S32 option, void* user_data);
-        static void callbackConfirmMatureApply(S32 option, void* data);
+        bool createGroupCallback(const LLSD& notification, const LLSD& response);
         
         virtual void update(LLGroupChange gc);
         
@@ -77,11 +77,11 @@ private:
         static void onReceiveNotices(LLUICtrl* ctrl, void* data);
         static void openProfile(void* data);
 
-    static void joinDlgCB(S32 which, void *userdata);
+    static bool joinDlgCB(const LLSD& notification, const LLSD& response);
 
         void updateMembers();
         void updateChanged();
-        void confirmMatureApply(S32 option);
+        bool confirmMatureApply(const LLSD& notification, const LLSD& response);
 
         BOOL                    mPendingMemberUpdate;
         BOOL                    mChanged;