Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge

1 files changed, 106 insertions, 106 deletions

diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h
index d0fddaf49a..1f8017656f 100644
--- a/indra/newview/llpreviewgesture.h
+++ b/indra/newview/llpreviewgesture.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpreviewgesture.h
  * @brief Editing UI for inventory-based gestures.
  *
  * $LicenseInfo:firstyear=2004&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$
  */
@@ -43,128 +43,128 @@ class LLRadioGroup;
 class LLPreviewGesture : public LLPreview
 {
 public:
-	// Pass an object_id if this gesture is inside an object in the world,
-	// otherwise use LLUUID::null.
-	static LLPreviewGesture* show(const LLUUID& item_id, const LLUUID& object_id);
-
-	LLPreviewGesture(const LLSD& key);
-	virtual ~LLPreviewGesture();
-
-	// LLView
-	/*virtual*/ void draw();
-	/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
-	/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-									 EDragAndDropType cargo_type,
-									 void* cargo_data,
-									 EAcceptance* accept,
-									 std::string& tooltip_msg);
-
-	// LLPanel
-	/*virtual*/ BOOL postBuild();
-
-	// LLFloater
-	/*virtual*/ BOOL canClose();
-	/*virtual*/ void onClose(bool app_quitting);
-	/*virtual*/ void onUpdateSucceeded();
-	/*virtual*/ void refresh();
+    // Pass an object_id if this gesture is inside an object in the world,
+    // otherwise use LLUUID::null.
+    static LLPreviewGesture* show(const LLUUID& item_id, const LLUUID& object_id);
+
+    LLPreviewGesture(const LLSD& key);
+    virtual ~LLPreviewGesture();
+
+    // LLView
+    /*virtual*/ void draw();
+    /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
+    /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+                                     EDragAndDropType cargo_type,
+                                     void* cargo_data,
+                                     EAcceptance* accept,
+                                     std::string& tooltip_msg);
+
+    // LLPanel
+    /*virtual*/ BOOL postBuild();
+
+    // LLFloater
+    /*virtual*/ BOOL canClose();
+    /*virtual*/ void onClose(bool app_quitting);
+    /*virtual*/ void onUpdateSucceeded();
+    /*virtual*/ void refresh();
 
 protected:
-	// Populate various comboboxes
-	void addModifiers();
-	void addKeys();
-	void addAnimations();
-	void addSounds();
+    // Populate various comboboxes
+    void addModifiers();
+    void addKeys();
+    void addAnimations();
+    void addSounds();
+
+    void initDefaultGesture();
+
+    void loadAsset();
 
-	void initDefaultGesture();
+    static void onLoadComplete(const LLUUID& asset_uuid,
+                               LLAssetType::EType type,
+                               void* user_data, S32 status, LLExtStat ext_status);
 
-	void loadAsset();
+    void loadUIFromGesture(LLMultiGesture* gesture);
 
-	static void onLoadComplete(const LLUUID& asset_uuid,
-							   LLAssetType::EType type,
-							   void* user_data, S32 status, LLExtStat ext_status);
+    void saveIfNeeded();
 
-	void loadUIFromGesture(LLMultiGesture* gesture);
+    static void onSaveComplete(const LLUUID& asset_uuid,
+                               void* user_data,
+                               S32 status, LLExtStat ext_status);
 
-	void saveIfNeeded();
+    bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response);
 
-	static void onSaveComplete(const LLUUID& asset_uuid,
-							   void* user_data,
-							   S32 status, LLExtStat ext_status);
+    // Write UI back into gesture
+    LLMultiGesture* createGesture();
 
-	bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response);
+    // Add a step.  Pass the name of the step, like "Animation",
+    // "Sound", "Chat", or "Wait"
+    LLScrollListItem* addStep(const enum EStepType step_type);
 
-	// Write UI back into gesture
-	LLMultiGesture* createGesture();
+    void onVisibilityChanged ( const LLSD& new_visibility );
 
-	// Add a step.  Pass the name of the step, like "Animation",
-	// "Sound", "Chat", or "Wait"
-	LLScrollListItem* addStep(const enum EStepType step_type);
-	
-	void onVisibilityChanged ( const LLSD& new_visibility );
+    void onCommitKeyorModifier();
 
-	void onCommitKeyorModifier();
-	
-	static std::string getLabel(std::vector<std::string> labels);
-	static void updateLabel(LLScrollListItem* item);
+    static std::string getLabel(std::vector<std::string> labels);
+    static void updateLabel(LLScrollListItem* item);
 
-	static void onCommitSetDirty(LLUICtrl* ctrl, void* data);
-	static void onCommitLibrary(LLUICtrl* ctrl, void* data);
-	static void onCommitStep(LLUICtrl* ctrl, void* data);
-	static void onCommitAnimation(LLUICtrl* ctrl, void* data);
-	static void onCommitSound(LLUICtrl* ctrl, void* data);
-	static void onCommitChat(LLUICtrl* ctrl, void* data);
-	static void onCommitWait(LLUICtrl* ctrl, void* data);
-	static void onCommitWaitTime(LLUICtrl* ctrl, void* data);
+    static void onCommitSetDirty(LLUICtrl* ctrl, void* data);
+    static void onCommitLibrary(LLUICtrl* ctrl, void* data);
+    static void onCommitStep(LLUICtrl* ctrl, void* data);
+    static void onCommitAnimation(LLUICtrl* ctrl, void* data);
+    static void onCommitSound(LLUICtrl* ctrl, void* data);
+    static void onCommitChat(LLUICtrl* ctrl, void* data);
+    static void onCommitWait(LLUICtrl* ctrl, void* data);
+    static void onCommitWaitTime(LLUICtrl* ctrl, void* data);
 
-	static void onCommitAnimationTrigger(LLUICtrl* ctrl, void *data);
+    static void onCommitAnimationTrigger(LLUICtrl* ctrl, void *data);
 
-	// Handy function to commit each keystroke
-	static void onKeystrokeCommit(LLLineEditor* caller, void* data);
+    // Handy function to commit each keystroke
+    static void onKeystrokeCommit(LLLineEditor* caller, void* data);
 
-	static void onClickAdd(void* data);
-	static void onClickUp(void* data);
-	static void onClickDown(void* data);
-	static void onClickDelete(void* data);
+    static void onClickAdd(void* data);
+    static void onClickUp(void* data);
+    static void onClickDown(void* data);
+    static void onClickDelete(void* data);
 
-	static void onCommitActive(LLUICtrl* ctrl, void* data);
-	static void onClickSave(void* data);
-	static void onClickPreview(void* data);
+    static void onCommitActive(LLUICtrl* ctrl, void* data);
+    static void onClickSave(void* data);
+    static void onClickPreview(void* data);
 
-	static void onDonePreview(LLMultiGesture* gesture, void* data);
+    static void onDonePreview(LLMultiGesture* gesture, void* data);
 
     static void finishInventoryUpload(LLUUID itemId, LLUUID newAssetId);
 private:
-	// LLPreview contains mDescEditor
-	LLLineEditor*	mTriggerEditor;
-	LLTextBox*		mReplaceText;
-	LLLineEditor*	mReplaceEditor;
-	LLComboBox*		mModifierCombo;
-	LLComboBox*		mKeyCombo;
-
-	LLScrollListCtrl*	mLibraryList;
-	LLButton*			mAddBtn;
-	LLButton*			mUpBtn;
-	LLButton*			mDownBtn;
-	LLButton*			mDeleteBtn;
-	LLScrollListCtrl*	mStepList;
-
-	// Options panels for items in gesture list
-	LLTextBox*			mOptionsText;
-	LLRadioGroup*		mAnimationRadio;
-	LLComboBox*			mAnimationCombo;
-	LLComboBox*			mSoundCombo;
-	LLLineEditor*		mChatEditor;
-	LLCheckBoxCtrl*		mWaitKeyReleaseCheck;
-	LLCheckBoxCtrl*		mWaitAnimCheck;
-	LLCheckBoxCtrl*		mWaitTimeCheck;
-	LLLineEditor*		mWaitTimeEditor;
-
-	LLCheckBoxCtrl*		mActiveCheck;
-	LLButton*			mSaveBtn;
-	LLButton*			mPreviewBtn;
-
-	LLMultiGesture*		mPreviewGesture;
-	BOOL mDirty;
+    // LLPreview contains mDescEditor
+    LLLineEditor*   mTriggerEditor;
+    LLTextBox*      mReplaceText;
+    LLLineEditor*   mReplaceEditor;
+    LLComboBox*     mModifierCombo;
+    LLComboBox*     mKeyCombo;
+
+    LLScrollListCtrl*   mLibraryList;
+    LLButton*           mAddBtn;
+    LLButton*           mUpBtn;
+    LLButton*           mDownBtn;
+    LLButton*           mDeleteBtn;
+    LLScrollListCtrl*   mStepList;
+
+    // Options panels for items in gesture list
+    LLTextBox*          mOptionsText;
+    LLRadioGroup*       mAnimationRadio;
+    LLComboBox*         mAnimationCombo;
+    LLComboBox*         mSoundCombo;
+    LLLineEditor*       mChatEditor;
+    LLCheckBoxCtrl*     mWaitKeyReleaseCheck;
+    LLCheckBoxCtrl*     mWaitAnimCheck;
+    LLCheckBoxCtrl*     mWaitTimeCheck;
+    LLLineEditor*       mWaitTimeEditor;
+
+    LLCheckBoxCtrl*     mActiveCheck;
+    LLButton*           mSaveBtn;
+    LLButton*           mPreviewBtn;
+
+    LLMultiGesture*     mPreviewGesture;
+    BOOL mDirty;
 };
 
 #endif // LL_LLPREVIEWGESTURE_H