From f4b2de0d058d691afbb45315604c39dc05686586 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 20 Jan 2010 15:20:57 -0800
Subject: curse of the random coding policy hook.
---
scripts/template_verifier.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'scripts')
diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py
index d5fc119270..adcfcbcae6 100755
--- a/scripts/template_verifier.py
+++ b/scripts/template_verifier.py
@@ -103,7 +103,7 @@ MESSAGE_TEMPLATE = 'message_template.msg'
PRODUCTION_ACCEPTABLE = (compatibility.Same, compatibility.Newer)
DEVELOPMENT_ACCEPTABLE = (
compatibility.Same, compatibility.Newer,
- compatibility.Older, compatibility.Mixed)
+ compatibility.Older, compatibility.Mixed)
MAX_MASTER_AGE = 60 * 60 * 4 # refresh master cache every 4 hours
--
cgit v1.2.3
From 92257b55a405f3625cbbcf07357b3ca929a04882 Mon Sep 17 00:00:00 2001
From: "Matthew Breindel (Falcon)" <falcon@lindenlab.com>
Date: Fri, 26 Mar 2010 18:23:05 -0700
Subject: DEV-47845 Fix to work with TCP/LLSD message. This checkin is
experimental, so if it breaks a build, just revert to the previous changeset.
---
scripts/messages/message_template.msg | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'scripts')
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index d4f791c202..7813bfba83 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2061,6 +2061,10 @@ version 2.0
{ IsPhantom BOOL }
{ CastsShadows BOOL }
}
+ {
+ ExtraPhysics Variable
+ { PhysicsRep U8 }
+ }
}
--
cgit v1.2.3
From b2381a039de7e0edbd643d198b85ba8e00524b6b Mon Sep 17 00:00:00 2001
From: "Matthew Breindel (Falcon)" <falcon@lindenlab.com>
Date: Wed, 31 Mar 2010 17:35:26 -0700
Subject: DEV-47845 Cleaned up names.
---
scripts/messages/message_template.msg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'scripts')
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 7813bfba83..6043542877 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2063,7 +2063,7 @@ version 2.0
}
{
ExtraPhysics Variable
- { PhysicsRep U8 }
+ { PhysicsShapeType U8 }
}
}
--
cgit v1.2.3
From 2530b057bb18550ed2825c14988a807ab90d460f Mon Sep 17 00:00:00 2001
From: "Karl Stiefvater (qarl)" <qarl@lindenlab.com>
Date: Thu, 1 Jul 2010 17:18:55 -0500
Subject: added new physics parameters to prims
---
scripts/messages/message_template.msg | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'scripts')
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 6043542877..8cfd3c5ce6 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2064,6 +2064,11 @@ version 2.0
{
ExtraPhysics Variable
{ PhysicsShapeType U8 }
+ { PhysicsGravity F32 }
+ { PhysicsMaterialOverride BOOL }
+ { PhysicsFriction F32 }
+ { PhysicsDensity F32 }
+ { PhysicsRestitution F32 }
}
}
--
cgit v1.2.3
From 3733337011c781b6dabe978181d8ae4c5c96188b Mon Sep 17 00:00:00 2001
From: "Matthew Breindel (Falcon)" <falcon@lindenlab.com>
Date: Fri, 9 Jul 2010 17:47:58 -0700
Subject: Gravity, Friction, Restitution, Density now work with simulator.
---
scripts/messages/message_template.msg | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'scripts')
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 8cfd3c5ce6..1dd9b5c2b2 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2064,11 +2064,11 @@ version 2.0
{
ExtraPhysics Variable
{ PhysicsShapeType U8 }
- { PhysicsGravity F32 }
- { PhysicsMaterialOverride BOOL }
- { PhysicsFriction F32 }
- { PhysicsDensity F32 }
- { PhysicsRestitution F32 }
+ { Density F32 }
+ { Friction F32 }
+ { Restitution F32 }
+ { GravityMultiplier F32 }
+
}
}
--
cgit v1.2.3
From f0d3cfc7bbd067a004c8206dd90c1fb8af1e703a Mon Sep 17 00:00:00 2001
From: "Matthew Breindel (Falcon)" <falcon@lindenlab.com>
Date: Fri, 9 Jul 2010 17:48:27 -0700
Subject: Unix EOL
---
scripts/messages/message_template.msg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'scripts')
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 1dd9b5c2b2..3fe05be20a 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2064,10 +2064,10 @@ version 2.0
{
ExtraPhysics Variable
{ PhysicsShapeType U8 }
- { Density F32 }
- { Friction F32 }
- { Restitution F32 }
- { GravityMultiplier F32 }
+ { Density F32 }
+ { Friction F32 }
+ { Restitution F32 }
+ { GravityMultiplier F32 }
}
}
--
cgit v1.2.3
From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 21 Sep 2010 13:26:52 -0400
Subject: Fix for build failures - disabling tcmalloc for now
---
scripts/messages/message_template.msg | 0
scripts/setup-path.py | 0
scripts/template_verifier.py | 0
3 files changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 scripts/messages/message_template.msg
mode change 100644 => 100755 scripts/setup-path.py
mode change 100644 => 100755 scripts/template_verifier.py
(limited to 'scripts')
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
old mode 100644
new mode 100755
diff --git a/scripts/setup-path.py b/scripts/setup-path.py
old mode 100644
new mode 100755
diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py
old mode 100644
new mode 100755
--
cgit v1.2.3
From a5619d16f74863168f45b04b37cc6383e1a92263 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 13 Oct 2010 07:24:37 -0400
Subject: correct licenses (fix problem with license change merge)
---
scripts/setup-path.py | 40 +++++++++++++++++-----------------------
scripts/template_verifier.py | 40 +++++++++++++++++-----------------------
2 files changed, 34 insertions(+), 46 deletions(-)
(limited to 'scripts')
diff --git a/scripts/setup-path.py b/scripts/setup-path.py
index 157bda0027..55e0f1a85f 100644
--- a/scripts/setup-path.py
+++ b/scripts/setup-path.py
@@ -4,31 +4,25 @@
@brief Get the python library directory in the path, so we don't have
to screw with PYTHONPATH or symbolic links.
-$LicenseInfo:firstyear=2007&license=viewergpl$
+$LicenseInfo:firstyear=2007&license=viewerlgpl$
+Second Life Viewer Source Code
+Copyright (C) 2010, Linden Research, Inc.
-Copyright (c) 2007-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.
-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
-
-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
-
-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.
-
-ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-COMPLETENESS OR PERFORMANCE.
+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$
"""
diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py
index adcfcbcae6..ddb050fbbb 100644
--- a/scripts/template_verifier.py
+++ b/scripts/template_verifier.py
@@ -3,31 +3,25 @@
@file template_verifier.py
@brief Message template compatibility verifier.
-$LicenseInfo:firstyear=2007&license=viewergpl$
+$LicenseInfo:firstyear=2007&license=viewerlgpl$
+Second Life Viewer Source Code
+Copyright (C) 2010, Linden Research, Inc.
-Copyright (c) 2007-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.
-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
-
-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
-
-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.
-
-ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-COMPLETENESS OR PERFORMANCE.
+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$
"""
--
cgit v1.2.3
From 675e0cfd993ca6fab5843bf7ad0254e5e14254fc Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 11 Apr 2011 14:12:49 -0500
Subject: Use tcmalloc from 3p-google-perftools on windows
---
scripts/messages/message_template.msg.sha1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'scripts')
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index 41e70011af..6486d92851 100644
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-ce3be58f4ea395c272fcfa3e6b6dad027c188e0d
\ No newline at end of file
+465164e1a07f63d68c4ad1f00c19805dfb6ee2d7
\ No newline at end of file
--
cgit v1.2.3