From b25f9f322cdbcde7fd8c043137bf07992e5ef318 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Tue, 15 Jan 2008 02:09:55 +0000
Subject: * Mother of all commits: * Cleaned up copyright notices in
 AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them
 * Replaced several common string instances with a static constant to prevent
 reallocation of the same strings thousands of times. "" -> String.Empty is
 the first such candidate.

---
 OpenSim/Grid/ScriptServer/Application.cs           |  4 +--
 .../Grid/ScriptServer/Properties/AssemblyInfo.cs   | 30 +++++++++++++++++++++-
 .../ScriptServer/ScriptEngineLoader.cs             |  6 ++---
 3 files changed, 34 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Grid/ScriptServer')

diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs
index 70dfcd3..5857101 100644
--- a/OpenSim/Grid/ScriptServer/Application.cs
+++ b/OpenSim/Grid/ScriptServer/Application.cs
@@ -47,9 +47,9 @@ namespace OpenSim.Grid.ScriptServer
 
         private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            Console.WriteLine("");
+            Console.WriteLine(String.Empty);
             Console.WriteLine("APPLICATION EXCEPTION DETECTED");
-            Console.WriteLine("");
+            Console.WriteLine(String.Empty);
             Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString());
             //Console.WriteLine("Exception:");
             //Console.WriteLine(e.ExceptionObject.ToString());
diff --git a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
index 2886ec7..539d55a 100644
--- a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
 using System.Reflection;
 using System.Runtime.InteropServices;
 
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("")]
 [assembly : AssemblyProduct("OpenSim.Grid.ScriptServer")]
-[assembly : AssemblyCopyright("Copyright ©  2007")]
+[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
 
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
index aefaa10..c9c0fb0 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
             //}
             //catch (Exception e)
             //{
-            //    m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());
+            //    m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString());
             //}
 
 
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
             //}
             //catch (Exception e)
             //{
-            //    m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
+            //    m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
             //}
 
             ScriptServerInterfaces.ScriptEngine ret;
@@ -114,7 +114,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
             //}
             //catch (Exception e)
             //{
-            //    m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
+            //    m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
             //}
 
             return ret;
-- 
cgit v1.1