Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

1 files changed, 287 insertions, 287 deletions

diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 684950d88b..d024de199f 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterland.h
  * @author James Cook
  * @brief "About Land" floater, allowing display and editing of land parcel properties.
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -32,12 +32,12 @@
 #include <vector>
 
 #include "llfloater.h"
-#include "llpointer.h"	// LLPointer<>
+#include "llpointer.h"  // LLPointer<>
 //#include "llviewertexturelist.h"
 #include "llsafehandle.h"
 
 typedef std::set<LLUUID, lluuid_less> uuid_list_t;
-const F32 CACHE_REFRESH_TIME	= 2.5f;
+const F32 CACHE_REFRESH_TIME    = 2.5f;
 
 class LLButton;
 class LLCheckBoxCtrl;
@@ -70,349 +70,349 @@ class LLPanelLandExperiences;
 class LLPanelLandEnvironment;
 
 class LLFloaterLand
-:	public LLFloater
+:   public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 public:
-	static void refreshAll();
+    static void refreshAll();
 
-	static LLPanelLandObjects* getCurrentPanelLandObjects();
-	static LLPanelLandCovenant* getCurrentPanelLandCovenant();
-	
-	LLParcel* getCurrentSelectedParcel();
-	
-	virtual void onOpen(const LLSD& key);
-	virtual BOOL postBuild();
+    static LLPanelLandObjects* getCurrentPanelLandObjects();
+    static LLPanelLandCovenant* getCurrentPanelLandCovenant();
+
+    LLParcel* getCurrentSelectedParcel();
+
+    virtual void onOpen(const LLSD& key);
+    virtual BOOL postBuild();
 
 private:
-	// Does its own instance management, so clients not allowed
-	// to allocate or destroy.
-	LLFloaterLand(const LLSD& seed);
-	virtual ~LLFloaterLand();
-		
-	void onVisibilityChanged(const LLSD& visible);
+    // Does its own instance management, so clients not allowed
+    // to allocate or destroy.
+    LLFloaterLand(const LLSD& seed);
+    virtual ~LLFloaterLand();
+
+    void onVisibilityChanged(const LLSD& visible);
 
 protected:
 
-	/*virtual*/ void refresh();
+    /*virtual*/ void refresh();
 
-	static void* createPanelLandGeneral(void* data);
-	static void* createPanelLandCovenant(void* data);
-	static void* createPanelLandObjects(void* data);
-	static void* createPanelLandOptions(void* data);
-	static void* createPanelLandAudio(void* data);
-	static void* createPanelLandMedia(void* data);
-	static void* createPanelLandAccess(void* data);
-	static void* createPanelLandExperiences(void* data);
+    static void* createPanelLandGeneral(void* data);
+    static void* createPanelLandCovenant(void* data);
+    static void* createPanelLandObjects(void* data);
+    static void* createPanelLandOptions(void* data);
+    static void* createPanelLandAudio(void* data);
+    static void* createPanelLandMedia(void* data);
+    static void* createPanelLandAccess(void* data);
+    static void* createPanelLandExperiences(void* data);
     static void* createPanelLandEnvironment(void* data);
-	static void* createPanelLandBan(void* data);
+    static void* createPanelLandBan(void* data);
 
 
 protected:
-	static LLParcelSelectionObserver* sObserver;
-	static S32 sLastTab;
-
-	LLTabContainer*			mTabLand;
-	LLPanelLandGeneral*		mPanelGeneral;
-	LLPanelLandObjects*		mPanelObjects;
-	LLPanelLandOptions*		mPanelOptions;
-	LLPanelLandAudio*		mPanelAudio;
-	LLPanelLandMedia*		mPanelMedia;
-	LLPanelLandAccess*		mPanelAccess;
-	LLPanelLandCovenant*	mPanelCovenant;
-	LLPanelLandExperiences*	mPanelExperiences;
+    static LLParcelSelectionObserver* sObserver;
+    static S32 sLastTab;
+
+    LLTabContainer*         mTabLand;
+    LLPanelLandGeneral*     mPanelGeneral;
+    LLPanelLandObjects*     mPanelObjects;
+    LLPanelLandOptions*     mPanelOptions;
+    LLPanelLandAudio*       mPanelAudio;
+    LLPanelLandMedia*       mPanelMedia;
+    LLPanelLandAccess*      mPanelAccess;
+    LLPanelLandCovenant*    mPanelCovenant;
+    LLPanelLandExperiences* mPanelExperiences;
     LLPanelLandEnvironment *mPanelEnvironment;
 
-	LLSafeHandle<LLParcelSelection>	mParcel;
+    LLSafeHandle<LLParcelSelection> mParcel;
 
 public:
-	// When closing the dialog, we want to deselect the land.  But when
-	// we send an update to the simulator, it usually replies with the
-	// parcel information, causing the land to be reselected.  This allows
-	// us to suppress that behavior.
-	static BOOL sRequestReplyOnUpdate;
+    // When closing the dialog, we want to deselect the land.  But when
+    // we send an update to the simulator, it usually replies with the
+    // parcel information, causing the land to be reselected.  This allows
+    // us to suppress that behavior.
+    static BOOL sRequestReplyOnUpdate;
 };
 
 
 class LLPanelLandGeneral
-:	public LLPanel
+:   public LLPanel
 {
 public:
-	LLPanelLandGeneral(LLSafeHandle<LLParcelSelection>& parcelp);
-	virtual ~LLPanelLandGeneral();
-	/*virtual*/ void refresh();
-	void refreshNames();
-	virtual void draw();
-
-	void setGroup(const LLUUID& group_id);
-	void onClickProfile();
-	void onClickSetGroup();
-	static void onClickDeed(void*);
-	static void onClickBuyLand(void* data);
-	static void onClickScriptLimits(void* data);
-	static void onClickRelease(void*);
-	static void onClickReclaim(void*);
-	static void onClickBuyPass(void* deselect_when_done);
-	static BOOL enableBuyPass(void*);
-	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
-	static void finalizeCommit(void * userdata);
-	static void onForSaleChange(LLUICtrl *ctrl, void * userdata);
-	static void finalizeSetSellChange(void * userdata);
-	static void onSalePriceChange(LLUICtrl *ctrl, void * userdata);
-
-	static bool cbBuyPass(const LLSD& notification, const LLSD& response);
-
-	static void onClickSellLand(void* data);
-	static void onClickStopSellLand(void* data);
-	static void onClickSet(void* data);
-	static void onClickClear(void* data);
-	static void onClickShow(void* data);
-	static void callbackAvatarPick(const std::vector<std::string>& names, const uuid_vec_t& ids, void* data);
-	static void finalizeAvatarPick(void* data);
-	static void callbackHighlightTransferable(S32 option, void* userdata);
-	static void onClickStartAuction(void*);
-	// sale change confirmed when "is for sale", "sale price", "sell to whom" fields are changed
-	static void confirmSaleChange(S32 landSize, S32 salePrice, std::string authorizedName, void(*callback)(void*), void* userdata);
-	static void callbackConfirmSaleChange(S32 option, void* userdata);
-
-	virtual BOOL postBuild();
+    LLPanelLandGeneral(LLSafeHandle<LLParcelSelection>& parcelp);
+    virtual ~LLPanelLandGeneral();
+    /*virtual*/ void refresh();
+    void refreshNames();
+    virtual void draw();
+
+    void setGroup(const LLUUID& group_id);
+    void onClickProfile();
+    void onClickSetGroup();
+    static void onClickDeed(void*);
+    static void onClickBuyLand(void* data);
+    static void onClickScriptLimits(void* data);
+    static void onClickRelease(void*);
+    static void onClickReclaim(void*);
+    static void onClickBuyPass(void* deselect_when_done);
+    static BOOL enableBuyPass(void*);
+    static void onCommitAny(LLUICtrl* ctrl, void *userdata);
+    static void finalizeCommit(void * userdata);
+    static void onForSaleChange(LLUICtrl *ctrl, void * userdata);
+    static void finalizeSetSellChange(void * userdata);
+    static void onSalePriceChange(LLUICtrl *ctrl, void * userdata);
+
+    static bool cbBuyPass(const LLSD& notification, const LLSD& response);
+
+    static void onClickSellLand(void* data);
+    static void onClickStopSellLand(void* data);
+    static void onClickSet(void* data);
+    static void onClickClear(void* data);
+    static void onClickShow(void* data);
+    static void callbackAvatarPick(const std::vector<std::string>& names, const uuid_vec_t& ids, void* data);
+    static void finalizeAvatarPick(void* data);
+    static void callbackHighlightTransferable(S32 option, void* userdata);
+    static void onClickStartAuction(void*);
+    // sale change confirmed when "is for sale", "sale price", "sell to whom" fields are changed
+    static void confirmSaleChange(S32 landSize, S32 salePrice, std::string authorizedName, void(*callback)(void*), void* userdata);
+    static void callbackConfirmSaleChange(S32 option, void* userdata);
+
+    virtual BOOL postBuild();
 
 protected:
-	BOOL			mUncheckedSell; // True only when verifying land information when land is for sale on sale info change
-	
-	LLTextBox*		mLabelName;
-	LLLineEditor*	mEditName;
-	LLTextBox*		mLabelDesc;
-	LLTextEditor*	mEditDesc;
-
-	LLTextBox*		mTextSalePending;
-
- 	LLButton*		mBtnDeedToGroup;
- 	LLButton*		mBtnSetGroup;
-
-	LLTextBox*		mTextOwnerLabel;
-	LLTextBox*		mTextOwner;
-	LLButton*		mBtnProfile;
-	
-	LLTextBox*		mContentRating;
-	LLTextBox*		mLandType;
-
-	LLTextBox*		mTextGroup;
-	LLTextBox*		mTextGroupLabel;
-	LLTextBox*		mTextClaimDateLabel;
-	LLTextBox*		mTextClaimDate;
-
-	LLTextBox*		mTextPriceLabel;
-	LLTextBox*		mTextPrice;
-
-	LLCheckBoxCtrl* mCheckDeedToGroup;
-	LLCheckBoxCtrl* mCheckContributeWithDeed;
-
-	LLTextBox*		mSaleInfoForSale1;
-	LLTextBox*		mSaleInfoForSale2;
-	LLTextBox*		mSaleInfoForSaleObjects;
-	LLTextBox*		mSaleInfoForSaleNoObjects;
-	LLTextBox*		mSaleInfoNotForSale;
-	LLButton*		mBtnSellLand;
-	LLButton*		mBtnStopSellLand;
-
-	LLTextBox*		mTextDwell;
-
-	LLButton*		mBtnBuyLand;
-	LLButton*		mBtnScriptLimits;
-	LLButton*		mBtnBuyGroupLand;
-
-	// these buttons share the same location, but
-	// reclaim is in exactly the same visual place,
-	// ond is only shown for estate owners on their
-	// estate since they cannot release land.
-	LLButton*		mBtnReleaseLand;
-	LLButton*		mBtnReclaimLand;
-
-	LLButton*		mBtnBuyPass;
-	LLButton* mBtnStartAuction;
-
-	LLSafeHandle<LLParcelSelection>&	mParcel;
-
-	// This pointer is needed to avoid parcel deselection until buying pass is completed or canceled.
-	// Deselection happened because of zero references to parcel selection, which took place when 
-	// "Buy Pass" was called from popup menu(EXT-6464)
-	static LLPointer<LLParcelSelection>	sSelectionForBuyPass;
-
-	static LLHandle<LLFloater> sBuyPassDialogHandle;
+    BOOL            mUncheckedSell; // True only when verifying land information when land is for sale on sale info change
+
+    LLTextBox*      mLabelName;
+    LLLineEditor*   mEditName;
+    LLTextBox*      mLabelDesc;
+    LLTextEditor*   mEditDesc;
+
+    LLTextBox*      mTextSalePending;
+
+    LLButton*       mBtnDeedToGroup;
+    LLButton*       mBtnSetGroup;
+
+    LLTextBox*      mTextOwnerLabel;
+    LLTextBox*      mTextOwner;
+    LLButton*       mBtnProfile;
+
+    LLTextBox*      mContentRating;
+    LLTextBox*      mLandType;
+
+    LLTextBox*      mTextGroup;
+    LLTextBox*      mTextGroupLabel;
+    LLTextBox*      mTextClaimDateLabel;
+    LLTextBox*      mTextClaimDate;
+
+    LLTextBox*      mTextPriceLabel;
+    LLTextBox*      mTextPrice;
+
+    LLCheckBoxCtrl* mCheckDeedToGroup;
+    LLCheckBoxCtrl* mCheckContributeWithDeed;
+
+    LLTextBox*      mSaleInfoForSale1;
+    LLTextBox*      mSaleInfoForSale2;
+    LLTextBox*      mSaleInfoForSaleObjects;
+    LLTextBox*      mSaleInfoForSaleNoObjects;
+    LLTextBox*      mSaleInfoNotForSale;
+    LLButton*       mBtnSellLand;
+    LLButton*       mBtnStopSellLand;
+
+    LLTextBox*      mTextDwell;
+
+    LLButton*       mBtnBuyLand;
+    LLButton*       mBtnScriptLimits;
+    LLButton*       mBtnBuyGroupLand;
+
+    // these buttons share the same location, but
+    // reclaim is in exactly the same visual place,
+    // ond is only shown for estate owners on their
+    // estate since they cannot release land.
+    LLButton*       mBtnReleaseLand;
+    LLButton*       mBtnReclaimLand;
+
+    LLButton*       mBtnBuyPass;
+    LLButton* mBtnStartAuction;
+
+    LLSafeHandle<LLParcelSelection>&    mParcel;
+
+    // This pointer is needed to avoid parcel deselection until buying pass is completed or canceled.
+    // Deselection happened because of zero references to parcel selection, which took place when
+    // "Buy Pass" was called from popup menu(EXT-6464)
+    static LLPointer<LLParcelSelection> sSelectionForBuyPass;
+
+    static LLHandle<LLFloater> sBuyPassDialogHandle;
 };
 
 class LLPanelLandObjects
-:	public LLPanel
+:   public LLPanel
 {
 public:
-	LLPanelLandObjects(LLSafeHandle<LLParcelSelection>& parcelp);
-	virtual ~LLPanelLandObjects();
-	/*virtual*/ void refresh();
-	virtual void draw();
-
-	bool callbackReturnOwnerObjects(const LLSD& notification, const LLSD& response);
-	bool callbackReturnGroupObjects(const LLSD& notification, const LLSD& response);
-	bool callbackReturnOtherObjects(const LLSD& notification, const LLSD& response);
-	bool callbackReturnOwnerList(const LLSD& notification, const LLSD& response);
-
-	static void clickShowCore(LLPanelLandObjects* panelp, S32 return_type, uuid_list_t* list = 0);
-	static void onClickShowOwnerObjects(void*);
-	static void onClickShowGroupObjects(void*);
-	static void onClickShowOtherObjects(void*);
-
-	static void onClickReturnOwnerObjects(void*);
-	static void onClickReturnGroupObjects(void*);
-	static void onClickReturnOtherObjects(void*);
-	static void onClickReturnOwnerList(void*);
-	static void onClickRefresh(void*);
-
-	static void onDoubleClickOwner(void*);	
-
-	static void onCommitList(LLUICtrl* ctrl, void* data);
-	static void onLostFocus(LLFocusableElement* caller, void* user_data);
-	static void onCommitClean(LLUICtrl* caller, void* user_data);
-	static void processParcelObjectOwnersReply(LLMessageSystem *msg, void **);
-	
-	virtual BOOL postBuild();
+    LLPanelLandObjects(LLSafeHandle<LLParcelSelection>& parcelp);
+    virtual ~LLPanelLandObjects();
+    /*virtual*/ void refresh();
+    virtual void draw();
+
+    bool callbackReturnOwnerObjects(const LLSD& notification, const LLSD& response);
+    bool callbackReturnGroupObjects(const LLSD& notification, const LLSD& response);
+    bool callbackReturnOtherObjects(const LLSD& notification, const LLSD& response);
+    bool callbackReturnOwnerList(const LLSD& notification, const LLSD& response);
+
+    static void clickShowCore(LLPanelLandObjects* panelp, S32 return_type, uuid_list_t* list = 0);
+    static void onClickShowOwnerObjects(void*);
+    static void onClickShowGroupObjects(void*);
+    static void onClickShowOtherObjects(void*);
+
+    static void onClickReturnOwnerObjects(void*);
+    static void onClickReturnGroupObjects(void*);
+    static void onClickReturnOtherObjects(void*);
+    static void onClickReturnOwnerList(void*);
+    static void onClickRefresh(void*);
+
+    static void onDoubleClickOwner(void*);
+
+    static void onCommitList(LLUICtrl* ctrl, void* data);
+    static void onLostFocus(LLFocusableElement* caller, void* user_data);
+    static void onCommitClean(LLUICtrl* caller, void* user_data);
+    static void processParcelObjectOwnersReply(LLMessageSystem *msg, void **);
+
+    virtual BOOL postBuild();
 
 protected:
 
-	LLTextBox		*mParcelObjectBonus;
-	LLTextBox		*mSWTotalObjects;
-	LLTextBox		*mObjectContribution;
-	LLTextBox		*mTotalObjects;
-	LLTextBox		*mOwnerObjects;
-	LLButton		*mBtnShowOwnerObjects;
-	LLButton		*mBtnReturnOwnerObjects;
-	LLTextBox		*mGroupObjects;
-	LLButton		*mBtnShowGroupObjects;
-	LLButton		*mBtnReturnGroupObjects;
-	LLTextBox		*mOtherObjects;
-	LLButton		*mBtnShowOtherObjects;
-	LLButton		*mBtnReturnOtherObjects;
-	LLTextBox		*mSelectedObjects;
-	LLLineEditor	*mCleanOtherObjectsTime;
-	S32				mOtherTime;
-	LLButton		*mBtnRefresh;
-	LLButton		*mBtnReturnOwnerList;
-	LLNameListCtrl	*mOwnerList;
-
-	LLPointer<LLUIImage>	mIconAvatarOnline;
-	LLPointer<LLUIImage>	mIconAvatarOffline;
-	LLPointer<LLUIImage>	mIconGroup;
-
-	BOOL			mFirstReply;
-
-	uuid_list_t		mSelectedOwners;
-	std::string		mSelectedName;
-	S32				mSelectedCount;
-	BOOL			mSelectedIsGroup;
-
-	LLSafeHandle<LLParcelSelection>&	mParcel;
+    LLTextBox       *mParcelObjectBonus;
+    LLTextBox       *mSWTotalObjects;
+    LLTextBox       *mObjectContribution;
+    LLTextBox       *mTotalObjects;
+    LLTextBox       *mOwnerObjects;
+    LLButton        *mBtnShowOwnerObjects;
+    LLButton        *mBtnReturnOwnerObjects;
+    LLTextBox       *mGroupObjects;
+    LLButton        *mBtnShowGroupObjects;
+    LLButton        *mBtnReturnGroupObjects;
+    LLTextBox       *mOtherObjects;
+    LLButton        *mBtnShowOtherObjects;
+    LLButton        *mBtnReturnOtherObjects;
+    LLTextBox       *mSelectedObjects;
+    LLLineEditor    *mCleanOtherObjectsTime;
+    S32             mOtherTime;
+    LLButton        *mBtnRefresh;
+    LLButton        *mBtnReturnOwnerList;
+    LLNameListCtrl  *mOwnerList;
+
+    LLPointer<LLUIImage>    mIconAvatarOnline;
+    LLPointer<LLUIImage>    mIconAvatarOffline;
+    LLPointer<LLUIImage>    mIconGroup;
+
+    BOOL            mFirstReply;
+
+    uuid_list_t     mSelectedOwners;
+    std::string     mSelectedName;
+    S32             mSelectedCount;
+    BOOL            mSelectedIsGroup;
+
+    LLSafeHandle<LLParcelSelection>&    mParcel;
 };
 
 
 class LLPanelLandOptions
-:	public LLPanel
+:   public LLPanel
 {
 public:
-	LLPanelLandOptions(LLSafeHandle<LLParcelSelection>& parcelp);
-	virtual ~LLPanelLandOptions();
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void draw();
-	/*virtual*/ void refresh();
+    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();
+    // 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);
-	static void toggleSeeAvatars(void* userdata);
+    static void onCommitAny(LLUICtrl* ctrl, void *userdata);
+    static void onClickSet(void* userdata);
+    static void onClickClear(void* userdata);
+    static void toggleSeeAvatars(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;
-	LLTextBox*		mSeeAvatarsText;
-	LLButton*		mSetBtn;
-	LLButton*		mClearBtn;
-
-	LLCheckBoxCtrl		*mMatureCtrl;
-	LLCheckBoxCtrl		*mPushRestrictionCtrl;
-	LLCheckBoxCtrl		*mSeeAvatarsCtrl;
-
-	LLSafeHandle<LLParcelSelection>&	mParcel;
+    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;
+    LLTextBox*      mSeeAvatarsText;
+    LLButton*       mSetBtn;
+    LLButton*       mClearBtn;
+
+    LLCheckBoxCtrl      *mMatureCtrl;
+    LLCheckBoxCtrl      *mPushRestrictionCtrl;
+    LLCheckBoxCtrl      *mSeeAvatarsCtrl;
+
+    LLSafeHandle<LLParcelSelection>&    mParcel;
 };
 
 
 class LLPanelLandAccess
-:	public LLPanel
+:   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 callbackAvatarCBBanned2(const uuid_vec_t& ids, S32 duration);
-	void callbackAvatarCBAccess(const uuid_vec_t& ids);
+    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 callbackAvatarCBBanned2(const uuid_vec_t& ids, S32 duration);
+    void callbackAvatarCBAccess(const uuid_vec_t& ids);
 
 protected:
-	LLNameListCtrl*		mListAccess;
-	LLNameListCtrl*		mListBanned;
+    LLNameListCtrl*     mListAccess;
+    LLNameListCtrl*     mListBanned;
 
-	LLSafeHandle<LLParcelSelection>&	mParcel;
+    LLSafeHandle<LLParcelSelection>&    mParcel;
 };
 
 
 class LLPanelLandCovenant
-:	public LLPanel
+:   public LLPanel
 {
 public:
-	LLPanelLandCovenant(LLSafeHandle<LLParcelSelection>& parcelp);
-	virtual ~LLPanelLandCovenant();
-	virtual BOOL postBuild();
-	void refresh();
-	static void updateCovenantText(const std::string& string);
-	static void updateEstateName(const std::string& name);
-	static void updateLastModified(const std::string& text);
-	static void updateEstateOwnerName(const std::string& name);
+    LLPanelLandCovenant(LLSafeHandle<LLParcelSelection>& parcelp);
+    virtual ~LLPanelLandCovenant();
+    virtual BOOL postBuild();
+    void refresh();
+    static void updateCovenantText(const std::string& string);
+    static void updateEstateName(const std::string& name);
+    static void updateLastModified(const std::string& text);
+    static void updateEstateOwnerName(const std::string& name);
 
 protected:
-	LLSafeHandle<LLParcelSelection>&	mParcel;
+    LLSafeHandle<LLParcelSelection>&    mParcel;
 
 private:
-	LLUUID mLastRegionID;
-	F64 mNextUpdateTime; //seconds since client start
+    LLUUID mLastRegionID;
+    F64 mNextUpdateTime; //seconds since client start
     LLTextBox* mTextEstateOwner;
 };