diff options
author | Adam Frisby | 2008-01-15 02:09:55 +0000 |
---|---|---|
committer | Adam Frisby | 2008-01-15 02:09:55 +0000 |
commit | b25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch) | |
tree | 7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Grid/ScriptServer | |
parent | Set svn:eol-style. (diff) | |
download | opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.zip opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.gz opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.bz2 opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.xz |
* 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.
Diffstat (limited to 'OpenSim/Grid/ScriptServer')
-rw-r--r-- | OpenSim/Grid/ScriptServer/Application.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs | 30 | ||||
-rw-r--r-- | OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs | 6 |
3 files changed, 34 insertions, 6 deletions
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 | |||
47 | 47 | ||
48 | private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) | 48 | private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) |
49 | { | 49 | { |
50 | Console.WriteLine(""); | 50 | Console.WriteLine(String.Empty); |
51 | Console.WriteLine("APPLICATION EXCEPTION DETECTED"); | 51 | Console.WriteLine("APPLICATION EXCEPTION DETECTED"); |
52 | Console.WriteLine(""); | 52 | Console.WriteLine(String.Empty); |
53 | Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString()); | 53 | Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString()); |
54 | //Console.WriteLine("Exception:"); | 54 | //Console.WriteLine("Exception:"); |
55 | //Console.WriteLine(e.ExceptionObject.ToString()); | 55 | //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 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | |||
1 | using System.Reflection; | 29 | using System.Reflection; |
2 | using System.Runtime.InteropServices; | 30 | using System.Runtime.InteropServices; |
3 | 31 | ||
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices; | |||
10 | [assembly : AssemblyConfiguration("")] | 38 | [assembly : AssemblyConfiguration("")] |
11 | [assembly : AssemblyCompany("")] | 39 | [assembly : AssemblyCompany("")] |
12 | [assembly : AssemblyProduct("OpenSim.Grid.ScriptServer")] | 40 | [assembly : AssemblyProduct("OpenSim.Grid.ScriptServer")] |
13 | [assembly : AssemblyCopyright("Copyright © 2007")] | 41 | [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] |
14 | [assembly : AssemblyTrademark("")] | 42 | [assembly : AssemblyTrademark("")] |
15 | [assembly : AssemblyCulture("")] | 43 | [assembly : AssemblyCulture("")] |
16 | 44 | ||
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 | |||
87 | //} | 87 | //} |
88 | //catch (Exception e) | 88 | //catch (Exception e) |
89 | //{ | 89 | //{ |
90 | // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString()); | 90 | // m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString()); |
91 | //} | 91 | //} |
92 | 92 | ||
93 | 93 | ||
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer | |||
104 | //} | 104 | //} |
105 | //catch (Exception e) | 105 | //catch (Exception e) |
106 | //{ | 106 | //{ |
107 | // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); | 107 | // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); |
108 | //} | 108 | //} |
109 | 109 | ||
110 | ScriptServerInterfaces.ScriptEngine ret; | 110 | ScriptServerInterfaces.ScriptEngine ret; |
@@ -114,7 +114,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer | |||
114 | //} | 114 | //} |
115 | //catch (Exception e) | 115 | //catch (Exception e) |
116 | //{ | 116 | //{ |
117 | // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); | 117 | // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); |
118 | //} | 118 | //} |
119 | 119 | ||
120 | return ret; | 120 | return ret; |