From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 21 Sep 2010 13:26:52 -0400 Subject: Fix for build failures - disabling tcmalloc for now --- indra/lib/python/indra/__init__.py | 0 indra/lib/python/indra/base/__init__.py | 0 indra/lib/python/indra/base/cllsd_test.py | 0 indra/lib/python/indra/base/config.py | 0 indra/lib/python/indra/base/llsd.py | 0 indra/lib/python/indra/base/lluuid.py | 0 indra/lib/python/indra/base/metrics.py | 0 indra/lib/python/indra/ipc/__init__.py | 0 indra/lib/python/indra/ipc/compatibility.py | 0 indra/lib/python/indra/ipc/httputil.py | 0 indra/lib/python/indra/ipc/llmessage.py | 0 indra/lib/python/indra/ipc/llsdhttp.py | 0 indra/lib/python/indra/ipc/mysql_pool.py | 0 indra/lib/python/indra/ipc/russ.py | 0 indra/lib/python/indra/ipc/servicebuilder.py | 0 indra/lib/python/indra/ipc/siesta.py | 0 indra/lib/python/indra/ipc/siesta_test.py | 0 indra/lib/python/indra/ipc/tokenstream.py | 0 indra/lib/python/indra/ipc/webdav.py | 0 indra/lib/python/indra/ipc/xml_rpc.py | 0 indra/lib/python/indra/util/__init__.py | 0 indra/lib/python/indra/util/fastest_elementtree.py | 0 indra/lib/python/indra/util/helpformatter.py | 0 indra/lib/python/indra/util/iterators.py | 0 indra/lib/python/indra/util/llmanifest.py | 0 indra/lib/python/indra/util/llsubprocess.py | 0 indra/lib/python/indra/util/llversion.py | 0 indra/lib/python/indra/util/named_query.py | 0 indra/lib/python/indra/util/shutil2.py | 0 indra/lib/python/indra/util/term.py | 0 indra/lib/python/indra/util/test_win32_manifest.py | 0 indra/lib/python/uuid.py | 0 32 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/lib/python/indra/__init__.py mode change 100644 => 100755 indra/lib/python/indra/base/__init__.py mode change 100644 => 100755 indra/lib/python/indra/base/cllsd_test.py mode change 100644 => 100755 indra/lib/python/indra/base/config.py mode change 100644 => 100755 indra/lib/python/indra/base/llsd.py mode change 100644 => 100755 indra/lib/python/indra/base/lluuid.py mode change 100644 => 100755 indra/lib/python/indra/base/metrics.py mode change 100644 => 100755 indra/lib/python/indra/ipc/__init__.py mode change 100644 => 100755 indra/lib/python/indra/ipc/compatibility.py mode change 100644 => 100755 indra/lib/python/indra/ipc/httputil.py mode change 100644 => 100755 indra/lib/python/indra/ipc/llmessage.py mode change 100644 => 100755 indra/lib/python/indra/ipc/llsdhttp.py mode change 100644 => 100755 indra/lib/python/indra/ipc/mysql_pool.py mode change 100644 => 100755 indra/lib/python/indra/ipc/russ.py mode change 100644 => 100755 indra/lib/python/indra/ipc/servicebuilder.py mode change 100644 => 100755 indra/lib/python/indra/ipc/siesta.py mode change 100644 => 100755 indra/lib/python/indra/ipc/siesta_test.py mode change 100644 => 100755 indra/lib/python/indra/ipc/tokenstream.py mode change 100644 => 100755 indra/lib/python/indra/ipc/webdav.py mode change 100644 => 100755 indra/lib/python/indra/ipc/xml_rpc.py mode change 100644 => 100755 indra/lib/python/indra/util/__init__.py mode change 100644 => 100755 indra/lib/python/indra/util/fastest_elementtree.py mode change 100644 => 100755 indra/lib/python/indra/util/helpformatter.py mode change 100644 => 100755 indra/lib/python/indra/util/iterators.py mode change 100644 => 100755 indra/lib/python/indra/util/llmanifest.py mode change 100644 => 100755 indra/lib/python/indra/util/llsubprocess.py mode change 100644 => 100755 indra/lib/python/indra/util/llversion.py mode change 100644 => 100755 indra/lib/python/indra/util/named_query.py mode change 100644 => 100755 indra/lib/python/indra/util/shutil2.py mode change 100644 => 100755 indra/lib/python/indra/util/term.py mode change 100644 => 100755 indra/lib/python/indra/util/test_win32_manifest.py mode change 100644 => 100755 indra/lib/python/uuid.py (limited to 'indra/lib') diff --git a/indra/lib/python/indra/__init__.py b/indra/lib/python/indra/__init__.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/base/__init__.py b/indra/lib/python/indra/base/__init__.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/base/cllsd_test.py b/indra/lib/python/indra/base/cllsd_test.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/base/config.py b/indra/lib/python/indra/base/config.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/base/llsd.py b/indra/lib/python/indra/base/llsd.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/base/lluuid.py b/indra/lib/python/indra/base/lluuid.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/base/metrics.py b/indra/lib/python/indra/base/metrics.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/__init__.py b/indra/lib/python/indra/ipc/__init__.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/compatibility.py b/indra/lib/python/indra/ipc/compatibility.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/httputil.py b/indra/lib/python/indra/ipc/httputil.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/llmessage.py b/indra/lib/python/indra/ipc/llmessage.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/llsdhttp.py b/indra/lib/python/indra/ipc/llsdhttp.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/mysql_pool.py b/indra/lib/python/indra/ipc/mysql_pool.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/russ.py b/indra/lib/python/indra/ipc/russ.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/servicebuilder.py b/indra/lib/python/indra/ipc/servicebuilder.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/siesta.py b/indra/lib/python/indra/ipc/siesta.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/siesta_test.py b/indra/lib/python/indra/ipc/siesta_test.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/tokenstream.py b/indra/lib/python/indra/ipc/tokenstream.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/webdav.py b/indra/lib/python/indra/ipc/webdav.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/ipc/xml_rpc.py b/indra/lib/python/indra/ipc/xml_rpc.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/__init__.py b/indra/lib/python/indra/util/__init__.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/fastest_elementtree.py b/indra/lib/python/indra/util/fastest_elementtree.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/helpformatter.py b/indra/lib/python/indra/util/helpformatter.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/iterators.py b/indra/lib/python/indra/util/iterators.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/llsubprocess.py b/indra/lib/python/indra/util/llsubprocess.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/llversion.py b/indra/lib/python/indra/util/llversion.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/named_query.py b/indra/lib/python/indra/util/named_query.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/shutil2.py b/indra/lib/python/indra/util/shutil2.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/term.py b/indra/lib/python/indra/util/term.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/indra/util/test_win32_manifest.py b/indra/lib/python/indra/util/test_win32_manifest.py old mode 100644 new mode 100755 diff --git a/indra/lib/python/uuid.py b/indra/lib/python/uuid.py old mode 100644 new mode 100755 -- cgit v1.2.3 From a5619d16f74863168f45b04b37cc6383e1a92263 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 13 Oct 2010 07:24:37 -0400 Subject: correct licenses (fix problem with license change merge) --- indra/lib/python/indra/__init__.py | 27 +++++++++------- indra/lib/python/indra/util/test_win32_manifest.py | 36 +++++++++------------- 2 files changed, 31 insertions(+), 32 deletions(-) (limited to 'indra/lib') diff --git a/indra/lib/python/indra/__init__.py b/indra/lib/python/indra/__init__.py index b8fe4971c5..e010741c1c 100644 --- a/indra/lib/python/indra/__init__.py +++ b/indra/lib/python/indra/__init__.py @@ -2,19 +2,24 @@ @file __init__.py @brief Initialization file for the indra module. -$LicenseInfo:firstyear=2006&license=viewergpl$ +$LicenseInfo:firstyear=2006&license=viewerlgpl$ +Second Life Viewer Source Code +Copyright (C) 2010, Linden Research, Inc. -Copyright (c) 2006-2009, 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. -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. +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. -ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO -WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, -COMPLETENESS OR PERFORMANCE. +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$ """ diff --git a/indra/lib/python/indra/util/test_win32_manifest.py b/indra/lib/python/indra/util/test_win32_manifest.py index 0149b9f43a..786521c068 100644 --- a/indra/lib/python/indra/util/test_win32_manifest.py +++ b/indra/lib/python/indra/util/test_win32_manifest.py @@ -2,31 +2,25 @@ # @file test_win32_manifest.py # @brief Test an assembly binding version and uniqueness in a windows dll or exe. # -# $LicenseInfo:firstyear=2009&license=viewergpl$ -# -# Copyright (c) 2009, Linden Research, Inc. -# +# $LicenseInfo:firstyear=2009&license=viewerlgpl$ # Second Life Viewer Source Code -# The source code in this file ("Source Code") is provided by Linden Lab -# to you under the terms of the GNU General Public License, version 2.0 -# ("GPL"), unless you have obtained a separate licensing agreement -# ("Other License"), formally executed by you and Linden Lab. Terms of -# the GPL can be found in doc/GPL-license.txt in this distribution, or -# online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 +# 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. # -# There are special exceptions to the terms and conditions of the GPL as -# it is applied to this Source Code. View the full text of the exception -# in the file doc/FLOSS-exception.txt in this software distribution, or -# online at -# http://secondlifegrid.net/programs/open_source/licensing/flossexception +# 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. # -# By copying, modifying or distributing this software, you acknowledge -# that you have read and understood your obligations described above, -# and agree to abide by those obligations. +# 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 # -# ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO -# WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, -# COMPLETENESS OR PERFORMANCE. +# Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA # $/LicenseInfo$ import sys, os -- cgit v1.2.3