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/GridServer/GridManager.cs | 12 ++++++------
OpenSim/Grid/GridServer/Main.cs | 8 ++++----
OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Grid/GridServer')
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
/// An XML string containing neighbour entities
public string GetXMLNeighbours(ulong reqhandle)
{
- string response = "";
+ string response = String.Empty;
RegionProfileData central_region = getRegion(reqhandle);
RegionProfileData neighbour;
for (int x = -1; x < 2; x++)
@@ -241,7 +241,7 @@ namespace OpenSim.Grid.GridServer
{
TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
- // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID.");
+ // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod",String.Empty, 5,"Region attempting login with UUID.");
}
else
{
@@ -615,7 +615,7 @@ namespace OpenSim.Grid.GridServer
///
public string RestGetRegionMethod(string request, string path, string param)
{
- return RestGetSimMethod("", "/sims/", param);
+ return RestGetSimMethod(String.Empty, "/sims/", param);
}
///
@@ -627,7 +627,7 @@ namespace OpenSim.Grid.GridServer
///
public string RestSetRegionMethod(string request, string path, string param)
{
- return RestSetSimMethod("", "/sims/", param);
+ return RestSetSimMethod(String.Empty, "/sims/", param);
}
///
@@ -704,7 +704,7 @@ namespace OpenSim.Grid.GridServer
TheSim.regionRecvKey = config.SimRecvKey;
TheSim.regionSendKey = config.SimSendKey;
TheSim.regionSecret = config.SimRecvKey;
- TheSim.regionDataURI = "";
+ TheSim.regionDataURI = String.Empty;
TheSim.regionAssetURI = config.DefaultAssetServer;
TheSim.regionAssetRecvKey = config.AssetRecvKey;
TheSim.regionAssetSendKey = config.AssetSendKey;
@@ -776,7 +776,7 @@ namespace OpenSim.Grid.GridServer
{
kvp.Value.AddProfile(TheSim);
MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")");
- logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", "", 5,
+ logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", String.Empty, 5,
"Region successfully updated and connected to grid.");
}
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
/*
foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values)
{
- string SimResponse = "";
+ string SimResponse = String.Empty;
try
{
WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/");
@@ -158,7 +158,7 @@ namespace OpenSim.Grid.GridServer
CheckSim.ContentLength = 0;
StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII);
- stOut.Write("");
+ stOut.Write(String.Empty);
stOut.Close();
StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream());
@@ -204,9 +204,9 @@ namespace OpenSim.Grid.GridServer
{
try
{
- string attri = "";
+ string attri = String.Empty;
attri = configData.GetAttribute("DataBaseProvider");
- if (attri == "")
+ if (attri == String.Empty)
{
GridDll = "OpenSim.Framework.Data.DB4o.dll";
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;
[assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OGS-GridServer")]
-[assembly : AssemblyCopyright("Copyright © 2007")]
+[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]
--
cgit v1.1