svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release

QAR-11: pair-reviewed the merge w/ Sam.

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 9eb9172b60..d8b7ecfe88 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -42,17 +42,18 @@
 typedef std::set<LLUUID, lluuid_less> uuid_list_t;
 const F32 CACHE_REFRESH_TIME	= 2.5f;
 
-class LLTextBox;
+class LLButton;
 class LLCheckBoxCtrl;
 class LLRadioGroup;
 class LLComboBox;
-class LLButton;
 class LLNameListCtrl;
 class LLSpinCtrl;
 class LLLineEditor;
 class LLRadioGroup;
 class LLParcelSelectionObserver;
 class LLTabContainer;
+class LLTextBox;
+class LLTextEditor;
 class LLTextureCtrl;
 class LLViewerTextEditor;
 class LLParcelSelection;
@@ -347,7 +348,6 @@ protected:
 	LLButton*		mSetBtn;
 	LLButton*		mClearBtn;
 
-	LLCheckBoxCtrl		*mAllowPublishCtrl;
 	LLCheckBoxCtrl		*mMatureCtrl;
 	LLCheckBoxCtrl		*mPushRestrictionCtrl;
 	LLButton			*mPublishHelpButton;