summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/llui/lluiusage.cpp131
-rw-r--r--indra/llui/lluiusage.h99
2 files changed, 120 insertions, 110 deletions
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;
+}
+
diff --git a/indra/llui/lluiusage.h b/indra/llui/lluiusage.h
index 0c076c2b2c..bac607aa60 100644
--- a/indra/llui/lluiusage.h
+++ b/indra/llui/lluiusage.h
@@ -1,49 +1,50 @@
-/**
-* @file lluiuisage.h
-* @brief Header 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$
-*/
-
-#ifndef LL_LLUIUSAGE_H
-#define LL_LLUIUSAGE_H
-
-#include <map>
-#include "llsd.h"
-#include "llsingleton.h"
-
-// UIUsage tracking to see which operations and UI elements are most popular in a session
-class LLUIUsage : public LLSingleton<LLUIUsage>
-{
-public:
- LLSINGLETON(LLUIUsage);
- ~LLUIUsage();
-public:
- void logFloater(const std::string& floater);
- void logCommand(const std::string& command);
- LLSD asLLSD() const;
-private:
- std::map<std::string,U32> mFloaterCounts;
- std::map<std::string,U32> mCommandCounts;
-};
-
-#endif // LLUIUIUSAGE.h
+/**
+* @file lluiuisage.h
+* @brief Header 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$
+*/
+
+#ifndef LL_LLUIUSAGE_H
+#define LL_LLUIUSAGE_H
+
+#include <map>
+#include "llsd.h"
+#include "llsingleton.h"
+
+// UIUsage tracking to see which operations and UI elements are most popular in a session
+class LLUIUsage : public LLSingleton<LLUIUsage>
+{
+public:
+ LLSINGLETON(LLUIUsage);
+ ~LLUIUsage();
+public:
+ static std::string sanitized(const std::string& s);
+ void logFloater(const std::string& floater);
+ void logCommand(const std::string& command);
+ LLSD asLLSD() const;
+private:
+ std::map<std::string,U32> mFloaterCounts;
+ std::map<std::string,U32> mCommandCounts;
+};
+
+#endif // LLUIUIUSAGE.h