Backed out changeset a62bf7c0af21

Backing out this merge that I pushed (prematurely) to the wrong place.

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index 2393c74c45..342ce535fe 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -256,19 +256,19 @@ public:
 	void onChangeFixedSun();
 	void onChangeUseGlobalTime();
 	
-	void onClickEditSky();
-	void onClickEditSkyHelp();	
-	void onClickEditDayCycle();
-	void onClickEditDayCycleHelp();
-
-	void onClickAddAllowedAgent();
-	void onClickRemoveAllowedAgent();
-	void onClickAddAllowedGroup();
-	void onClickRemoveAllowedGroup();
-	void onClickAddBannedAgent();
-	void onClickRemoveBannedAgent();
-	void onClickAddEstateManager();
-	void onClickRemoveEstateManager();
+	static void onClickEditSky(void* userdata);
+	static void onClickEditSkyHelp(void* userdata);	
+	static void onClickEditDayCycle(void* userdata);
+	static void onClickEditDayCycleHelp(void* userdata);	
+
+	static void onClickAddAllowedAgent(void* user_data);
+	static void onClickRemoveAllowedAgent(void* user_data);
+		   void onClickAddAllowedGroup();
+	static void onClickRemoveAllowedGroup(void* user_data);
+	static void onClickAddBannedAgent(void* user_data);
+	static void onClickRemoveBannedAgent(void* user_data);
+	static void onClickAddEstateManager(void* user_data);
+	static void onClickRemoveEstateManager(void* user_data);
 	void onClickKickUser();
 
 	// Group picker callback is different, can't use core methods below