From 3c5f97ad5e46f94b2fe865e891d8bb4a0188b3a2 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 9 Dec 2014 12:03:37 -0500
Subject: update dictionaries to a single common platform build

---
 autobuild.xml | 42 +++---------------------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index f01253f356..44b259efc5 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -374,52 +374,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>1f300f7b8600a18cd4c958841bfa2a95</string>
+              <string>a62723a6deea8187702a2f926e98a35f</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-dictionaries/rev/292421/arch/Linux/installer/dictionaries-1-common-292421.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/297347/arch/Linux/installer/dictionaries-1.297347-common-297347.tar.bz2</string>
             </map>
             <key>name</key>
             <string>common</string>
           </map>
-          <key>darwin</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>8020ed54e8fa847566ad79f01cd3b5c7</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/295026/arch/Darwin/installer/dictionaries-1.295026-darwin-295026.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>darwin</string>
-          </map>
-          <key>linux</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>ef326a36094238ce4ccfb0af69d2876f</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/295189/arch/Linux/installer/dictionaries-1.295189-linux-295189.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux</string>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>b0e66bcb304bef0c7715e0475529f7a8</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/296922/arch/CYGWIN/installer/dictionaries-1.296922-windows-296922.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows</string>
-          </map>
         </map>
         <key>version</key>
-        <string>1.296922</string>
+        <string>1.297347</string>
       </map>
       <key>elfio</key>
       <map>
-- 
cgit v1.2.3


From e6a7ce08ed368e31c495156b5146a5f256583669 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 12 Dec 2014 17:21:24 -0500
Subject: fix dos line endings

---
 indra/llcommon/lltraceaccumulators.h | 40 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h
index 6e048535e3..6f27b97dff 100644
--- a/indra/llcommon/lltraceaccumulators.h
+++ b/indra/llcommon/lltraceaccumulators.h
@@ -62,16 +62,16 @@ namespace LLTrace
 		{}
 
 	public:
-		AccumulatorBuffer()
-			: mStorageSize(0),
-			mStorage(NULL)
-		{
-			const AccumulatorBuffer& other = *getDefaultBuffer();
-			resize(sNextStorageSlot);
-			for (S32 i = 0; i < sNextStorageSlot; i++)
-			{
-				mStorage[i] = other.mStorage[i];
-			}
+		AccumulatorBuffer()
+			: mStorageSize(0),
+			mStorage(NULL)
+		{
+			const AccumulatorBuffer& other = *getDefaultBuffer();
+			resize(sNextStorageSlot);
+			for (S32 i = 0; i < sNextStorageSlot; i++)
+			{
+				mStorage[i] = other.mStorage[i];
+			}
 		}
 
 		~AccumulatorBuffer()
@@ -94,16 +94,16 @@ namespace LLTrace
 		}
 
 
-		AccumulatorBuffer(const AccumulatorBuffer& other)
-			: mStorageSize(0),
-			mStorage(NULL)
-		{
-			resize(sNextStorageSlot);
-			for (S32 i = 0; i < sNextStorageSlot; i++)
-			{
-				mStorage[i] = other.mStorage[i];
-			}
-		}
+		AccumulatorBuffer(const AccumulatorBuffer& other)
+			: mStorageSize(0),
+			mStorage(NULL)
+		{
+			resize(sNextStorageSlot);
+			for (S32 i = 0; i < sNextStorageSlot; i++)
+			{
+				mStorage[i] = other.mStorage[i];
+			}
+		}
 
 		void addSamples(const AccumulatorBuffer<ACCUMULATOR>& other, EBufferAppendType append_type)
 		{
-- 
cgit v1.2.3