From a60c54568c0abdd9e38bcb40299f220cb27e0094 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 27 Mar 2009 19:40:03 +0000
Subject: [PATCH] Result of svn merge -r115238:115240
 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial_slave_merge into
 trunk. In turn a result of svn merge -r113279:113280
 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial-changes-1 into
 trivial_slave_merge and svn merge -r107805:110030
 svn+ssh://svn/svn/user/phoenix/slave-ds into trivial_slave_merge. QAR-1329

---
 .../indra/util/simperf_oprof_interface.py     | 29 ++++++++++++-------
 .../indra/util/simperf_proc_interface.py      | 27 +++++++++++++++++
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/indra/lib/python/indra/util/simperf_oprof_interface.py b/indra/lib/python/indra/util/simperf_oprof_interface.py
index c8d0f7475aa..547d2f99809 100755
--- a/indra/lib/python/indra/util/simperf_oprof_interface.py
+++ b/indra/lib/python/indra/util/simperf_oprof_interface.py
@@ -3,20 +3,27 @@
 @file simperf_oprof_interface.py
 @brief Manage OProfile data collection on a host
 
-$LicenseInfo:firstyear=2008&license=internal$
+$LicenseInfo:firstyear=2008&license=mit$
 
 Copyright (c) 2008-2009, Linden Research, Inc.
 
-The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
-this source code is governed by the Linden Lab Source Code Disclosure
-Agreement ("Agreement") previously entered between you and Linden
-Lab. By accessing, using, copying, modifying or distributing this
-software, you acknowledge that you have been informed of your
-obligations under the Agreement and agree to abide by those obligations.
-
-ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-COMPLETENESS OR PERFORMANCE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 $/LicenseInfo$
 """
 
diff --git a/indra/lib/python/indra/util/simperf_proc_interface.py b/indra/lib/python/indra/util/simperf_proc_interface.py
index 62a63fa872f..da6304a2742 100755
--- a/indra/lib/python/indra/util/simperf_proc_interface.py
+++ b/indra/lib/python/indra/util/simperf_proc_interface.py
@@ -1,4 +1,31 @@
 #!/usr/bin/python
+"""\
+@file simperf_proc_interface.py
+@brief Utility to extract log messages from *.<pid>.llsd files containing performance statistics.
+
+$LicenseInfo:firstyear=2008&license=mit$
+
+Copyright (c) 2008-2009, Linden Research, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+$/LicenseInfo$
+"""
 
 # ----------------------------------------------------
 # Utility to extract log messages from *.<pid>.llsd
-- 
GitLab