Second Life viewer sources 1.18.4.0-RC

3 files changed, 86 insertions, 53 deletions

diff --git a/linden/scripts/messages/message_template.msg b/linden/scripts/messages/message_template.msg
index 4572941..7aabb78 100644
--- a/linden/scripts/messages/message_template.msg
+++ b/linden/scripts/messages/message_template.msg
@@ -3038,7 +3038,7 @@ version 2.0
 // and where someone you are tracking is located. They are -1 if not
 // applicable.
 {
-        CoarseLocationUpdate Medium 6 Trusted Unencoded
+        CoarseLocationUpdate Medium 6 Trusted Unencoded UDPDeprecated
         {
                 Location        Variable
                 {       X               U8      }
@@ -3783,6 +3783,10 @@ version 2.0
                 {       GroupName                       Variable 1      }
                 {       GroupInsigniaID         LLUUID          }
         }
+        {
+                NewGroupData            Single
+                {       ListInProfile   BOOL            }       // whether group displays in profile
+        }
 }
 
 
@@ -7823,6 +7827,10 @@ version 2.0
                 {       GroupID         LLUUID  }
                 {       AcceptNotices   BOOL    }
         }
+        {
+                NewData                         Single
+                {       ListInProfile   BOOL    }
+        }
 }
 
 // GroupRoleDataRequest
@@ -8140,7 +8148,7 @@ version 2.0
 // dataserver -> simulator -> viewer
 // reliable
 {
-        AgentGroupDataUpdate Low 389 Trusted Zerocoded
+        AgentGroupDataUpdate Low 389 Trusted Zerocoded UDPDeprecated
         {
                 AgentData                       Single
                 {       AgentID                         LLUUID  }
@@ -8763,3 +8771,18 @@ version 2.0
         }
 }
 
+// ObjectIncludeInSearch
+// viewer -> simulator
+{
+        ObjectIncludeInSearch Low 424 NotTrusted Unencoded
+        {
+                AgentData               Single
+                {       AgentID         LLUUID  }
+                {       SessionID       LLUUID  }
+        }
+        {
+                ObjectData              Variable
+                {       ObjectLocalID   U32             }
+                {       IncludeInSearch BOOL    }
+        }
+}
diff --git a/linden/scripts/setup-path.py b/linden/scripts/setup-path.py
index 30048ba..87600e3 100755
--- a/linden/scripts/setup-path.py
+++ b/linden/scripts/setup-path.py
@@ -1,30 +1,35 @@
 #!/usr/bin/python
-# @file setup-path.py
-# @brief Get the python library directory in the path, so we don't have
-# to screw with PYTHONPATH or symbolic links.
-#
-# Copyright (c) 2007-2007, Linden Research, Inc.
-# 
-# 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+"""\
+@file setup-path.py
+@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$
+
+Copyright (c) 2007, Linden Research, Inc.
+
+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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+$/LicenseInfo$
+"""
 
 import sys
 from os.path import realpath, dirname, join
diff --git a/linden/scripts/template_verifier.py b/linden/scripts/template_verifier.py
index 68d82ca..ac814ae 100755
--- a/linden/scripts/template_verifier.py
+++ b/linden/scripts/template_verifier.py
@@ -1,29 +1,34 @@
 #!/usr/bin/python
-# @file template_verifier.py
-# @brief Message template compatibility verifier.
-#
-# Copyright (c) 2007-2007, Linden Research, Inc.
-# 
-# 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+"""\
+@file template_verifier.py
+@brief Message template compatibility verifier.
+
+$LicenseInfo:firstyear=2007&license=viewergpl$
+
+Copyright (c) 2007, Linden Research, Inc.
+
+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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+$/LicenseInfo$
+"""
 
 """template_verifier is a script which will compare the
 current repository message template with the "master" message template, accessible