Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK

# Conflicts:
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp

1 files changed, 73 insertions, 0 deletions

diff --git a/scripts/metrics/slp_conv.py b/scripts/metrics/slp_conv.py
new file mode 100644
index 0000000000..27f922b74a
--- /dev/null
+++ b/scripts/metrics/slp_conv.py
@@ -0,0 +1,73 @@
+#!/usr/bin/python
+"""\
+@file   slp_conv.py
+@author Callum Prentice
+@date   2021-01-26
+@brief  Convert a Second Life Performance (SLP) file generated
+        by the Viewer into an comma separated value (CSV) file
+        for import into spreadsheets and other data analytics tools.
+
+$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$
+"""
+
+from llbase import llsd
+import argparse
+
+parser = argparse.ArgumentParser(
+    description="Converts Viewer SLP files into CSV for import into spreadsheets etc."
+)
+parser.add_argument(
+    "infilename",
+    help="Name of SLP file to read",
+)
+parser.add_argument(
+    "outfilename",
+    help="Name of CSV file to create",
+)
+args = parser.parse_args()
+
+with open(args.infilename, "r") as slp_file:
+    slps = slp_file.readlines()
+    print "Reading from %s - %d items" % (args.infilename, len(slps))
+
+    with open(args.outfilename, "w") as csv_file:
+
+        print "Writing to %s" % args.outfilename
+
+        for index, each_slp in enumerate(slps):
+            slp_entry = llsd.parse(each_slp)
+
+            first_key = slp_entry.keys()[0]
+
+            # first entry so write column headers
+            if index == 0:
+                line = ""
+                for key, value in slp_entry[first_key].iteritems():
+                    line += key
+                    line += ", "
+                csv_file.write("entry, %s, \n" % line)
+            # write line of data
+            line = ""
+            for key, value in slp_entry[first_key].iteritems():
+                line += str(value)
+                line += ", "
+            csv_file.write("%s, %s, \n" % (first_key, str(line)))