That commit where I touch all the ascentprefs headers to make them conform to standard because it's been annoying me too long.

2013-10-23 17:47:33 -04:00
parent 41303d0c9c
commit 2b7e78cb3b
3 changed files with 154 additions and 153 deletions
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -38,13 +38,13 @@
 class LLPrefsAscentChat : public LLPanel
 {
 public:
-    LLPrefsAscentChat();
-    ~LLPrefsAscentChat();
+	LLPrefsAscentChat();
+	~LLPrefsAscentChat();

-    void apply();
-    void cancel();
-    void refresh();
-    void refreshValues();
+	void apply();
+	void cancel();
+	void refresh();
+	void refreshValues();

 protected:
 	void onSpellAdd();
@@ -56,26 +56,27 @@ protected:
 	void onCommitDialogBlock(LLUICtrl* ctrl, const LLSD& value);
 	void onCommitKeywords(LLUICtrl* ctrl);

-    //Chat/IM -----------------------------------------------------------------------------
-    BOOL mIMAnnounceIncoming;
-    BOOL mHideTypingNotification;
-    bool mInstantMessagesFriendsOnly;
-    BOOL mShowGroupNameInChatIM;
-    bool mShowDisplayNameChanges;
-    bool mUseTypingBubbles;
-    BOOL mPlayTypingSound;
-    BOOL mHideNotificationsInChat;
-    BOOL mEnableMUPose;
-    BOOL mEnableOOCAutoClose;
-    U32 mLinksForChattingObjects;
-    U32 mTimeFormat;
-    U32 mDateFormat;
-        U32 tempTimeFormat;
-        U32 tempDateFormat;
-    BOOL mSecondsInChatAndIMs;
-    BOOL mSecondsInLog;
+private:
+	//Chat/IM -----------------------------------------------------------------------------
+	bool mIMAnnounceIncoming;
+	bool mHideTypingNotification;
+	bool mInstantMessagesFriendsOnly;
+	bool mShowGroupNameInChatIM;
+	bool mShowDisplayNameChanges;
+	bool mUseTypingBubbles;
+	bool mPlayTypingSound;
+	bool mHideNotificationsInChat;
+	bool mEnableMUPose;
+	bool mEnableOOCAutoClose;
+	U32 mLinksForChattingObjects;
+	U32 mTimeFormat;
+	U32 mDateFormat;
+	U32 tempTimeFormat;
+	U32 tempDateFormat;
+	bool mSecondsInChatAndIMs;
+	bool mSecondsInLog;

-    //Chat UI -----------------------------------------------------------------------------
+	//Chat UI -----------------------------------------------------------------------------
 	bool mWoLfVerticalIMTabs;
 	bool mOtherChatsTornOff;
 	bool mIMAnnounceStealFocus;
@@ -95,39 +96,39 @@ protected:
 	std::string mIMResponseMutedItemID;
 	std::string mIMResponseBusyItemID;

-    //Spam --------------------------------------------------------------------------------
-    BOOL mEnableAS;
-    BOOL mGlobalQueue;
-    U32  mChatSpamCount;
-    U32  mChatSpamTime;
-    BOOL mBlockDialogSpam;
-    BOOL mBlockAlertSpam;
-    BOOL mBlockFriendSpam;
-    BOOL mBlockGroupNoticeSpam;
-    BOOL mBlockGroupInviteSpam;
-	BOOL mBlockGroupFeeInviteSpam;
-    BOOL mBlockItemOfferSpam;
+	//Spam --------------------------------------------------------------------------------
+	bool mEnableAS;
+	bool mGlobalQueue;
+	U32  mChatSpamCount;
+	U32  mChatSpamTime;
+	bool mBlockDialogSpam;
+	bool mBlockAlertSpam;
+	bool mBlockFriendSpam;
+	bool mBlockGroupNoticeSpam;
+	bool mBlockGroupInviteSpam;
+	bool mBlockGroupFeeInviteSpam;
+	bool mBlockItemOfferSpam;
 	bool mBlockNotMineSpam;
 	bool mBlockNotFriendSpam;
-    BOOL mBlockScriptSpam;
-    BOOL mBlockTeleportSpam;
+	bool mBlockScriptSpam;
+	bool mBlockTeleportSpam;
 	bool mBlockTeleportRequestSpam;
-    BOOL mNotifyOnSpam;
-    BOOL mSoundMulti;
-    U32  mNewLines;
-    U32  mPreloadMulti;
+	bool mNotifyOnSpam;
+	bool mSoundMulti;
+	U32  mNewLines;
+	U32  mPreloadMulti;
 	bool mEnableGestureSounds;

-    //Text Options ------------------------------------------------------------------------
-    BOOL mSpellDisplay;
-    BOOL mKeywordsOn;
-    std::string mKeywordsList;
-    BOOL mKeywordsInChat;
-    BOOL mKeywordsInIM;
-    BOOL mKeywordsChangeColor;
-    LLColor4 mKeywordsColor;
-    BOOL mKeywordsPlaySound;
-    LLUUID mKeywordsSound;
+	//Text Options ------------------------------------------------------------------------
+	bool mSpellDisplay;
+	bool mKeywordsOn;
+	std::string mKeywordsList;
+	bool mKeywordsInChat;
+	bool mKeywordsInIM;
+	bool mKeywordsChangeColor;
+	LLColor4 mKeywordsColor;
+	bool mKeywordsPlaySound;
+	LLUUID mKeywordsSound;
 };

 #endif
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -38,13 +38,13 @@
 class LLPrefsAscentSys : public LLPanel
 {
 public:
-    LLPrefsAscentSys();
-    ~LLPrefsAscentSys();
+	LLPrefsAscentSys();
+	~LLPrefsAscentSys();

-    void apply();
-    void cancel();
-    void refresh();
-    void refreshValues();
+	void apply();
+	void cancel();
+	void refresh();
+	void refreshValues();

 protected:
 	void onCommitCheckBox(LLUICtrl* ctrl, const LLSD& value);
@@ -52,61 +52,62 @@ protected:
 	void onCommitComboBox(LLUICtrl* ctrl, const LLSD& value);
 	void onCommitTexturePicker(LLUICtrl* ctrl);

-    //General -----------------------------------------------------------------------------
-    BOOL mDoubleClickTeleport;
-        BOOL mResetCameraAfterTP;
-        BOOL mOffsetTPByUserHeight;
-    bool mClearBeaconAfterTeleport;
-    bool mLiruFlyAfterTeleport;
-    bool mLiruContinueFlying;
-    BOOL mPreviewAnimInWorld;
-    BOOL mSaveScriptsAsMono;
-    BOOL mAlwaysRezInGroup;
-    BOOL mBuildAlwaysEnabled;
-    BOOL mAlwaysShowFly;
-    BOOL mDisableMinZoom;
-    BOOL mPowerUser;
-    BOOL mFetchInventoryOnLogin;
-    BOOL mEnableLLWind;
-    BOOL mEnableClouds;
-        BOOL mEnableClassicClouds;
-    BOOL mSpeedRez;
-        U32 mSpeedRezInterval;
+private:
+	//General -----------------------------------------------------------------------------
+	bool mDoubleClickTeleport;
+	bool mResetCameraAfterTP;
+	bool mOffsetTPByUserHeight;
+	bool mClearBeaconAfterTeleport;
+	bool mLiruFlyAfterTeleport;
+	bool mLiruContinueFlying;
+	bool mPreviewAnimInWorld;
+	bool mSaveScriptsAsMono;
+	bool mAlwaysRezInGroup;
+	bool mBuildAlwaysEnabled;
+	bool mAlwaysShowFly;
+	bool mDisableMinZoom;
+	bool mPowerUser;
+	bool mFetchInventoryOnLogin;
+	bool mEnableLLWind;
+	bool mEnableClouds;
+	bool mEnableClassicClouds;
+	bool mSpeedRez;
+	U32 mSpeedRezInterval;
 	bool mUseWebProfiles;
 	bool mUseWebSearch;

-    //Command Line ------------------------------------------------------------------------
-    BOOL mCmdLine;
-    std::string mCmdLinePos;
-    std::string mCmdLineGround;
-    std::string mCmdLineHeight;
-    std::string mCmdLineTeleportHome;
-    std::string mCmdLineRezPlatform;
-    F32 mCmdPlatformSize;
-    std::string mCmdLineCalc;
-    std::string mCmdLineClearChat;
-    std::string mCmdLineDrawDistance;
-    std::string mCmdTeleportToCam;
-    std::string mCmdLineKeyToName;
-    std::string mCmdLineOfferTp;
-    std::string mCmdLineMapTo;
-    BOOL mCmdMapToKeepPos;
-    std::string mCmdLineTP2;
-    std::string mCmdLineAway;
+	//Command Line ------------------------------------------------------------------------
+	bool mCmdLine;
+	std::string mCmdLinePos;
+	std::string mCmdLineGround;
+	std::string mCmdLineHeight;
+	std::string mCmdLineTeleportHome;
+	std::string mCmdLineRezPlatform;
+	F32 mCmdPlatformSize;
+	std::string mCmdLineCalc;
+	std::string mCmdLineClearChat;
+	std::string mCmdLineDrawDistance;
+	std::string mCmdTeleportToCam;
+	std::string mCmdLineKeyToName;
+	std::string mCmdLineOfferTp;
+	std::string mCmdLineMapTo;
+	bool mCmdMapToKeepPos;
+	std::string mCmdLineTP2;
+	std::string mCmdLineAway;
 	std::string mCmdLineURL;

-    //Security ----------------------------------------------------------------------------
-    BOOL mBroadcastViewerEffects;
-    BOOL mDisablePointAtAndBeam;
-    BOOL mPrivateLookAt;
-    BOOL mShowLookAt;
-	BOOL mQuietSnapshotsToDisk;
-	BOOL mDetachBridge;
-	BOOL mRevokePermsOnStandUp;
-    BOOL mDisableClickSit;
+	//Security ----------------------------------------------------------------------------
+	bool mBroadcastViewerEffects;
+	bool mDisablePointAtAndBeam;
+	bool mPrivateLookAt;
+	bool mShowLookAt;
+	bool mQuietSnapshotsToDisk;
+	bool mDetachBridge;
+	bool mRevokePermsOnStandUp;
+	bool mDisableClickSit;
 	bool mDisableClickSitOtherOwner;
-    BOOL mDisplayScriptJumps;
-    F32 mNumScriptDiff;
+	bool mDisplayScriptJumps;
+	F32 mNumScriptDiff;

 	//Build -------------------------------------------------------------------------------
 	F32 mAlpha;
@@ -115,14 +116,14 @@ protected:
 	F32 mGlow;
 	std::string mItem;
 	std::string mMaterial;
-	BOOL mNextCopy;
-	BOOL mNextMod;
-	BOOL mNextTrans;
+	bool mNextCopy;
+	bool mNextMod;
+	bool mNextTrans;
 	std::string mShiny;
-	BOOL mTemporary;
+	bool mTemporary;
 	std::string mTexture;
-	BOOL mPhantom;
-	BOOL mPhysical;
+	bool mPhantom;
+	bool mPhysical;
 	F32 mXsize;
 	F32 mYsize;
 	F32 mZsize;
--- a/indra/newview/ascentprefsvan.h
+++ b/indra/newview/ascentprefsvan.h
@@ -38,24 +38,26 @@
 class LLPrefsAscentVan : public LLPanel
 {
 public:
-    LLPrefsAscentVan();
-    ~LLPrefsAscentVan();
+	LLPrefsAscentVan();
+	~LLPrefsAscentVan();

-    void apply();
-    void cancel();
-    void refresh();
-    void refreshValues();
+	void apply();
+	void cancel();
+	void refresh();
+	void refreshValues();

 protected:
 	void onCommitClientTag(LLUICtrl* ctrl);
 	void onCommitCheckBox(LLUICtrl* ctrl, const LLSD& value);
 	void onCommitTextModified(LLUICtrl* ctrl, const LLSD& value);
 	static void onManualClientUpdate();
-    //Main
-    BOOL mUseAccountSettings;
-    BOOL mShowTPScreen;
-    BOOL mPlayTPSound;
-    BOOL mShowLogScreens;
+
+private:
+	//Main
+	bool mUseAccountSettings;
+	bool mShowTPScreen;
+	bool mPlayTPSound;
+	bool mShowLogScreens;
 	bool mDisableChatAnimation;
 	bool mAddNotReplace;
 	bool mTurnAround;
@@ -64,41 +66,38 @@ protected:
 	bool mUnfocusedFloatersOpaque;
 	bool mCompleteNameProfiles;
 	bool mScriptErrorsStealFocus;
-    //Tags\Colors
-    BOOL mAscentBroadcastTag;
-    std::string mReportClientUUID;
-    U32 mSelectedClient;
-    BOOL mShowSelfClientTag;
-    BOOL mShowSelfClientTagColor;
-    BOOL mShowFriendsTag;
-    BOOL mDisplayClientTagOnNewLine;
-    BOOL mCustomTagOn;
-    std::string mCustomTagLabel;
-    LLColor4 mCustomTagColor;
-    BOOL mShowOthersTag;
-    BOOL mShowOthersTagColor;
-    BOOL mShowIdleTime;
-    BOOL mUseStatusColors;
-    BOOL mUpdateTagsOnLoad;
-    LLColor4 mEffectColor;
-    LLColor4 mFriendColor;
-    LLColor4 mEstateOwnerColor;
-    LLColor4 mLindenColor;
-    LLColor4 mMutedColor;
+	//Tags\Colors
+	bool mAscentBroadcastTag;
+	std::string mReportClientUUID;
+	U32 mSelectedClient;
+	bool mShowSelfClientTag;
+	bool mShowSelfClientTagColor;
+	bool mShowFriendsTag;
+	bool mDisplayClientTagOnNewLine;
+	bool mCustomTagOn;
+	std::string mCustomTagLabel;
+	LLColor4 mCustomTagColor;
+	bool mShowOthersTag;
+	bool mShowOthersTagColor;
+	bool mShowIdleTime;
+	bool mUseStatusColors;
+	bool mUpdateTagsOnLoad;
+	LLColor4 mEffectColor;
+	LLColor4 mFriendColor;
+	LLColor4 mEstateOwnerColor;
+	LLColor4 mLindenColor;
+	LLColor4 mMutedColor;
 	LLColor4 mMapAvatarColor;
 	LLColor4 mCustomColor;
 	bool mColorFriendChat;
 	bool mColorEOChat;
 	bool mColorLindenChat;
 	bool mColorMutedChat;
-//	bool mColorCustomChat;
-
-    F32 mAvatarXModifier;
-    F32 mAvatarYModifier;
-    F32 mAvatarZModifier;
-
-private:
+	//	bool mColorCustomChat;

+	F32 mAvatarXModifier;
+	F32 mAvatarYModifier;
+	F32 mAvatarZModifier;
 };

 #endif