1 files changed, 8 insertions, 74 deletions
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index d8b7ecf..9be813f 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -112,7 +112,6 @@ protected:
        LLPanelLandOptions*             mPanelOptions;
        LLPanelLandMedia*               mPanelMedia;
        LLPanelLandAccess*              mPanelAccess;
-        LLPanelLandBan*                 mPanelBan;
        LLPanelLandCovenant*    mPanelCovenant;
        LLHandle<LLParcelSelection>     mParcel;
@@ -392,93 +391,28 @@ public:
        LLPanelLandAccess(LLHandle<LLParcelSelection>& parcelp);
        virtual ~LLPanelLandAccess();
        void refresh();
+        void refresh_ui();
        void refreshNames();
        virtual void draw();
-        void addAvatar(LLUUID id);
        static void onCommitAny(LLUICtrl* ctrl, void *userdata);
-        static void onClickAdd(void*);
+        static void onClickAddAccess(void*);
-        static void onClickRemove(void*);
+        static void callbackAvatarCBAccess(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata);
-        static void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata);
+        static void onClickRemoveAccess(void*);
-        static void onAccessLevelChange(LLUICtrl* ctrl, void* userdata);
+        static void onClickAddBanned(void*);
+        static void callbackAvatarCBBanned(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata);
+        static void onClickRemoveBanned(void*);
        virtual BOOL postBuild();
 protected:
-        LLTextBox*                      mLabelTitle;
-        LLCheckBoxCtrl*         mCheckGroup;
-        LLCheckBoxCtrl*         mCheckAccess;
        LLNameListCtrl*         mListAccess;
-        LLButton*                       mBtnAddAccess;
+        LLNameListCtrl*         mListBanned;
-        LLButton*                       mBtnRemoveAccess;
-        LLCheckBoxCtrl*         mCheckPass;
-        LLSpinCtrl*                     mSpinPrice;
-        LLSpinCtrl*                     mSpinHours;
-        LLCheckBoxCtrl*         mCheckIdentified;
-        LLCheckBoxCtrl*         mCheckTransacted;
-        LLRadioGroup*           mCheckStatusLevel;
        LLHandle<LLParcelSelection>&    mParcel;
 };
-class LLPanelLandBan
-:       public LLPanel
-{
-public:
-        LLPanelLandBan(LLHandle<LLParcelSelection>& parcelp);
-        virtual ~LLPanelLandBan();
-        void refresh();
-        void addAvatar(LLUUID id);
-        static void onCommitAny(LLUICtrl* ctrl, void *userdata);
-        static void onClickAdd(void*);
-        static void onClickRemove(void*);
-        static void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata);
-        virtual BOOL postBuild();
-protected:
-        LLTextBox*                      mLabelTitle;
-        LLCheckBoxCtrl*         mCheck;
-        LLNameListCtrl*         mList;
-        LLButton*                       mBtnAdd;
-        LLButton*                       mBtnRemove;
-        LLCheckBoxCtrl*         mCheckDenyAnonymous;
-        LLCheckBoxCtrl*         mCheckDenyIdentified;
-        LLCheckBoxCtrl*         mCheckDenyTransacted;
-        LLHandle<LLParcelSelection>&    mParcel;
-};
-class LLPanelLandRenters
-:       public LLPanel
-{
-public:
-        LLPanelLandRenters(LLHandle<LLParcelSelection>& parcelp);
-        virtual ~LLPanelLandRenters();
-        void refresh();
-        static void onClickAdd(void*);
-        static void onClickRemove(void*);
-protected:
-        LLCheckBoxCtrl*         mCheckRenters;
-        LLNameListCtrl*         mListRenters;
-        LLButton*                       mBtnAddRenter;
-        LLButton*                       mBtnRemoveRenter;
-        LLHandle<LLParcelSelection>&    mParcel;
-};
 class LLPanelLandCovenant
 :       public LLPanel
 {

diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h index d8b7ecf..9be813f 100644 --- a/linden/indra/newview/llfloaterland.h +++ b/linden/indra/newview/llfloaterland.h
@@ -112,7 +112,6 @@ protected:
112	LLPanelLandOptions* mPanelOptions;	112	LLPanelLandOptions* mPanelOptions;
113	LLPanelLandMedia* mPanelMedia;	113	LLPanelLandMedia* mPanelMedia;
114	LLPanelLandAccess* mPanelAccess;	114	LLPanelLandAccess* mPanelAccess;
115	LLPanelLandBan* mPanelBan;
116	LLPanelLandCovenant* mPanelCovenant;	115	LLPanelLandCovenant* mPanelCovenant;
117		116
118	LLHandle<LLParcelSelection> mParcel;	117	LLHandle<LLParcelSelection> mParcel;
@@ -392,93 +391,28 @@ public:
392	LLPanelLandAccess(LLHandle<LLParcelSelection>& parcelp);	391	LLPanelLandAccess(LLHandle<LLParcelSelection>& parcelp);
393	virtual ~LLPanelLandAccess();	392	virtual ~LLPanelLandAccess();
394	void refresh();	393	void refresh();
		394	void refresh_ui();
395	void refreshNames();	395	void refreshNames();
396	virtual void draw();	396	virtual void draw();
397		397
398	void addAvatar(LLUUID id);
399
400	static void onCommitAny(LLUICtrl* ctrl, void *userdata);	398	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
401	static void onClickAdd(void*);	399	static void onClickAddAccess(void*);
402	static void onClickRemove(void*);	400	static void callbackAvatarCBAccess(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata);
403	static void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata);	401	static void onClickRemoveAccess(void*);
404	static void onAccessLevelChange(LLUICtrl* ctrl, void* userdata);	402	static void onClickAddBanned(void*);
		403	static void callbackAvatarCBBanned(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata);
		404	static void onClickRemoveBanned(void*);
405		405
406	virtual BOOL postBuild();	406	virtual BOOL postBuild();
407		407
408	protected:	408	protected:
409	LLTextBox* mLabelTitle;
410
411	LLCheckBoxCtrl* mCheckGroup;
412
413	LLCheckBoxCtrl* mCheckAccess;
414	LLNameListCtrl* mListAccess;	409	LLNameListCtrl* mListAccess;
415	LLButton* mBtnAddAccess;	410	LLNameListCtrl* mListBanned;
416	LLButton* mBtnRemoveAccess;
417
418	LLCheckBoxCtrl* mCheckPass;
419	LLSpinCtrl* mSpinPrice;
420	LLSpinCtrl* mSpinHours;
421
422	LLCheckBoxCtrl* mCheckIdentified;
423	LLCheckBoxCtrl* mCheckTransacted;
424	LLRadioGroup* mCheckStatusLevel;
425		411
426	LLHandle<LLParcelSelection>& mParcel;	412	LLHandle<LLParcelSelection>& mParcel;
427	};	413	};
428		414
429		415
430	class LLPanelLandBan
431	: public LLPanel
432	{
433	public:
434	LLPanelLandBan(LLHandle<LLParcelSelection>& parcelp);
435	virtual ~LLPanelLandBan();
436	void refresh();
437
438	void addAvatar(LLUUID id);
439
440	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
441	static void onClickAdd(void*);
442	static void onClickRemove(void*);
443	static void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata);
444
445	virtual BOOL postBuild();
446
447	protected:
448	LLTextBox* mLabelTitle;
449
450	LLCheckBoxCtrl* mCheck;
451	LLNameListCtrl* mList;
452	LLButton* mBtnAdd;
453	LLButton* mBtnRemove;
454	LLCheckBoxCtrl* mCheckDenyAnonymous;
455	LLCheckBoxCtrl* mCheckDenyIdentified;
456	LLCheckBoxCtrl* mCheckDenyTransacted;
457
458	LLHandle<LLParcelSelection>& mParcel;
459	};
460
461
462	class LLPanelLandRenters
463	: public LLPanel
464	{
465	public:
466	LLPanelLandRenters(LLHandle<LLParcelSelection>& parcelp);
467	virtual ~LLPanelLandRenters();
468	void refresh();
469
470	static void onClickAdd(void*);
471	static void onClickRemove(void*);
472
473	protected:
474	LLCheckBoxCtrl* mCheckRenters;
475	LLNameListCtrl* mListRenters;
476	LLButton* mBtnAddRenter;
477	LLButton* mBtnRemoveRenter;
478
479	LLHandle<LLParcelSelection>& mParcel;
480	};
481
482	class LLPanelLandCovenant	416	class LLPanelLandCovenant
483	: public LLPanel	417	: public LLPanel
484	{	418	{