Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev

merge maint-a (including maint-x) into gltf_development

1 files changed, 32 insertions, 32 deletions

diff --git a/indra/llui/llundo.h b/indra/llui/llundo.h
index f7ca6f66d2..dc40702be0 100644
--- a/indra/llui/llundo.h
+++ b/indra/llui/llundo.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llundo.h
  * @brief Generic interface for undo/redo circular buffer.
  *
  * $LicenseInfo:firstyear=2000&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$
  */
@@ -31,38 +31,38 @@
 class LLUndoBuffer
 {
 public:
-	class LLUndoAction
-	{
-		friend class LLUndoBuffer;
-	public:
-		virtual void undo() = 0;
-		virtual void redo() = 0;
-		virtual void cleanup() {};
-	protected:
-		LLUndoAction(): mClusterID(0) {};
-		virtual ~LLUndoAction(){};
-	private:
-		S32		mClusterID;
-	};
+    class LLUndoAction
+    {
+        friend class LLUndoBuffer;
+    public:
+        virtual void undo() = 0;
+        virtual void redo() = 0;
+        virtual void cleanup() {};
+    protected:
+        LLUndoAction(): mClusterID(0) {};
+        virtual ~LLUndoAction(){};
+    private:
+        S32     mClusterID;
+    };
 
-	LLUndoBuffer( LLUndoAction (*create_func()), S32 initial_count );
-	virtual ~LLUndoBuffer();
+    LLUndoBuffer( LLUndoAction (*create_func()), S32 initial_count );
+    virtual ~LLUndoBuffer();
 
-	LLUndoAction *getNextAction(bool setClusterBegin = true);
-	bool undoAction();
-	bool redoAction();
-	bool canUndo() { return (mNextAction != mFirstAction); }
-	bool canRedo() { return (mNextAction != mLastAction); }
+    LLUndoAction *getNextAction(bool setClusterBegin = true);
+    bool undoAction();
+    bool redoAction();
+    bool canUndo() { return (mNextAction != mFirstAction); }
+    bool canRedo() { return (mNextAction != mLastAction); }
 
-	void flushActions();
+    void flushActions();
 
 private:
-	LLUndoAction **mActions;	// array of pointers to undoactions
-	S32			mNumActions;	// total number of actions in ring buffer
-	S32			mNextAction;	// next action to perform undo/redo on
-	S32			mLastAction;	// last action actually added to undo buffer
-	S32			mFirstAction;	// beginning of ring buffer (don't undo any further)
-	S32			mOperationID;	// current operation id, for undoing and redoing in clusters
+    LLUndoAction **mActions;    // array of pointers to undoactions
+    S32         mNumActions;    // total number of actions in ring buffer
+    S32         mNextAction;    // next action to perform undo/redo on
+    S32         mLastAction;    // last action actually added to undo buffer
+    S32         mFirstAction;   // beginning of ring buffer (don't undo any further)
+    S32         mOperationID;   // current operation id, for undoing and redoing in clusters
 };
 
 #endif //LL_LLUNDO_H