From 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 19 Feb 2008 21:42:32 +0000
Subject: merge
 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986
 : 80178 -> release.

QAR-290 = QAR-271 + QAR-191
---
 indra/llui/llundo.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'indra/llui/llundo.cpp')

diff --git a/indra/llui/llundo.cpp b/indra/llui/llundo.cpp
index 6fd5d08654..8104351d11 100644
--- a/indra/llui/llundo.cpp
+++ b/indra/llui/llundo.cpp
@@ -1,6 +1,5 @@
 /** 
  * @file llundo.cpp
- * @brief LLUndo class
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -29,12 +28,8 @@
  * $/LicenseInfo$
  */
 
-// Generic interface for undo/redo circular buffer
-
 #include "linden_common.h"
-
 #include "llundo.h"
-#include "llerror.h"
 
 
 // TODO:
@@ -82,7 +77,7 @@ LLUndoBuffer::~LLUndoBuffer()
 //-----------------------------------------------------------------------------
 // getNextAction()
 //-----------------------------------------------------------------------------
-LLUndoAction *LLUndoBuffer::getNextAction(BOOL setClusterBegin)
+LLUndoBuffer::LLUndoAction* LLUndoBuffer::getNextAction(BOOL setClusterBegin)
 {
 	LLUndoAction *nextAction = mActions[mNextAction];
 
-- 
cgit v1.2.3