From 9746cf5310871f305a1419163c5adfbed3f1534b Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Thu, 26 Jul 2007 01:22:23 +0000
Subject: EFFECTIVE MERGE: svn merge -r 65485:66133
 svn+ssh://svn/svn/linden/branches/maintenance into release This includes
 fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392

ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
---
 indra/newview/llpanelclassified.h | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'indra/newview/llpanelclassified.h')

diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h
index ca6a05eb31..21f6f9263c 100644
--- a/indra/newview/llpanelclassified.h
+++ b/indra/newview/llpanelclassified.h
@@ -95,8 +95,8 @@ protected:
 	BOOL mInFinder;
 	bool mDirty;
 	bool mForceClose;
-    LLUUID mClassifiedID;
-    LLUUID mRequestedID;
+	LLUUID mClassifiedID;
+	LLUUID mRequestedID;
 	LLUUID mCreatorID;
 	LLUUID mParcelID;
 	S32 mPriceForListing;
@@ -109,24 +109,25 @@ protected:
 	BOOL mPaidFor;
 
 	LLString mSimName;
-    LLVector3d mPosGlobal;
+	LLVector3d mPosGlobal;
 
-    LLTextureCtrl*	mSnapshotCtrl;
-    LLLineEditor*	mNameEditor;
+	// Values the user may change
+	LLTextureCtrl*	mSnapshotCtrl;
+	LLLineEditor*	mNameEditor;
 	LLLineEditor*	mDateEditor;
-    LLTextEditor*	mDescEditor;
-    LLLineEditor*	mLocationEditor;
+	LLTextEditor*	mDescEditor;
+	LLLineEditor*	mLocationEditor;
 	LLComboBox*		mCategoryCombo;
+	LLCheckBoxCtrl* mMatureCheck;
+	LLCheckBoxCtrl* mAutoRenewCheck;
 
 	LLButton*    mUpdateBtn;
-    LLButton*    mTeleportBtn;
-    LLButton*    mMapBtn;
+	LLButton*    mTeleportBtn;
+	LLButton*    mMapBtn;
 	LLButton*	 mProfileBtn;
 
 	LLTextBox*		mInfoText;
-	LLCheckBoxCtrl* mMatureCheck;
-	LLCheckBoxCtrl* mAutoRenewCheck;
-    LLButton*		mSetBtn;
+	LLButton*		mSetBtn;
 	LLTextBox*		mClickThroughText;
 
 	LLRect		mSnapshotSize;
-- 
cgit v1.2.3