From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/llcommon/llerror.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/llerror.cpp')

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 95038bea4c..fa3a01c191 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -168,7 +168,7 @@ namespace {
 	
 	private:
 		bool mTimestamp;
-		typedef enum ANSIState {ANSI_PROBE, ANSI_YES, ANSI_NO};
+		enum ANSIState {ANSI_PROBE, ANSI_YES, ANSI_NO};
 		ANSIState mUseANSI;
 		void colorANSI(const std::string color)
 		{
-- 
cgit v1.2.3