Second Life viewer sources 1.18.1.2

7 files changed, 90 insertions, 30 deletions

diff --git a/linden/indra/lib/python/indra/__init__.py b/linden/indra/lib/python/indra/__init__.py
index 7548558..220768f 100644
--- a/linden/indra/lib/python/indra/__init__.py
+++ b/linden/indra/lib/python/indra/__init__.py
@@ -1,8 +1,9 @@
-# @file __init__.py
-# @brief Initialization file for the indra module.
-# 
-# Copyright (c) 2006-2007, Linden Research, Inc.
-# 
+"""\
+@file __init__.py
+@brief Initialization file for the indra module.
+
+Copyright (c) 2006-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
@@ -23,3 +24,4 @@
 # ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 # WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 # COMPLETENESS OR PERFORMANCE.
+"""
diff --git a/linden/indra/lib/python/indra/ipc/__init__.py b/linden/indra/lib/python/indra/ipc/__init__.py
new file mode 100644
index 0000000..92c9416
--- /dev/null
+++ b/linden/indra/lib/python/indra/ipc/__init__.py
@@ -0,0 +1,27 @@
+"""\
+@file __init__.py
+@brief Initialization file for the indra ipc module.
+
+Copyright (c) 2006-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.
+"""
diff --git a/linden/indra/lib/python/indra/compatibility.py b/linden/indra/lib/python/indra/ipc/compatibility.py
index abc1c6a..358820c 100644
--- a/linden/indra/lib/python/indra/compatibility.py
+++ b/linden/indra/lib/python/indra/ipc/compatibility.py
@@ -1,8 +1,9 @@
-# @file compatibility.py
-# @brief Classes that manage compatibility states.
-#
-# Copyright (c) 2007-2007, Linden Research, Inc.
-# 
+"""\
+@file compatibility.py
+@brief Classes that manage compatibility states.
+
+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
@@ -23,6 +24,7 @@
 # ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 # WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 # COMPLETENESS OR PERFORMANCE.
+"""
 
 
 """Compatibility combination table:
diff --git a/linden/indra/lib/python/indra/llmessage.py b/linden/indra/lib/python/indra/ipc/llmessage.py
index 1d4995d..de6fd3b 100644
--- a/linden/indra/lib/python/indra/llmessage.py
+++ b/linden/indra/lib/python/indra/ipc/llmessage.py
@@ -1,8 +1,9 @@
-# @file llmessage.py
-# @brief Message template parsing and compatiblity
-#
-# Copyright (c) 2007-2007, Linden Research, Inc.
-# 
+"""\
+@file llmessage.py
+@brief Message template parsing and compatiblity
+
+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
@@ -23,6 +24,7 @@
 # ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 # WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 # COMPLETENESS OR PERFORMANCE.
+"""
 
 from sets import Set, ImmutableSet
 
@@ -369,7 +371,3 @@ def parseTemplateString(s):
 
 def parseTemplateFile(f):
     return TemplateParser(TokenStream().fromFile(f)).parseTemplate()
-
-
-
-
diff --git a/linden/indra/lib/python/indra/tokenstream.py b/linden/indra/lib/python/indra/ipc/tokenstream.py
index 7dab11f..83b087a 100644
--- a/linden/indra/lib/python/indra/tokenstream.py
+++ b/linden/indra/lib/python/indra/ipc/tokenstream.py
@@ -1,8 +1,9 @@
-# @file tokenstream.py
-# @brief Message template parsing utility class
-#
-# Copyright (c) 2007-2007, Linden Research, Inc.
-# 
+"""\
+@file tokenstream.py
+@brief Message template parsing utility class
+
+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
@@ -23,6 +24,7 @@
 # ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 # WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 # COMPLETENESS OR PERFORMANCE.
+"""
 
 import re
 
diff --git a/linden/indra/lib/python/indra/util/__init__.py b/linden/indra/lib/python/indra/util/__init__.py
new file mode 100644
index 0000000..3f79d0a
--- /dev/null
+++ b/linden/indra/lib/python/indra/util/__init__.py
@@ -0,0 +1,27 @@
+"""\
+@file __init__.py
+@brief Initialization file for the indra util module.
+
+Copyright (c) 2006-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.
+"""
diff --git a/linden/indra/lib/python/indra/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 22483b4..0e46589 100644
--- a/linden/indra/lib/python/indra/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -1,10 +1,11 @@
 #!/usr/bin/python
-# @file llmanifest.py
-# @author Ryan Williams
-# @brief Library for specifying operations on a set of files.
-#
-# Copyright (c) 2007-2007, Linden Research, Inc.
-# 
+"""\
+@file llmanifest.py
+@author Ryan Williams
+@brief Library for specifying operations on a set of files.
+
+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
@@ -25,6 +26,7 @@
 # ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 # WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 # COMPLETENESS OR PERFORMANCE.
+"""
 
 import commands
 import filecmp