aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorAdam Frisby2008-01-15 02:09:55 +0000
committerAdam Frisby2008-01-15 02:09:55 +0000
commitb25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch)
tree7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Grid
parentSet svn:eol-style. (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs12
-rw-r--r--OpenSim/Grid/GridServer/Main.cs8
-rw-r--r--OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/UserPresenceData.cs2
-rw-r--r--OpenSim/Grid/ScriptServer/Application.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs6
-rw-r--r--OpenSim/Grid/UserServer/Main.cs6
-rw-r--r--OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs30
10 files changed, 79 insertions, 23 deletions
diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index d598094..7c659dd 100644
--- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OGS-AssetServer")] 39[assembly : AssemblyProduct("OGS-AssetServer")]
40[assembly : AssemblyCopyright("Copyright © 2007")] 40[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 1e21d9e..b4b91bb 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -194,7 +194,7 @@ namespace OpenSim.Grid.GridServer
194 /// <returns>An XML string containing neighbour entities</returns> 194 /// <returns>An XML string containing neighbour entities</returns>
195 public string GetXMLNeighbours(ulong reqhandle) 195 public string GetXMLNeighbours(ulong reqhandle)
196 { 196 {
197 string response = ""; 197 string response = String.Empty;
198 RegionProfileData central_region = getRegion(reqhandle); 198 RegionProfileData central_region = getRegion(reqhandle);
199 RegionProfileData neighbour; 199 RegionProfileData neighbour;
200 for (int x = -1; x < 2; x++) 200 for (int x = -1; x < 2; x++)
@@ -241,7 +241,7 @@ namespace OpenSim.Grid.GridServer
241 { 241 {
242 TheSim = getRegion(new LLUUID((string)requestData["UUID"])); 242 TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
243 243
244 // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); 244 // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod",String.Empty, 5,"Region attempting login with UUID.");
245 } 245 }
246 else 246 else
247 { 247 {
@@ -615,7 +615,7 @@ namespace OpenSim.Grid.GridServer
615 /// <returns></returns> 615 /// <returns></returns>
616 public string RestGetRegionMethod(string request, string path, string param) 616 public string RestGetRegionMethod(string request, string path, string param)
617 { 617 {
618 return RestGetSimMethod("", "/sims/", param); 618 return RestGetSimMethod(String.Empty, "/sims/", param);
619 } 619 }
620 620
621 /// <summary> 621 /// <summary>
@@ -627,7 +627,7 @@ namespace OpenSim.Grid.GridServer
627 /// <returns></returns> 627 /// <returns></returns>
628 public string RestSetRegionMethod(string request, string path, string param) 628 public string RestSetRegionMethod(string request, string path, string param)
629 { 629 {
630 return RestSetSimMethod("", "/sims/", param); 630 return RestSetSimMethod(String.Empty, "/sims/", param);
631 } 631 }
632 632
633 /// <summary> 633 /// <summary>
@@ -704,7 +704,7 @@ namespace OpenSim.Grid.GridServer
704 TheSim.regionRecvKey = config.SimRecvKey; 704 TheSim.regionRecvKey = config.SimRecvKey;
705 TheSim.regionSendKey = config.SimSendKey; 705 TheSim.regionSendKey = config.SimSendKey;
706 TheSim.regionSecret = config.SimRecvKey; 706 TheSim.regionSecret = config.SimRecvKey;
707 TheSim.regionDataURI = ""; 707 TheSim.regionDataURI = String.Empty;
708 TheSim.regionAssetURI = config.DefaultAssetServer; 708 TheSim.regionAssetURI = config.DefaultAssetServer;
709 TheSim.regionAssetRecvKey = config.AssetRecvKey; 709 TheSim.regionAssetRecvKey = config.AssetRecvKey;
710 TheSim.regionAssetSendKey = config.AssetSendKey; 710 TheSim.regionAssetSendKey = config.AssetSendKey;
@@ -776,7 +776,7 @@ namespace OpenSim.Grid.GridServer
776 { 776 {
777 kvp.Value.AddProfile(TheSim); 777 kvp.Value.AddProfile(TheSim);
778 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); 778 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")");
779 logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", "", 5, 779 logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", String.Empty, 5,
780 "Region successfully updated and connected to grid."); 780 "Region successfully updated and connected to grid.");
781 } 781 }
782 else 782 else
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 6bb4c75..d4947b3 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Grid.GridServer
149 /* 149 /*
150 foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values) 150 foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values)
151 { 151 {
152 string SimResponse = ""; 152 string SimResponse = String.Empty;
153 try 153 try
154 { 154 {
155 WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/"); 155 WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/");
@@ -158,7 +158,7 @@ namespace OpenSim.Grid.GridServer
158 CheckSim.ContentLength = 0; 158 CheckSim.ContentLength = 0;
159 159
160 StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII); 160 StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII);
161 stOut.Write(""); 161 stOut.Write(String.Empty);
162 stOut.Close(); 162 stOut.Close();
163 163
164 StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream()); 164 StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream());
@@ -204,9 +204,9 @@ namespace OpenSim.Grid.GridServer
204 { 204 {
205 try 205 try
206 { 206 {
207 string attri = ""; 207 string attri = String.Empty;
208 attri = configData.GetAttribute("DataBaseProvider"); 208 attri = configData.GetAttribute("DataBaseProvider");
209 if (attri == "") 209 if (attri == String.Empty)
210 { 210 {
211 GridDll = "OpenSim.Framework.Data.DB4o.dll"; 211 GridDll = "OpenSim.Framework.Data.DB4o.dll";
212 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); 212 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
index 6f837e6..df06c90 100644
--- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OGS-GridServer")] 39[assembly : AssemblyProduct("OGS-GridServer")]
40[assembly : AssemblyCopyright("Copyright © 2007")] 40[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
index fdc5d10..5470d32 100644
--- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs
+++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Grid.MessagingServer
39 { 39 {
40 public AgentCircuitData agentData = new AgentCircuitData(); 40 public AgentCircuitData agentData = new AgentCircuitData();
41 public RegionProfileData regionData = new RegionProfileData(); 41 public RegionProfileData regionData = new RegionProfileData();
42 public string httpURI = ""; 42 public string httpURI = String.Empty;
43 public List<FriendListItem> friendData = new List<FriendListItem> (); 43 public List<FriendListItem> friendData = new List<FriendListItem> ();
44 public List<LLUUID> subscriptionData = new List<LLUUID>(); 44 public List<LLUUID> subscriptionData = new List<LLUUID>();
45 45
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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using 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;
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index f40c6f6..00a1641 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Grid.UserServer
147 regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X")); 147 regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X"));
148 regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y")); 148 regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y"));
149 149
150 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); 150 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
151 151
152 LLUUID userID = new LLUUID(); 152 LLUUID userID = new LLUUID();
153 try 153 try
@@ -220,9 +220,9 @@ namespace OpenSim.Grid.UserServer
220 { 220 {
221 try 221 try
222 { 222 {
223 string attri = ""; 223 string attri = String.Empty;
224 attri = configData.GetAttribute("DataBaseProvider"); 224 attri = configData.GetAttribute("DataBaseProvider");
225 if (attri == "") 225 if (attri == String.Empty)
226 { 226 {
227 StorageDll = "OpenSim.Framework.Data.DB4o.dll"; 227 StorageDll = "OpenSim.Framework.Data.DB4o.dll";
228 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); 228 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
diff --git a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
index 079e05e..06d4a0e 100644
--- a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer/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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using 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("OGS-UserServer")] 40[assembly : AssemblyProduct("OGS-UserServer")]
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