1 files changed, 26 insertions, 10 deletions

diff --git a/linden/indra/llcommon/llkeythrottle.h b/linden/indra/llcommon/llkeythrottle.h
index 26009bb..c2dc9d2 100644
--- a/linden/indra/llcommon/llkeythrottle.h
+++ b/linden/indra/llcommon/llkeythrottle.h
@@ -1,17 +1,26 @@
 /** 
  * @file llkeythrottle.h
- * @brief LLKeyThrottle class definition
  *
- * $LicenseInfo:firstyear=2005&license=internal$
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
  * Copyright (c) 2005-2008, Linden Research, Inc.
  * 
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") previously entered between you and Linden
- * Lab. By accessing, using, copying, modifying or distributing this
- * software, you acknowledge that you have been informed of your
- * obligations under the Agreement and agree to abide by those obligations.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
@@ -34,11 +43,16 @@
 #include <map>
 
 
+// forward declaration so LLKeyThrottleImpl can befriend it
+template <class T> class LLKeyThrottle;
+
+
 // Implementation utility class - use LLKeyThrottle, not this
 template <class T>
 class LLKeyThrottleImpl
 {
-public:
+        friend class LLKeyThrottle<T>;
+protected:
         struct Entry {
                 U32             count;
                 BOOL    blocked;
@@ -60,7 +74,9 @@ public:
                 // currMap started counting at this time
                 // prevMap covers the previous interval
         
-        LLKeyThrottleImpl() : prevMap(0), currMap(0) { }
+        LLKeyThrottleImpl() : prevMap(0), currMap(0),
+                              countLimit(0), interval_usec(0),
+                              start_usec(0) { };
 
         static U64 getTime()
         {