diff options
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 806d1f57d6..b3a1fcb7ca 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -65,7 +65,7 @@ class LLFloaterRegionInfo : public LLFloater, public LLFloaterSingleton<LLFloate public: ~LLFloaterRegionInfo(); - /*virtual*/ void onOpen(); + /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ BOOL postBuild(); static void processEstateOwnerRequest(LLMessageSystem* msg, void**); @@ -84,7 +84,7 @@ public: // from LLPanel virtual void refresh(); - static void requestRegionInfo(); + void requestRegionInfo(); protected: LLFloaterRegionInfo(const LLSD& seed); @@ -103,7 +103,8 @@ protected: class LLPanelRegionInfo : public LLPanel { public: - LLPanelRegionInfo() : LLPanel(std::string("Region Info Panel")) {} + LLPanelRegionInfo(); + static void onBtnSet(void* user_data); static void onChangeChildCtrl(LLUICtrl* ctrl, void* user_data); static void onChangeAnything(LLUICtrl* ctrl, void* user_data); @@ -261,7 +262,7 @@ public: static void onClickAddAllowedAgent(void* user_data); static void onClickRemoveAllowedAgent(void* user_data); - static void onClickAddAllowedGroup(void* user_data); + void onClickAddAllowedGroup(); static void onClickRemoveAllowedGroup(void* user_data); static void onClickAddBannedAgent(void* user_data); static void onClickRemoveBannedAgent(void* user_data); @@ -271,7 +272,7 @@ public: // Group picker callback is different, can't use core methods below bool addAllowedGroup(const LLSD& notification, const LLSD& response); - static void addAllowedGroup2(LLUUID id, void* data); + void addAllowedGroup2(LLUUID id); // Core methods for all above add/remove button clicks static void accessAddCore(U32 operation_flag, const std::string& dialog_name); @@ -339,8 +340,7 @@ public: const LLUUID& id, const std::string& first, const std::string& last, - BOOL is_group, - void*); + BOOL is_group); protected: virtual BOOL sendUpdate(); |