#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed

1 files changed, 440 insertions, 440 deletions

diff --git a/indra/newview/tests/llviewerassetstats_test.cpp b/indra/newview/tests/llviewerassetstats_test.cpp
index e2e7f09c3b..278de5f31c 100644
--- a/indra/newview/tests/llviewerassetstats_test.cpp
+++ b/indra/newview/tests/llviewerassetstats_test.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llviewerassetstats_tut.cpp
  * @date 2010-10-28
  * @brief Test cases for some of newview/llviewerassetstats.cpp
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2010&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -40,88 +40,88 @@
 
 namespace LLStatViewer
 {
-	LLTrace::SampleStatHandle<>		FPS_SAMPLE("fpssample");
+    LLTrace::SampleStatHandle<>     FPS_SAMPLE("fpssample");
 }
 
 void LLVOAvatar::getNearbyRezzedStats(std::vector<S32>& counts)
 {
-	counts.resize(3);
-	counts[0] = 0;
-	counts[1] = 0;
-	counts[2] = 1;
+    counts.resize(3);
+    counts[0] = 0;
+    counts[1] = 0;
+    counts[2] = 1;
 }
 
 // static
 std::string LLVOAvatar::rezStatusToString(S32 rez_status)
 {
-	if (rez_status==0) return "cloud";
-	if (rez_status==1) return "gray";
-	if (rez_status==2) return "textured";
-	return "unknown";
+    if (rez_status==0) return "cloud";
+    if (rez_status==1) return "gray";
+    if (rez_status==2) return "textured";
+    return "unknown";
 }
 
 // static
 LLViewerStats::StatsAccumulator& LLViewerStats::PhaseMap::getPhaseStats(const std::string& phase_name)
 {
-	static LLViewerStats::StatsAccumulator junk;
-	return junk;
+    static LLViewerStats::StatsAccumulator junk;
+    return junk;
 }
 
-static const char * all_keys[] = 
+static const char * all_keys[] =
 {
-	"duration",
-	"fps",
-	"get_other_http",
-	"get_other_udp",
-	"get_texture_temp_http",
-	"get_texture_temp_udp",
-	"get_texture_non_temp_http",
-	"get_texture_non_temp_udp",
-	"get_wearable_http",
-	"get_wearable_udp",
-	"get_sound_http",
-	"get_sound_udp",
-	"get_gesture_http",
-	"get_gesture_udp"
+    "duration",
+    "fps",
+    "get_other_http",
+    "get_other_udp",
+    "get_texture_temp_http",
+    "get_texture_temp_udp",
+    "get_texture_non_temp_http",
+    "get_texture_non_temp_udp",
+    "get_wearable_http",
+    "get_wearable_udp",
+    "get_sound_http",
+    "get_sound_udp",
+    "get_gesture_http",
+    "get_gesture_udp"
 };
 
-static const char * resp_keys[] = 
+static const char * resp_keys[] =
 {
-	"get_other_http",
-	"get_other_udp",
-	"get_texture_temp_http",
-	"get_texture_temp_udp",
-	"get_texture_non_temp_http",
-	"get_texture_non_temp_udp",
-	"get_wearable_http",
-	"get_wearable_udp",
-	"get_sound_http",
-	"get_sound_udp",
-	"get_gesture_http",
-	"get_gesture_udp"
+    "get_other_http",
+    "get_other_udp",
+    "get_texture_temp_http",
+    "get_texture_temp_udp",
+    "get_texture_non_temp_http",
+    "get_texture_non_temp_udp",
+    "get_wearable_http",
+    "get_wearable_udp",
+    "get_sound_http",
+    "get_sound_udp",
+    "get_gesture_http",
+    "get_gesture_udp"
 };
 
 static const char * sub_keys[] =
 {
-	"dequeued",
-	"enqueued",
-	"resp_count",
-	"resp_max",
-	"resp_min",
-	"resp_mean"
+    "dequeued",
+    "enqueued",
+    "resp_count",
+    "resp_max",
+    "resp_min",
+    "resp_mean"
 };
 
-static const char * mmm_resp_keys[] = 
+static const char * mmm_resp_keys[] =
 {
-	"fps"
+    "fps"
 };
 
 static const char * mmm_sub_keys[] =
 {
-	"count",
-	"max",
-	"min",
-	"mean"
+    "count",
+    "max",
+    "min",
+    "mean"
 };
 
 static const LLUUID region1("4e2d81a3-6263-6ffe-ad5c-8ce04bee07e8");
@@ -135,7 +135,7 @@ static const std::string region2_handle_str("0000030000004200");
 static bool
 is_empty_map(const LLSD & sd)
 {
-	return sd.isMap() && 0 == sd.size();
+    return sd.isMap() && 0 == sd.size();
 }
 #endif
 
@@ -143,433 +143,433 @@ is_empty_map(const LLSD & sd)
 static bool
 is_single_key_map(const LLSD & sd, const std::string & key)
 {
-	return sd.isMap() && 1 == sd.size() && sd.has(key);
+    return sd.isMap() && 1 == sd.size() && sd.has(key);
 }
 #endif
 
 static bool
 is_double_key_map(const LLSD & sd, const std::string & key1, const std::string & key2)
 {
-	return sd.isMap() && 2 == sd.size() && sd.has(key1) && sd.has(key2);
+    return sd.isMap() && 2 == sd.size() && sd.has(key1) && sd.has(key2);
 }
 
 #if 0
 static bool
 is_triple_key_map(const LLSD & sd, const std::string & key1, const std::string & key2, const std::string& key3)
 {
-	return sd.isMap() && 3 == sd.size() && sd.has(key1) && sd.has(key2) && sd.has(key3);
+    return sd.isMap() && 3 == sd.size() && sd.has(key1) && sd.has(key2) && sd.has(key3);
 }
 #endif
 
 static bool
 is_no_stats_map(const LLSD & sd)
 {
-	return is_double_key_map(sd, "duration", "regions");
+    return is_double_key_map(sd, "duration", "regions");
 }
 
 static bool
 is_single_slot_array(const LLSD & sd, U64 region_handle)
 {
-	U32 grid_x(0), grid_y(0);
-	grid_from_region_handle(region_handle, &grid_x, &grid_y);
-	
-	return (sd.isArray() &&
-			1 == sd.size() &&
-			sd[0].has("grid_x") &&
-			sd[0].has("grid_y") &&
-			sd[0]["grid_x"].isInteger() &&
-			sd[0]["grid_y"].isInteger() &&
-			grid_x == sd[0]["grid_x"].asInteger() &&
-			grid_y == sd[0]["grid_y"].asInteger());
+    U32 grid_x(0), grid_y(0);
+    grid_from_region_handle(region_handle, &grid_x, &grid_y);
+
+    return (sd.isArray() &&
+            1 == sd.size() &&
+            sd[0].has("grid_x") &&
+            sd[0].has("grid_y") &&
+            sd[0]["grid_x"].isInteger() &&
+            sd[0]["grid_y"].isInteger() &&
+            grid_x == sd[0]["grid_x"].asInteger() &&
+            grid_y == sd[0]["grid_y"].asInteger());
 }
 
 static bool
 is_double_slot_array(const LLSD & sd, U64 region_handle1, U64 region_handle2)
 {
-	U32 grid_x1(0), grid_y1(0);
-	U32 grid_x2(0), grid_y2(0);
-	grid_from_region_handle(region_handle1, &grid_x1, &grid_y1);
-	grid_from_region_handle(region_handle2, &grid_x2, &grid_y2);
-	
-	return (sd.isArray() &&
-			2 == sd.size() &&
-			sd[0].has("grid_x") &&
-			sd[0].has("grid_y") &&
-			sd[0]["grid_x"].isInteger() &&
-			sd[0]["grid_y"].isInteger() &&
-			sd[1].has("grid_x") &&
-			sd[1].has("grid_y") &&
-			sd[1]["grid_x"].isInteger() &&
-			sd[1]["grid_y"].isInteger() &&
-			((grid_x1 == sd[0]["grid_x"].asInteger() &&
-			  grid_y1 == sd[0]["grid_y"].asInteger() &&
-			  grid_x2 == sd[1]["grid_x"].asInteger() &&
-			  grid_y2 == sd[1]["grid_y"].asInteger()) ||
-			 (grid_x1 == sd[1]["grid_x"].asInteger() &&
-			  grid_y1 == sd[1]["grid_y"].asInteger() &&
-			  grid_x2 == sd[0]["grid_x"].asInteger() &&
-			  grid_y2 == sd[0]["grid_y"].asInteger())));
+    U32 grid_x1(0), grid_y1(0);
+    U32 grid_x2(0), grid_y2(0);
+    grid_from_region_handle(region_handle1, &grid_x1, &grid_y1);
+    grid_from_region_handle(region_handle2, &grid_x2, &grid_y2);
+
+    return (sd.isArray() &&
+            2 == sd.size() &&
+            sd[0].has("grid_x") &&
+            sd[0].has("grid_y") &&
+            sd[0]["grid_x"].isInteger() &&
+            sd[0]["grid_y"].isInteger() &&
+            sd[1].has("grid_x") &&
+            sd[1].has("grid_y") &&
+            sd[1]["grid_x"].isInteger() &&
+            sd[1]["grid_y"].isInteger() &&
+            ((grid_x1 == sd[0]["grid_x"].asInteger() &&
+              grid_y1 == sd[0]["grid_y"].asInteger() &&
+              grid_x2 == sd[1]["grid_x"].asInteger() &&
+              grid_y2 == sd[1]["grid_y"].asInteger()) ||
+             (grid_x1 == sd[1]["grid_x"].asInteger() &&
+              grid_y1 == sd[1]["grid_y"].asInteger() &&
+              grid_x2 == sd[0]["grid_x"].asInteger() &&
+              grid_y2 == sd[0]["grid_y"].asInteger())));
 }
 
 static LLSD
 get_region(const LLSD & sd, U64 region_handle1)
 {
-	U32 grid_x(0), grid_y(0);
-	grid_from_region_handle(region_handle1, &grid_x, &grid_y);
-
-	for (LLSD::array_const_iterator it(sd["regions"].beginArray());
-		 sd["regions"].endArray() != it;
-		 ++it)
-	{
-		if ((*it).has("grid_x") &&
-			(*it).has("grid_y") &&
-			(*it)["grid_x"].isInteger() &&
-			(*it)["grid_y"].isInteger() &&
-			(*it)["grid_x"].asInteger() == grid_x &&
-			(*it)["grid_y"].asInteger() == grid_y)
-		{
-			return *it;
-		}
-	}
-	return LLSD();
+    U32 grid_x(0), grid_y(0);
+    grid_from_region_handle(region_handle1, &grid_x, &grid_y);
+
+    for (LLSD::array_const_iterator it(sd["regions"].beginArray());
+         sd["regions"].endArray() != it;
+         ++it)
+    {
+        if ((*it).has("grid_x") &&
+            (*it).has("grid_y") &&
+            (*it)["grid_x"].isInteger() &&
+            (*it)["grid_y"].isInteger() &&
+            (*it)["grid_x"].asInteger() == grid_x &&
+            (*it)["grid_y"].asInteger() == grid_y)
+        {
+            return *it;
+        }
+    }
+    return LLSD();
 }
 
 namespace tut
 {
-	struct tst_viewerassetstats_index
-	{
-		tst_viewerassetstats_index()
-		{
-			LLTrace::set_master_thread_recorder(&mThreadRecorder);
-		}
-
-		~tst_viewerassetstats_index()
-		{
-			LLTrace::set_master_thread_recorder(NULL);
-		}
-
-		LLTrace::ThreadRecorder mThreadRecorder;
-	};
-	typedef test_group<tst_viewerassetstats_index> tst_viewerassetstats_index_t;
-	typedef tst_viewerassetstats_index_t::object tst_viewerassetstats_index_object_t;
-	tut::tst_viewerassetstats_index_t tut_tst_viewerassetstats_index("tst_viewerassetstats_test");
-
-	// Testing free functions without global stats allocated
-	template<> template<>
-	void tst_viewerassetstats_index_object_t::test<1>()
-	{
-		// Check that helpers aren't bothered by missing global stats
-		ensure("Global gViewerAssetStats should be NULL", (NULL == gViewerAssetStats));
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
-
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
-
-		LLViewerAssetStatsFF::record_response(LLViewerAssetType::AT_GESTURE, false, false, (U64Microseconds)12300000ULL);
-	}
-
-	// Create a non-global instance and check the structure
-	template<> template<>
-	void tst_viewerassetstats_index_object_t::test<2>()
-	{
-		ensure("Global gViewerAssetStats should be NULL", (NULL == gViewerAssetStats));
-
-		LLViewerAssetStats * it = new LLViewerAssetStats();
-
-		ensure("Global gViewerAssetStats should still be NULL", (NULL == gViewerAssetStats));
-
-		LLSD sd_full = it->asLLSD(false);
-
-		// Default (NULL) region ID doesn't produce LLSD results so should
-		// get an empty map back from output
-		ensure("Stat-less LLSD initially", is_no_stats_map(sd_full));
-
-		// Once the region is set, we will get a response even with no data collection
-		it->setRegion(region1_handle);
-		sd_full = it->asLLSD(false);
-		ensure("Correct single-key LLSD map root", is_double_key_map(sd_full, "duration", "regions"));
-		ensure("Correct single-slot LLSD array regions", is_single_slot_array(sd_full["regions"], region1_handle));
-		
-		LLSD sd = sd_full["regions"][0];
-
-		delete it;
-			
-		// Check the structure of the LLSD
-		for (int i = 0; i < LL_ARRAY_SIZE(all_keys); ++i)
-		{
-			std::string line = llformat("Has '%s' key", all_keys[i]);
-			ensure(line, sd.has(all_keys[i]));
-		}
-
-		for (int i = 0; i < LL_ARRAY_SIZE(resp_keys); ++i)
-		{
-			for (int j = 0; j < LL_ARRAY_SIZE(sub_keys); ++j)
-			{
-				std::string line = llformat("Key '%s' has '%s' key", resp_keys[i], sub_keys[j]);
-				ensure(line, sd[resp_keys[i]].has(sub_keys[j]));
-			}
-		}
-
-		for (int i = 0; i < LL_ARRAY_SIZE(mmm_resp_keys); ++i)
-		{
-			for (int j = 0; j < LL_ARRAY_SIZE(mmm_sub_keys); ++j)
-			{
-				std::string line = llformat("Key '%s' has '%s' key", mmm_resp_keys[i], mmm_sub_keys[j]);
-				ensure(line, sd[mmm_resp_keys[i]].has(mmm_sub_keys[j]));
-			}
-		}
-	}
-
-	// Create a non-global instance and check some content
-	template<> template<>
-	void tst_viewerassetstats_index_object_t::test<3>()
-	{
-		LLViewerAssetStats * it = new LLViewerAssetStats();
-		it->setRegion(region1_handle);
-		
-		LLSD sd = it->asLLSD(false);
-		ensure("Correct single-key LLSD map root", is_double_key_map(sd, "regions", "duration"));
-		ensure("Correct single-slot LLSD array regions", is_single_slot_array(sd["regions"], region1_handle));
-		sd = sd[0];
-		
-		delete it;
-
-		// Check a few points on the tree for content
-		ensure("sd[get_texture_temp_http][dequeued] is 0", (0 == sd["get_texture_temp_http"]["dequeued"].asInteger()));
-		ensure("sd[get_sound_udp][resp_min] is 0", (0.0 == sd["get_sound_udp"]["resp_min"].asReal()));
-	}
-
-	// Create a global instance and verify free functions do something useful
-	template<> template<>
-	void tst_viewerassetstats_index_object_t::test<4>()
-	{
-		gViewerAssetStats = new LLViewerAssetStats();
-		LLViewerAssetStatsFF::set_region(region1_handle);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
-
-		LLSD sd = gViewerAssetStats->asLLSD(false);
-		ensure("Correct single-key LLSD map root", is_double_key_map(sd, "regions", "duration"));
-		ensure("Correct single-slot LLSD array regions", is_single_slot_array(sd["regions"], region1_handle));
-		sd = sd["regions"][0];
-		
-		// Check a few points on the tree for content
-		ensure("sd[get_texture_non_temp_udp][enqueued] is 1", (1 == sd["get_texture_non_temp_udp"]["enqueued"].asInteger()));
-		ensure("sd[get_texture_temp_udp][enqueued] is 0", (0 == sd["get_texture_temp_udp"]["enqueued"].asInteger()));
-		ensure("sd[get_texture_non_temp_http][enqueued] is 0", (0 == sd["get_texture_non_temp_http"]["enqueued"].asInteger()));
-		ensure("sd[get_texture_temp_http][enqueued] is 0", (0 == sd["get_texture_temp_http"]["enqueued"].asInteger()));
-		ensure("sd[get_gesture_udp][dequeued] is 0", (0 == sd["get_gesture_udp"]["dequeued"].asInteger()));
-
-		// Reset and check zeros...
-		// Reset leaves current region in place
-		gViewerAssetStats->reset();
-		sd = gViewerAssetStats->asLLSD(false)["regions"][region1_handle_str];
-		
-		delete gViewerAssetStats;
-		gViewerAssetStats = NULL;
-
-		ensure("sd[get_texture_non_temp_udp][enqueued] is reset", (0 == sd["get_texture_non_temp_udp"]["enqueued"].asInteger()));
-		ensure("sd[get_gesture_udp][dequeued] is reset", (0 == sd["get_gesture_udp"]["dequeued"].asInteger()));
-	}
+    struct tst_viewerassetstats_index
+    {
+        tst_viewerassetstats_index()
+        {
+            LLTrace::set_master_thread_recorder(&mThreadRecorder);
+        }
+
+        ~tst_viewerassetstats_index()
+        {
+            LLTrace::set_master_thread_recorder(NULL);
+        }
+
+        LLTrace::ThreadRecorder mThreadRecorder;
+    };
+    typedef test_group<tst_viewerassetstats_index> tst_viewerassetstats_index_t;
+    typedef tst_viewerassetstats_index_t::object tst_viewerassetstats_index_object_t;
+    tut::tst_viewerassetstats_index_t tut_tst_viewerassetstats_index("tst_viewerassetstats_test");
+
+    // Testing free functions without global stats allocated
+    template<> template<>
+    void tst_viewerassetstats_index_object_t::test<1>()
+    {
+        // Check that helpers aren't bothered by missing global stats
+        ensure("Global gViewerAssetStats should be NULL", (NULL == gViewerAssetStats));
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
+
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
+
+        LLViewerAssetStatsFF::record_response(LLViewerAssetType::AT_GESTURE, false, false, (U64Microseconds)12300000ULL);
+    }
+
+    // Create a non-global instance and check the structure
+    template<> template<>
+    void tst_viewerassetstats_index_object_t::test<2>()
+    {
+        ensure("Global gViewerAssetStats should be NULL", (NULL == gViewerAssetStats));
+
+        LLViewerAssetStats * it = new LLViewerAssetStats();
+
+        ensure("Global gViewerAssetStats should still be NULL", (NULL == gViewerAssetStats));
+
+        LLSD sd_full = it->asLLSD(false);
+
+        // Default (NULL) region ID doesn't produce LLSD results so should
+        // get an empty map back from output
+        ensure("Stat-less LLSD initially", is_no_stats_map(sd_full));
+
+        // Once the region is set, we will get a response even with no data collection
+        it->setRegion(region1_handle);
+        sd_full = it->asLLSD(false);
+        ensure("Correct single-key LLSD map root", is_double_key_map(sd_full, "duration", "regions"));
+        ensure("Correct single-slot LLSD array regions", is_single_slot_array(sd_full["regions"], region1_handle));
+
+        LLSD sd = sd_full["regions"][0];
+
+        delete it;
+
+        // Check the structure of the LLSD
+        for (int i = 0; i < LL_ARRAY_SIZE(all_keys); ++i)
+        {
+            std::string line = llformat("Has '%s' key", all_keys[i]);
+            ensure(line, sd.has(all_keys[i]));
+        }
+
+        for (int i = 0; i < LL_ARRAY_SIZE(resp_keys); ++i)
+        {
+            for (int j = 0; j < LL_ARRAY_SIZE(sub_keys); ++j)
+            {
+                std::string line = llformat("Key '%s' has '%s' key", resp_keys[i], sub_keys[j]);
+                ensure(line, sd[resp_keys[i]].has(sub_keys[j]));
+            }
+        }
+
+        for (int i = 0; i < LL_ARRAY_SIZE(mmm_resp_keys); ++i)
+        {
+            for (int j = 0; j < LL_ARRAY_SIZE(mmm_sub_keys); ++j)
+            {
+                std::string line = llformat("Key '%s' has '%s' key", mmm_resp_keys[i], mmm_sub_keys[j]);
+                ensure(line, sd[mmm_resp_keys[i]].has(mmm_sub_keys[j]));
+            }
+        }
+    }
+
+    // Create a non-global instance and check some content
+    template<> template<>
+    void tst_viewerassetstats_index_object_t::test<3>()
+    {
+        LLViewerAssetStats * it = new LLViewerAssetStats();
+        it->setRegion(region1_handle);
+
+        LLSD sd = it->asLLSD(false);
+        ensure("Correct single-key LLSD map root", is_double_key_map(sd, "regions", "duration"));
+        ensure("Correct single-slot LLSD array regions", is_single_slot_array(sd["regions"], region1_handle));
+        sd = sd[0];
+
+        delete it;
+
+        // Check a few points on the tree for content
+        ensure("sd[get_texture_temp_http][dequeued] is 0", (0 == sd["get_texture_temp_http"]["dequeued"].asInteger()));
+        ensure("sd[get_sound_udp][resp_min] is 0", (0.0 == sd["get_sound_udp"]["resp_min"].asReal()));
+    }
+
+    // Create a global instance and verify free functions do something useful
+    template<> template<>
+    void tst_viewerassetstats_index_object_t::test<4>()
+    {
+        gViewerAssetStats = new LLViewerAssetStats();
+        LLViewerAssetStatsFF::set_region(region1_handle);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
+
+        LLSD sd = gViewerAssetStats->asLLSD(false);
+        ensure("Correct single-key LLSD map root", is_double_key_map(sd, "regions", "duration"));
+        ensure("Correct single-slot LLSD array regions", is_single_slot_array(sd["regions"], region1_handle));
+        sd = sd["regions"][0];
+
+        // Check a few points on the tree for content
+        ensure("sd[get_texture_non_temp_udp][enqueued] is 1", (1 == sd["get_texture_non_temp_udp"]["enqueued"].asInteger()));
+        ensure("sd[get_texture_temp_udp][enqueued] is 0", (0 == sd["get_texture_temp_udp"]["enqueued"].asInteger()));
+        ensure("sd[get_texture_non_temp_http][enqueued] is 0", (0 == sd["get_texture_non_temp_http"]["enqueued"].asInteger()));
+        ensure("sd[get_texture_temp_http][enqueued] is 0", (0 == sd["get_texture_temp_http"]["enqueued"].asInteger()));
+        ensure("sd[get_gesture_udp][dequeued] is 0", (0 == sd["get_gesture_udp"]["dequeued"].asInteger()));
+
+        // Reset and check zeros...
+        // Reset leaves current region in place
+        gViewerAssetStats->reset();
+        sd = gViewerAssetStats->asLLSD(false)["regions"][region1_handle_str];
+
+        delete gViewerAssetStats;
+        gViewerAssetStats = NULL;
+
+        ensure("sd[get_texture_non_temp_udp][enqueued] is reset", (0 == sd["get_texture_non_temp_udp"]["enqueued"].asInteger()));
+        ensure("sd[get_gesture_udp][dequeued] is reset", (0 == sd["get_gesture_udp"]["dequeued"].asInteger()));
+    }
 
     // Check multiple region collection
-	template<> template<>
-	void tst_viewerassetstats_index_object_t::test<5>()
-	{
-		gViewerAssetStats = new LLViewerAssetStats();
-
-		LLViewerAssetStatsFF::set_region(region1_handle);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
-		
-		LLViewerAssetStatsFF::set_region(region2_handle);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-
-		LLSD sd = gViewerAssetStats->asLLSD(false);
-
-		// std::cout << sd << std::endl;
-		
-		ensure("Correct double-key LLSD map root", is_double_key_map(sd, "duration", "regions"));
-		ensure("Correct double-slot LLSD array regions", is_double_slot_array(sd["regions"], region1_handle, region2_handle));
-		LLSD sd1 = get_region(sd, region1_handle);
-		LLSD sd2 = get_region(sd, region2_handle);
-		ensure("Region1 is present in results", sd1.isMap());
-		ensure("Region2 is present in results", sd2.isMap());
-		
-		// Check a few points on the tree for content
-		ensure_equals("sd1[get_texture_non_temp_udp][enqueued] is 1", sd1["get_texture_non_temp_udp"]["enqueued"].asInteger(), 1);
-		ensure_equals("sd1[get_texture_temp_udp][enqueued] is 0", sd1["get_texture_temp_udp"]["enqueued"].asInteger(), 0);
-		ensure_equals("sd1[get_texture_non_temp_http][enqueued] is 0", sd1["get_texture_non_temp_http"]["enqueued"].asInteger(), 0);
-		ensure_equals("sd1[get_texture_temp_http][enqueued] is 0", sd1["get_texture_temp_http"]["enqueued"].asInteger(), 0);
-		ensure_equals("sd1[get_gesture_udp][dequeued] is 0", sd1["get_gesture_udp"]["dequeued"].asInteger(), 0);
-
-		// Check a few points on the tree for content
-		ensure("sd2[get_gesture_udp][enqueued] is 4", (4 == sd2["get_gesture_udp"]["enqueued"].asInteger()));
-		ensure("sd2[get_gesture_udp][dequeued] is 0", (0 == sd2["get_gesture_udp"]["dequeued"].asInteger()));
-		ensure("sd2[get_texture_non_temp_udp][enqueued] is 0", (0 == sd2["get_texture_non_temp_udp"]["enqueued"].asInteger()));
-
-		// Reset and check zeros...
-		// Reset leaves current region in place
-		gViewerAssetStats->reset();
-		sd = gViewerAssetStats->asLLSD(false);
-		ensure("Correct single-key LLSD map root", is_double_key_map(sd, "regions", "duration"));
-		ensure("Correct single-slot LLSD array regions (p2)", is_single_slot_array(sd["regions"], region2_handle));
-		sd2 = sd["regions"][0];
-		
-		delete gViewerAssetStats;
-		gViewerAssetStats = NULL;
-
-		ensure("sd2[get_texture_non_temp_udp][enqueued] is reset", (0 == sd2["get_texture_non_temp_udp"]["enqueued"].asInteger()));
-		ensure("sd2[get_gesture_udp][enqueued] is reset", (0 == sd2["get_gesture_udp"]["enqueued"].asInteger()));
-	}
+    template<> template<>
+    void tst_viewerassetstats_index_object_t::test<5>()
+    {
+        gViewerAssetStats = new LLViewerAssetStats();
+
+        LLViewerAssetStatsFF::set_region(region1_handle);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
+
+        LLViewerAssetStatsFF::set_region(region2_handle);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+
+        LLSD sd = gViewerAssetStats->asLLSD(false);
+
+        // std::cout << sd << std::endl;
+
+        ensure("Correct double-key LLSD map root", is_double_key_map(sd, "duration", "regions"));
+        ensure("Correct double-slot LLSD array regions", is_double_slot_array(sd["regions"], region1_handle, region2_handle));
+        LLSD sd1 = get_region(sd, region1_handle);
+        LLSD sd2 = get_region(sd, region2_handle);
+        ensure("Region1 is present in results", sd1.isMap());
+        ensure("Region2 is present in results", sd2.isMap());
+
+        // Check a few points on the tree for content
+        ensure_equals("sd1[get_texture_non_temp_udp][enqueued] is 1", sd1["get_texture_non_temp_udp"]["enqueued"].asInteger(), 1);
+        ensure_equals("sd1[get_texture_temp_udp][enqueued] is 0", sd1["get_texture_temp_udp"]["enqueued"].asInteger(), 0);
+        ensure_equals("sd1[get_texture_non_temp_http][enqueued] is 0", sd1["get_texture_non_temp_http"]["enqueued"].asInteger(), 0);
+        ensure_equals("sd1[get_texture_temp_http][enqueued] is 0", sd1["get_texture_temp_http"]["enqueued"].asInteger(), 0);
+        ensure_equals("sd1[get_gesture_udp][dequeued] is 0", sd1["get_gesture_udp"]["dequeued"].asInteger(), 0);
+
+        // Check a few points on the tree for content
+        ensure("sd2[get_gesture_udp][enqueued] is 4", (4 == sd2["get_gesture_udp"]["enqueued"].asInteger()));
+        ensure("sd2[get_gesture_udp][dequeued] is 0", (0 == sd2["get_gesture_udp"]["dequeued"].asInteger()));
+        ensure("sd2[get_texture_non_temp_udp][enqueued] is 0", (0 == sd2["get_texture_non_temp_udp"]["enqueued"].asInteger()));
+
+        // Reset and check zeros...
+        // Reset leaves current region in place
+        gViewerAssetStats->reset();
+        sd = gViewerAssetStats->asLLSD(false);
+        ensure("Correct single-key LLSD map root", is_double_key_map(sd, "regions", "duration"));
+        ensure("Correct single-slot LLSD array regions (p2)", is_single_slot_array(sd["regions"], region2_handle));
+        sd2 = sd["regions"][0];
+
+        delete gViewerAssetStats;
+        gViewerAssetStats = NULL;
+
+        ensure("sd2[get_texture_non_temp_udp][enqueued] is reset", (0 == sd2["get_texture_non_temp_udp"]["enqueued"].asInteger()));
+        ensure("sd2[get_gesture_udp][enqueued] is reset", (0 == sd2["get_gesture_udp"]["enqueued"].asInteger()));
+    }
 
     // Check multiple region collection jumping back-and-forth between regions
-	template<> template<>
-	void tst_viewerassetstats_index_object_t::test<6>()
-	{
-		gViewerAssetStats = new LLViewerAssetStats();
+    template<> template<>
+    void tst_viewerassetstats_index_object_t::test<6>()
+    {
+        gViewerAssetStats = new LLViewerAssetStats();
+
+        LLViewerAssetStatsFF::set_region(region1_handle);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
+
+        LLViewerAssetStatsFF::set_region(region2_handle);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+
+        LLViewerAssetStatsFF::set_region(region1_handle);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, true, true);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, true, true);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
+
+        LLViewerAssetStatsFF::set_region(region2_handle);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
+
+        LLSD sd = gViewerAssetStats->asLLSD(false);
+
+        ensure("Correct double-key LLSD map root", is_double_key_map(sd, "duration", "regions"));
+        ensure("Correct double-slot LLSD array regions", is_double_slot_array(sd["regions"], region1_handle, region2_handle));
+        LLSD sd1 = get_region(sd, region1_handle);
+        LLSD sd2 = get_region(sd, region2_handle);
+        ensure("Region1 is present in results", sd1.isMap());
+        ensure("Region2 is present in results", sd2.isMap());
+
+        // Check a few points on the tree for content
+        ensure("sd1[get_texture_non_temp_udp][enqueued] is 1", (1 == sd1["get_texture_non_temp_udp"]["enqueued"].asInteger()));
+        ensure("sd1[get_texture_temp_udp][enqueued] is 0", (0 == sd1["get_texture_temp_udp"]["enqueued"].asInteger()));
+        ensure("sd1[get_texture_non_temp_http][enqueued] is 0", (0 == sd1["get_texture_non_temp_http"]["enqueued"].asInteger()));
+        ensure("sd1[get_texture_temp_http][enqueued] is 1", (1 == sd1["get_texture_temp_http"]["enqueued"].asInteger()));
+        ensure("sd1[get_gesture_udp][dequeued] is 0", (0 == sd1["get_gesture_udp"]["dequeued"].asInteger()));
+
+        // Check a few points on the tree for content
+        ensure("sd2[get_gesture_udp][enqueued] is 8", (8 == sd2["get_gesture_udp"]["enqueued"].asInteger()));
+        ensure("sd2[get_gesture_udp][dequeued] is 0", (0 == sd2["get_gesture_udp"]["dequeued"].asInteger()));
+        ensure("sd2[get_texture_non_temp_udp][enqueued] is 0", (0 == sd2["get_texture_non_temp_udp"]["enqueued"].asInteger()));
+
+        // Reset and check zeros...
+        // Reset leaves current region in place
+        gViewerAssetStats->reset();
+        sd = gViewerAssetStats->asLLSD(false);
+        ensure("Correct single-key LLSD map root", is_double_key_map(sd, "duration", "regions"));
+        ensure("Correct single-slot LLSD array regions (p2)", is_single_slot_array(sd["regions"], region2_handle));
+        sd2 = get_region(sd, region2_handle);
+        ensure("Region2 is present in results", sd2.isMap());
+
+        delete gViewerAssetStats;
+        gViewerAssetStats = NULL;
+
+        ensure_equals("sd2[get_texture_non_temp_udp][enqueued] is reset", sd2["get_texture_non_temp_udp"]["enqueued"].asInteger(), 0);
+        ensure_equals("sd2[get_gesture_udp][enqueued] is reset", sd2["get_gesture_udp"]["enqueued"].asInteger(), 0);
+    }
+
+    // Non-texture assets ignore transport and persistence flags
+    template<> template<>
+    void tst_viewerassetstats_index_object_t::test<7>()
+    {
+        gViewerAssetStats = new LLViewerAssetStats();
+        LLViewerAssetStatsFF::set_region(region1_handle);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, true);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, true);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, true, false);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, true, false);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, true, true);
+        LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, true, true);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_LSL_BYTECODE, false, false);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_LSL_BYTECODE, false, true);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_LSL_BYTECODE, true, false);
+
+        LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_LSL_BYTECODE, true, true);
+
+        LLSD sd = gViewerAssetStats->asLLSD(false);
+        ensure("Correct single-key LLSD map root", is_double_key_map(sd, "regions", "duration"));
+        ensure("Correct single-slot LLSD array regions", is_single_slot_array(sd["regions"], region1_handle));
+        sd = get_region(sd, region1_handle);
+        ensure("Region1 is present in results", sd.isMap());
+
+        // Check a few points on the tree for content
+        ensure("sd[get_gesture_udp][enqueued] is 0", (0 == sd["get_gesture_udp"]["enqueued"].asInteger()));
+        ensure("sd[get_gesture_udp][dequeued] is 0", (0 == sd["get_gesture_udp"]["dequeued"].asInteger()));
+
+        ensure("sd[get_wearable_http][enqueued] is 2", (2 == sd["get_wearable_http"]["enqueued"].asInteger()));
+        ensure("sd[get_wearable_http][dequeued] is 2", (2 == sd["get_wearable_http"]["dequeued"].asInteger()));
+
+        ensure("sd[get_wearable_udp][enqueued] is 2", (2 == sd["get_wearable_udp"]["enqueued"].asInteger()));
+        ensure("sd[get_wearable_udp][dequeued] is 2", (2 == sd["get_wearable_udp"]["dequeued"].asInteger()));
 
-		LLViewerAssetStatsFF::set_region(region1_handle);
+        ensure("sd[get_other_http][enqueued] is 2", (2 == sd["get_other_http"]["enqueued"].asInteger()));
+        ensure("sd[get_other_http][dequeued] is 0", (0 == sd["get_other_http"]["dequeued"].asInteger()));
 
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
-
-		LLViewerAssetStatsFF::set_region(region2_handle);
+        ensure("sd[get_other_udp][enqueued] is 2", (2 == sd["get_other_udp"]["enqueued"].asInteger()));
+        ensure("sd[get_other_udp][dequeued] is 0", (0 == sd["get_other_udp"]["dequeued"].asInteger()));
 
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-
-		LLViewerAssetStatsFF::set_region(region1_handle);
+        // Reset and check zeros...
+        // Reset leaves current region in place
+        gViewerAssetStats->reset();
+        sd = get_region(gViewerAssetStats->asLLSD(false), region1_handle);
+        ensure("Region1 is present in results", sd.isMap());
 
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, true, true);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, true, true);
+        delete gViewerAssetStats;
+        gViewerAssetStats = NULL;
 
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
-
-		LLViewerAssetStatsFF::set_region(region2_handle);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_GESTURE, false, false);
-
-		LLSD sd = gViewerAssetStats->asLLSD(false);
-
-		ensure("Correct double-key LLSD map root", is_double_key_map(sd, "duration", "regions"));
-		ensure("Correct double-slot LLSD array regions", is_double_slot_array(sd["regions"], region1_handle, region2_handle));
-		LLSD sd1 = get_region(sd, region1_handle);
-		LLSD sd2 = get_region(sd, region2_handle);
-		ensure("Region1 is present in results", sd1.isMap());
-		ensure("Region2 is present in results", sd2.isMap());
-		
-		// Check a few points on the tree for content
-		ensure("sd1[get_texture_non_temp_udp][enqueued] is 1", (1 == sd1["get_texture_non_temp_udp"]["enqueued"].asInteger()));
-		ensure("sd1[get_texture_temp_udp][enqueued] is 0", (0 == sd1["get_texture_temp_udp"]["enqueued"].asInteger()));
-		ensure("sd1[get_texture_non_temp_http][enqueued] is 0", (0 == sd1["get_texture_non_temp_http"]["enqueued"].asInteger()));
-		ensure("sd1[get_texture_temp_http][enqueued] is 1", (1 == sd1["get_texture_temp_http"]["enqueued"].asInteger()));
-		ensure("sd1[get_gesture_udp][dequeued] is 0", (0 == sd1["get_gesture_udp"]["dequeued"].asInteger()));
-
-		// Check a few points on the tree for content
-		ensure("sd2[get_gesture_udp][enqueued] is 8", (8 == sd2["get_gesture_udp"]["enqueued"].asInteger()));
-		ensure("sd2[get_gesture_udp][dequeued] is 0", (0 == sd2["get_gesture_udp"]["dequeued"].asInteger()));
-		ensure("sd2[get_texture_non_temp_udp][enqueued] is 0", (0 == sd2["get_texture_non_temp_udp"]["enqueued"].asInteger()));
-
-		// Reset and check zeros...
-		// Reset leaves current region in place
-		gViewerAssetStats->reset();
-		sd = gViewerAssetStats->asLLSD(false);
-		ensure("Correct single-key LLSD map root", is_double_key_map(sd, "duration", "regions"));
-		ensure("Correct single-slot LLSD array regions (p2)", is_single_slot_array(sd["regions"], region2_handle));
-		sd2 = get_region(sd, region2_handle);
-		ensure("Region2 is present in results", sd2.isMap());
-		
-		delete gViewerAssetStats;
-		gViewerAssetStats = NULL;
-
-		ensure_equals("sd2[get_texture_non_temp_udp][enqueued] is reset", sd2["get_texture_non_temp_udp"]["enqueued"].asInteger(), 0);
-		ensure_equals("sd2[get_gesture_udp][enqueued] is reset", sd2["get_gesture_udp"]["enqueued"].asInteger(), 0);
-	}
-
-	// Non-texture assets ignore transport and persistence flags
-	template<> template<>
-	void tst_viewerassetstats_index_object_t::test<7>()
-	{
-		gViewerAssetStats = new LLViewerAssetStats();
-		LLViewerAssetStatsFF::set_region(region1_handle);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_TEXTURE, false, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_TEXTURE, false, false);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, false);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, false, true);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, false, true);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, true, false);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, true, false);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_BODYPART, true, true);
-		LLViewerAssetStatsFF::record_dequeue(LLViewerAssetType::AT_BODYPART, true, true);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_LSL_BYTECODE, false, false);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_LSL_BYTECODE, false, true);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_LSL_BYTECODE, true, false);
-
-		LLViewerAssetStatsFF::record_enqueue(LLViewerAssetType::AT_LSL_BYTECODE, true, true);
-
-		LLSD sd = gViewerAssetStats->asLLSD(false);
-		ensure("Correct single-key LLSD map root", is_double_key_map(sd, "regions", "duration"));
-		ensure("Correct single-slot LLSD array regions", is_single_slot_array(sd["regions"], region1_handle));
-		sd = get_region(sd, region1_handle);
-		ensure("Region1 is present in results", sd.isMap());
-		
-		// Check a few points on the tree for content
-		ensure("sd[get_gesture_udp][enqueued] is 0", (0 == sd["get_gesture_udp"]["enqueued"].asInteger()));
-		ensure("sd[get_gesture_udp][dequeued] is 0", (0 == sd["get_gesture_udp"]["dequeued"].asInteger()));
-
-		ensure("sd[get_wearable_http][enqueued] is 2", (2 == sd["get_wearable_http"]["enqueued"].asInteger()));
-		ensure("sd[get_wearable_http][dequeued] is 2", (2 == sd["get_wearable_http"]["dequeued"].asInteger()));
-
-		ensure("sd[get_wearable_udp][enqueued] is 2", (2 == sd["get_wearable_udp"]["enqueued"].asInteger()));
-		ensure("sd[get_wearable_udp][dequeued] is 2", (2 == sd["get_wearable_udp"]["dequeued"].asInteger()));
-
-		ensure("sd[get_other_http][enqueued] is 2", (2 == sd["get_other_http"]["enqueued"].asInteger()));
-		ensure("sd[get_other_http][dequeued] is 0", (0 == sd["get_other_http"]["dequeued"].asInteger()));
-
-		ensure("sd[get_other_udp][enqueued] is 2", (2 == sd["get_other_udp"]["enqueued"].asInteger()));
-		ensure("sd[get_other_udp][dequeued] is 0", (0 == sd["get_other_udp"]["dequeued"].asInteger()));
-
-		// Reset and check zeros...
-		// Reset leaves current region in place
-		gViewerAssetStats->reset();
-		sd = get_region(gViewerAssetStats->asLLSD(false), region1_handle);
-		ensure("Region1 is present in results", sd.isMap());
-		
-		delete gViewerAssetStats;
-		gViewerAssetStats = NULL;
-
-		ensure_equals("sd[get_texture_non_temp_udp][enqueued] is reset", sd["get_texture_non_temp_udp"]["enqueued"].asInteger(), 0);
-		ensure_equals("sd[get_gesture_udp][dequeued] is reset", sd["get_gesture_udp"]["dequeued"].asInteger(), 0);
-	}
+        ensure_equals("sd[get_texture_non_temp_udp][enqueued] is reset", sd["get_texture_non_temp_udp"]["enqueued"].asInteger(), 0);
+        ensure_equals("sd[get_gesture_udp][dequeued] is reset", sd["get_gesture_udp"]["dequeued"].asInteger(), 0);
+    }
 }