From 6d52efe452aa8469e0343da1c7d108f3f52ab651 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 27 Feb 2008 18:58:14 +0000
Subject: Merge of windlight into release (QAR-286).  This includes all changes
 in windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
---
 indra/llcommon/llfasttimer.h   | 7 ++++++-
 indra/llcommon/llfile.cpp      | 1 +
 indra/llcommon/llkeythrottle.h | 5 +----
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 3c7232daa8..e92f04441c 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -62,6 +62,7 @@ public:
 		FTM_SIMULATE_PARTICLES,
 		FTM_UPDATE_SKY,
 		FTM_UPDATE_TEXTURES,
+		FTM_UPDATE_WLPARAM,
 		FTM_UPDATE_WATER,
 		FTM_UPDATE_CLOUDS,
 		FTM_UPDATE_GRASS,
@@ -86,8 +87,12 @@ public:
 		 FTM_RENDER_HUD,
 		 FTM_RENDER_PARTICLES,
 		 FTM_RENDER_WATER,
+		 FTM_RENDER_WL_SKY,
+		 FTM_RENDER_FAKE_VBO_UPDATE,
 		FTM_RENDER_TIMER,
 		FTM_RENDER_UI,
+		FTM_RENDER_BLOOM,
+			FTM_RENDER_BLOOM_FBO,		
 		FTM_RENDER_FONTS,
 		
 		// newview specific
@@ -124,6 +129,7 @@ public:
 		FTM_GEO_RESERVE,
 		FTM_GEO_LIGHT,
 		FTM_GEO_SHADOW,
+		FTM_GEO_SKY,
 		FTM_GEN_VOLUME,
 		FTM_GEN_TRIANGLES,
 		FTM_GEN_FLEX,
@@ -150,7 +156,6 @@ public:
 		FTM_PIPELINE,
 		FTM_VFILE_WAIT,
 		FTM_FLEXIBLE_UPDATE,
-		FTM_OCCLUSION,
 		FTM_OCCLUSION_READBACK,
 		FTM_HUD_EFFECTS,
 		FTM_HUD_UPDATE,
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp
index 241b13f84f..2a18e5c64c 100644
--- a/indra/llcommon/llfile.cpp
+++ b/indra/llcommon/llfile.cpp
@@ -286,6 +286,7 @@ llofstream::llofstream(const char *_Filename,
 
 llofstream::~llofstream()
 {	// destroy the object
+	close();
 	delete _Filebuffer;
 }
 
diff --git a/indra/llcommon/llkeythrottle.h b/indra/llcommon/llkeythrottle.h
index 775ecdfc99..d831eadd59 100644
--- a/indra/llcommon/llkeythrottle.h
+++ b/indra/llcommon/llkeythrottle.h
@@ -192,10 +192,7 @@ public:
 	{
 		noteAction(id);
 		typename LLKeyThrottleImpl<T>::Entry& curr = (*m.currMap)[id];
-		if (curr.count < m.countLimit)
-		{
-			curr.count = m.countLimit;
-		}
+		curr.count = llmax(m.countLimit, curr.count);
 		curr.blocked = TRUE;
 	}
 
-- 
cgit v1.3