From 8a718a9ca28a7a544c7622a033fcd2791935909d Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 11 Feb 2021 16:05:46 +0000
Subject: SL-14862 - line endings fix, avoid period in key names

---
 indra/llui/lluiusage.cpp | 131 +++++++++++++++++++++++++----------------------
 1 file changed, 70 insertions(+), 61 deletions(-)

(limited to 'indra/llui/lluiusage.cpp')

diff --git a/indra/llui/lluiusage.cpp b/indra/llui/lluiusage.cpp
index e1237031cd..50eeccd214 100644
--- a/indra/llui/lluiusage.cpp
+++ b/indra/llui/lluiusage.cpp
@@ -1,61 +1,70 @@
-/**
-* @file lluiuisage.cpp
-* @brief Source file for LLUIUsage
-*
-* $LicenseInfo:firstyear=2021&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2021, 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$
-*/
-
-#include "linden_common.h"
-#include "lluiusage.h"
-
-LLUIUsage::LLUIUsage()
-{
-}
-
-LLUIUsage::~LLUIUsage()
-{
-}
-
-void LLUIUsage::logFloater(const std::string& floater)
-{
-	mFloaterCounts[floater]++;
-}
-
-void LLUIUsage::logCommand(const std::string& command)
-{
-	mCommandCounts[command]++;
-}
-
-LLSD LLUIUsage::asLLSD() const
-{
-	LLSD result;
-	for (auto const& it : mFloaterCounts)
-	{
-		result["floaters"][it.first] = LLSD::Integer(it.second);
-	}
-	for (auto const& it : mCommandCounts)
-	{
-		result["commands"][it.first] = LLSD::Integer(it.second);
-	}
-	return result;
-}
-
+/**
+* @file lluiuisage.cpp
+* @brief Source file for LLUIUsage
+*
+* $LicenseInfo:firstyear=2021&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2021, 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$
+*/
+
+#include "linden_common.h"
+#include "lluiusage.h"
+
+LLUIUsage::LLUIUsage()
+{
+}
+
+LLUIUsage::~LLUIUsage()
+{
+}
+
+// static
+std::string LLUIUsage::sanitized(const std::string& s)
+{
+	// ViewerStats db doesn't like "." in keys
+	std::string result(s);
+	std::replace(result.begin(), result.end(), '.', '_');
+	return result;
+}
+
+void LLUIUsage::logFloater(const std::string& floater)
+{
+	mFloaterCounts[sanitized(floater)]++;
+}
+
+void LLUIUsage::logCommand(const std::string& command)
+{
+	mCommandCounts[sanitized(command)]++;
+}
+
+LLSD LLUIUsage::asLLSD() const
+{
+	LLSD result;
+	for (auto const& it : mFloaterCounts)
+	{
+		result["floaters"][it.first] = LLSD::Integer(it.second);
+	}
+	for (auto const& it : mCommandCounts)
+	{
+		result["commands"][it.first] = LLSD::Integer(it.second);
+	}
+	return result;
+}
+
-- 
cgit v1.2.3