From be64891922f5a5dadcebd156dab5fb1879cc9b1b Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 22 May 2014 10:09:25 -0700
Subject: Fixed merge

---
 indra/newview/llfloaterland.cpp |  1 +
 indra/newview/llfloaterland.h   | 79 -----------------------------------------
 2 files changed, 1 insertion(+), 79 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index c77c72a7e5..2406b2e3cd 100755
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -2247,6 +2247,7 @@ public:
 
 	static void onCommitPublicAccess(LLUICtrl* ctrl, void *userdata);
 	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
+	static void onCommitGroupCheck(LLUICtrl* ctrl, void *userdata);
 	static void onClickRemoveAccess(void*);
 	static void onClickRemoveBanned(void*);
 
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 8e8b61c333..ae9eecd374 100755
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -309,85 +309,6 @@ protected:
 	LLSafeHandle<LLParcelSelection>&	mParcel;
 };
 
-
-class LLPanelLandOptions
-:	public LLPanel
-{
-public:
-	LLPanelLandOptions(LLSafeHandle<LLParcelSelection>& parcelp);
-	virtual ~LLPanelLandOptions();
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void draw();
-	/*virtual*/ void refresh();
-
-private:
-	// Refresh the "show in search" checkbox and category selector.
-	void refreshSearch();
-
-	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
-	static void onClickSet(void* userdata);
-	static void onClickClear(void* userdata);
-
-private:
-	LLCheckBoxCtrl*	mCheckEditObjects;
-	LLCheckBoxCtrl*	mCheckEditGroupObjects;
-	LLCheckBoxCtrl*	mCheckAllObjectEntry;
-	LLCheckBoxCtrl*	mCheckGroupObjectEntry;
-	LLCheckBoxCtrl*	mCheckSafe;
-	LLCheckBoxCtrl*	mCheckFly;
-	LLCheckBoxCtrl*	mCheckGroupScripts;
-	LLCheckBoxCtrl*	mCheckOtherScripts;
-
-	LLCheckBoxCtrl*	mCheckShowDirectory;
-	LLComboBox*		mCategoryCombo;
-	LLComboBox*		mLandingTypeCombo;
-
-	LLTextureCtrl*	mSnapshotCtrl;
-
-	LLTextBox*		mLocationText;
-	LLButton*		mSetBtn;
-	LLButton*		mClearBtn;
-
-	LLCheckBoxCtrl		*mMatureCtrl;
-	LLCheckBoxCtrl		*mPushRestrictionCtrl;
-	LLCheckBoxCtrl		*mSeeAvatarsCtrl;
-
-	LLSafeHandle<LLParcelSelection>&	mParcel;
-};
-
-
-class LLPanelLandAccess
-:	public LLPanel
-{
-public:
-	LLPanelLandAccess(LLSafeHandle<LLParcelSelection>& parcelp);
-	virtual ~LLPanelLandAccess();
-	void refresh();
-	void refresh_ui();
-	void refreshNames();
-	virtual void draw();
-
-	static void onCommitPublicAccess(LLUICtrl* ctrl, void *userdata);
-	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
-	static void onCommitGroupCheck(LLUICtrl* ctrl, void *userdata);
-	static void onClickRemoveAccess(void*);
-	static void onClickRemoveBanned(void*);
-
-	virtual BOOL postBuild();
-	
-	void onClickAddAccess();
-	void onClickAddBanned();
-	void callbackAvatarCBBanned(const uuid_vec_t& ids);
-	void callbackAvatarCBAccess(const uuid_vec_t& ids);
-
-protected:
-	LLNameListCtrl*		mListAccess;
-	LLNameListCtrl*		mListBanned;
-
-	LLSafeHandle<LLParcelSelection>&	mParcel;
-};
-
-
 class LLPanelLandCovenant
 :	public LLPanel
 {
-- 
cgit v1.2.3