OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.
ThreadPoolClientBranch
Adam Frisby 2008-01-15 02:09:55 +00:00
parent 84c3a317c1
commit b25f9f322c
121 changed files with 973 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.Addin")] [assembly : AssemblyProduct("OpenSim.Addin")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

14
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
{ {
private OpenSimMain m_app; private OpenSimMain m_app;
private BaseHttpServer m_httpd; private BaseHttpServer m_httpd;
private string requiredPassword = ""; private string requiredPassword = String.Empty;
public void Initialise(OpenSimMain openSim) public void Initialise(OpenSimMain openSim)
{ {
@ -57,7 +57,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
{ {
MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled"); MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled");
requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", ""); requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty);
m_app = openSim; m_app = openSim;
m_httpd = openSim.HttpServer; m_httpd = openSim.HttpServer;
@ -83,7 +83,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
LLUUID regionID = new LLUUID((string) requestData["regionID"]); LLUUID regionID = new LLUUID((string) requestData["regionID"]);
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
if (requiredPassword != "" && if (requiredPassword != String.Empty &&
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
{ {
responseData["accepted"] = "false"; responseData["accepted"] = "false";
@ -116,7 +116,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
Hashtable requestData = (Hashtable) request.Params[0]; Hashtable requestData = (Hashtable) request.Params[0];
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
if (requiredPassword != "" && if (requiredPassword != String.Empty &&
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
{ {
responseData["accepted"] = "false"; responseData["accepted"] = "false";
@ -142,7 +142,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
if (requiredPassword != "" && if (requiredPassword != String.Empty &&
(!requestData.Contains("password") || (string)requestData["password"] != requiredPassword)) (!requestData.Contains("password") || (string)requestData["password"] != requiredPassword))
{ {
responseData["accepted"] = "false"; responseData["accepted"] = "false";
@ -180,7 +180,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable) request.Params[0]; Hashtable requestData = (Hashtable) request.Params[0];
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
if (requiredPassword != "" && if (requiredPassword != String.Empty &&
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
{ {
responseData["accepted"] = "false"; responseData["accepted"] = "false";
@ -236,7 +236,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable) request.Params[0]; Hashtable requestData = (Hashtable) request.Params[0];
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
if (requiredPassword != "" && if (requiredPassword != System.String.Empty &&
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
{ {
responseData["created"] = "false"; responseData["created"] = "false";

4
OpenSim/Framework/AgentCircuitData.cs
View File

@ -61,7 +61,7 @@ namespace OpenSim.Framework
public bool child; public bool child;
public LLUUID InventoryFolder; public LLUUID InventoryFolder;
public LLUUID BaseFolder; public LLUUID BaseFolder;
public string CapsPath = ""; public string CapsPath = String.Empty;
} }
[Serializable] [Serializable]
@ -100,6 +100,6 @@ namespace OpenSim.Framework
public bool child; public bool child;
public Guid InventoryFolder; public Guid InventoryFolder;
public Guid BaseFolder; public Guid BaseFolder;
public string CapsPath = ""; public string CapsPath = String.Empty;
} }
} }

4
OpenSim/Framework/AgentInventory.cs
View File

@ -234,7 +234,7 @@ namespace OpenSim.Framework
public LLUUID CreatorID; public LLUUID CreatorID;
public sbyte InvType; public sbyte InvType;
public sbyte Type; public sbyte Type;
public string Name = ""; public string Name = System.String.Empty;
public string Description; public string Description;
public InventoryItem() public InventoryItem()
@ -245,7 +245,7 @@ namespace OpenSim.Framework
public string ExportString() public string ExportString()
{ {
string typ = "notecard"; string typ = "notecard";
string result = ""; string result = System.String.Empty;
result += "\tinv_object\t0\n\t{\n"; result += "\tinv_object\t0\n\t{\n";
result += "\t\tobj_id\t%s\n"; result += "\t\tobj_id\t%s\n";
result += "\t\tparent_id\t" + ItemID.ToString() + "\n"; result += "\t\tparent_id\t" + ItemID.ToString() + "\n";

30
OpenSim/Framework/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.FrameWork")] [assembly : AssemblyProduct("OpenSim.FrameWork")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

4
OpenSim/Framework/AssetBase.cs
View File

@ -37,8 +37,8 @@ namespace OpenSim.Framework
public LLUUID FullID; public LLUUID FullID;
public sbyte Type; public sbyte Type;
public sbyte InvType; public sbyte InvType;
public string Name = ""; public string Name = String.Empty;
public string Description = ""; public string Description = String.Empty;
public bool Local = false; public bool Local = false;
public bool Temporary = false; public bool Temporary = false;

6
OpenSim/Framework/AssetConfig.cs
View File

@ -26,6 +26,8 @@
* *
*/ */
using System;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
/// <summary> /// <summary>
@ -33,9 +35,9 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public class AssetConfig public class AssetConfig
{ {
public string DefaultStartupMsg = ""; public string DefaultStartupMsg = String.Empty;
public string DatabaseProvider = ""; public string DatabaseProvider = String.Empty;
public static uint DefaultHttpPort = 8003; public static uint DefaultHttpPort = 8003;
public uint HttpPort = DefaultHttpPort; public uint HttpPort = DefaultHttpPort;

6
OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
View File

@ -99,7 +99,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
for (int i = 0; i < source.Configs.Count; i++) for (int i = 0; i < source.Configs.Count; i++)
{ {
assetSetPath = source.Configs[i].GetString("file", ""); assetSetPath = source.Configs[i].GetString("file", String.Empty);
LoadXmlAssetSet(Path.Combine(Util.assetsDir(), assetSetPath), assets); LoadXmlAssetSet(Path.Combine(Util.assetsDir(), assetSetPath), assets);
} }
@ -138,10 +138,10 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
for (int i = 0; i < source.Configs.Count; i++) for (int i = 0; i < source.Configs.Count; i++)
{ {
string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString()); string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
string name = source.Configs[i].GetString("name", ""); string name = source.Configs[i].GetString("name", String.Empty);
sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0); sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", "")); string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty));
AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false); AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false);

2
OpenSim/Framework/Communications/CAPSService.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.Framework.Communications
public string CapsRequest(string request, string path, string param) public string CapsRequest(string request, string path, string param)
{ {
System.Console.WriteLine("new caps request " + request + " from path " + path); System.Console.WriteLine("new caps request " + request + " from path " + path);
return ""; return System.String.Empty;
} }
} }
} }

2
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -208,7 +208,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <param name="asset"></param> /// <param name="asset"></param>
public void AddAsset(AssetBase asset) public void AddAsset(AssetBase asset)
{ {
string temporary = asset.Temporary ? "temporary" : ""; string temporary = asset.Temporary ? "temporary" : String.Empty;
string type = asset.Type == 0 ? "texture" : "asset"; string type = asset.Type == 0 ? "texture" : "asset";
string result = "Ignored"; string result = "Ignored";

22
OpenSim/Framework/Communications/Cache/AssetTransactions.cs
View File

@ -123,8 +123,8 @@ namespace OpenSim.Framework.Communications.Cache
public LLUUID TransactionID = LLUUID.Zero; public LLUUID TransactionID = LLUUID.Zero;
public bool UploadComplete; public bool UploadComplete;
public ulong XferID; public ulong XferID;
private string m_name = ""; private string m_name = String.Empty;
private string m_description = ""; private string m_description = String.Empty;
private sbyte type = 0; private sbyte type = 0;
private sbyte invType = 0; private sbyte invType = 0;
private uint nextPerm = 0; private uint nextPerm = 0;
@ -331,12 +331,12 @@ namespace OpenSim.Framework.Communications.Cache
// Fields // Fields
private BaseHttpServer httpListener; private BaseHttpServer httpListener;
private LLUUID inventoryItemID; private LLUUID inventoryItemID;
private string m_assetDescription = ""; private string m_assetDescription = String.Empty;
private string m_assetName = ""; private string m_assetName = String.Empty;
private LLUUID m_folderID; private LLUUID m_folderID;
private LLUUID newAssetID; private LLUUID newAssetID;
private bool m_dumpImageToFile; private bool m_dumpImageToFile;
private string uploaderPath = ""; private string uploaderPath = String.Empty;
// Events // Events
public event UpLoadedAsset OnUpLoad; public event UpLoadedAsset OnUpLoad;
@ -367,7 +367,7 @@ namespace OpenSim.Framework.Communications.Cache
public string uploaderCaps(byte[] data, string path, string param) public string uploaderCaps(byte[] data, string path, string param)
{ {
LLUUID inventoryItemID = this.inventoryItemID; LLUUID inventoryItemID = this.inventoryItemID;
string text = ""; string text = String.Empty;
LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
complete.new_asset = newAssetID.ToString(); complete.new_asset = newAssetID.ToString();
complete.new_inventory_item = inventoryItemID; complete.new_inventory_item = inventoryItemID;
@ -380,7 +380,7 @@ namespace OpenSim.Framework.Communications.Cache
} }
if (OnUpLoad != null) if (OnUpLoad != null)
{ {
OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", ""); OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, String.Empty, String.Empty);
} }
return text; return text;
} }
@ -391,10 +391,10 @@ namespace OpenSim.Framework.Communications.Cache
// Fields // Fields
private BaseHttpServer httpListener; private BaseHttpServer httpListener;
private LLUUID inventoryItemID; private LLUUID inventoryItemID;
private string m_assetName = ""; private string m_assetName = String.Empty;
private LLUUID newAssetID; private LLUUID newAssetID;
private bool SaveImages = false; private bool SaveImages = false;
private string uploaderPath = ""; private string uploaderPath = String.Empty;
// Events // Events
public event UpLoadedAsset OnUpLoad; public event UpLoadedAsset OnUpLoad;
@ -420,7 +420,7 @@ namespace OpenSim.Framework.Communications.Cache
public string uploaderCaps(byte[] data, string path, string param) public string uploaderCaps(byte[] data, string path, string param)
{ {
LLUUID inventoryItemID = this.inventoryItemID; LLUUID inventoryItemID = this.inventoryItemID;
string text = ""; string text = String.Empty;
LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
complete.new_asset = newAssetID.ToString(); complete.new_asset = newAssetID.ToString();
complete.new_inventory_item = inventoryItemID; complete.new_inventory_item = inventoryItemID;
@ -433,7 +433,7 @@ namespace OpenSim.Framework.Communications.Cache
} }
if (OnUpLoad != null) if (OnUpLoad != null)
{ {
OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", ""); OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, String.Empty, String.Empty);
} }
return text; return text;
} }

8
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@ -152,13 +152,13 @@ namespace OpenSim.Framework.Communications.Cache
{ {
string foldersPath string foldersPath
= Path.Combine( = Path.Combine(
Util.inventoryDir(), config.GetString("foldersFile", "")); Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty));
LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig);
string itemsPath string itemsPath
= Path.Combine( = Path.Combine(
Util.inventoryDir(), config.GetString("itemsFile", "")); Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty));
LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); LoadFromFile(itemsPath, "Library items", ReadItemFromConfig);
} }
@ -210,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache
item.inventoryID = new LLUUID(config.GetString("inventoryID", folderID.ToString())); item.inventoryID = new LLUUID(config.GetString("inventoryID", folderID.ToString()));
item.assetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); item.assetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
item.parentFolderID = new LLUUID(config.GetString("folderID", folderID.ToString())); item.parentFolderID = new LLUUID(config.GetString("folderID", folderID.ToString()));
item.inventoryDescription = config.GetString("description", ""); item.inventoryDescription = config.GetString("description", System.String.Empty);
item.inventoryName = config.GetString("name", ""); item.inventoryName = config.GetString("name", System.String.Empty);
item.assetType = config.GetInt("assetType", 0); item.assetType = config.GetInt("assetType", 0);
item.invType = config.GetInt("inventoryType", 0); item.invType = config.GetInt("inventoryType", 0);
item.inventoryCurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); item.inventoryCurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);

24
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -197,7 +197,7 @@ namespace OpenSim.Region.Capabilities
{ {
Console.WriteLine("texture request " + request); Console.WriteLine("texture request " + request);
// Needs implementing (added to remove compiler warning) // Needs implementing (added to remove compiler warning)
return ""; return String.Empty;
} }
#region EventQueue (Currently not enabled) #region EventQueue (Currently not enabled)
@ -211,7 +211,7 @@ namespace OpenSim.Region.Capabilities
/// <returns></returns> /// <returns></returns>
public string ProcessEventQueue(string request, string path, string param) public string ProcessEventQueue(string request, string path, string param)
{ {
string res = ""; string res = String.Empty;
if (m_capsEventQueue.Count > 0) if (m_capsEventQueue.Count > 0)
{ {
@ -476,17 +476,17 @@ namespace OpenSim.Region.Capabilities
{ {
public event UpLoadedAsset OnUpLoad; public event UpLoadedAsset OnUpLoad;
private string uploaderPath = ""; private string uploaderPath = String.Empty;
private LLUUID newAssetID; private LLUUID newAssetID;
private LLUUID inventoryItemID; private LLUUID inventoryItemID;
private LLUUID parentFolder; private LLUUID parentFolder;
private BaseHttpServer httpListener; private BaseHttpServer httpListener;
private bool m_dumpAssetsToFile; private bool m_dumpAssetsToFile;
private string m_assetName = ""; private string m_assetName = String.Empty;
private string m_assetDes = ""; private string m_assetDes = String.Empty;
private string m_invType = ""; private string m_invType = String.Empty;
private string m_assetType = ""; private string m_assetType = String.Empty;
public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem, public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem,
LLUUID parentFolderID, string invType, string assetType, string path, LLUUID parentFolderID, string invType, string assetType, string path,
@ -514,7 +514,7 @@ namespace OpenSim.Region.Capabilities
public string uploaderCaps(byte[] data, string path, string param) public string uploaderCaps(byte[] data, string path, string param)
{ {
LLUUID inv = inventoryItemID; LLUUID inv = inventoryItemID;
string res = ""; string res = String.Empty;
LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
uploadComplete.new_asset = newAssetID.ToString(); uploadComplete.new_asset = newAssetID.ToString();
uploadComplete.new_inventory_item = inv; uploadComplete.new_inventory_item = inv;
@ -568,7 +568,7 @@ namespace OpenSim.Region.Capabilities
{ {
public event UpdateItem OnUpLoad; public event UpdateItem OnUpLoad;
private string uploaderPath = ""; private string uploaderPath = String.Empty;
private LLUUID inventoryItemID; private LLUUID inventoryItemID;
private BaseHttpServer httpListener; private BaseHttpServer httpListener;
private bool m_dumpAssetToFile; private bool m_dumpAssetToFile;
@ -592,7 +592,7 @@ namespace OpenSim.Region.Capabilities
public string uploaderCaps(byte[] data, string path, string param) public string uploaderCaps(byte[] data, string path, string param)
{ {
LLUUID inv = inventoryItemID; LLUUID inv = inventoryItemID;
string res = ""; string res = String.Empty;
LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
LLUUID assetID = LLUUID.Zero; LLUUID assetID = LLUUID.Zero;
@ -648,7 +648,7 @@ namespace OpenSim.Region.Capabilities
{ {
public event UpdateTaskScript OnUpLoad; public event UpdateTaskScript OnUpLoad;
private string uploaderPath = ""; private string uploaderPath = String.Empty;
private LLUUID inventoryItemID; private LLUUID inventoryItemID;
private LLUUID primID; private LLUUID primID;
private bool isScriptRunning; private bool isScriptRunning;
@ -686,7 +686,7 @@ namespace OpenSim.Region.Capabilities
// "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}", // "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}",
// data, path, param); // data, path, param);
string res = ""; string res = String.Empty;
LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
if (OnUpLoad != null) if (OnUpLoad != null)

5
OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
View File

@ -26,15 +26,16 @@
* *
*/ */
using libsecondlife; using libsecondlife;
using System;
namespace OpenSim.Region.Capabilities namespace OpenSim.Region.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class LLSDAssetUploadComplete public class LLSDAssetUploadComplete
{ {
public string new_asset = ""; public string new_asset = String.Empty;
public LLUUID new_inventory_item = LLUUID.Zero; public LLUUID new_inventory_item = LLUUID.Zero;
public string state = ""; public string state = String.Empty;
//public bool success = false; //public bool success = false;
public LLSDAssetUploadComplete() public LLSDAssetUploadComplete()

8
OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
View File

@ -33,11 +33,11 @@ namespace OpenSim.Region.Capabilities
[LLSDMap] [LLSDMap]
public class LLSDAssetUploadRequest public class LLSDAssetUploadRequest
{ {
public string asset_type = ""; public string asset_type = System.String.Empty;
public string description = ""; public string description = System.String.Empty;
public LLUUID folder_id = LLUUID.Zero; public LLUUID folder_id = LLUUID.Zero;
public string inventory_type = ""; public string inventory_type = System.String.Empty;
public string name = ""; public string name = System.String.Empty;
public LLSDAssetUploadRequest() public LLSDAssetUploadRequest()
{ {

4
OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
View File

@ -31,8 +31,8 @@ namespace OpenSim.Region.Capabilities
[LLSDMap] [LLSDMap]
public class LLSDAssetUploadResponse public class LLSDAssetUploadResponse
{ {
public string uploader = ""; public string uploader = System.String.Empty;
public string state = ""; public string state = System.String.Empty;
public LLSDAssetUploadResponse() public LLSDAssetUploadResponse()
{ {

20
OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
View File

@ -26,20 +26,22 @@
* *
*/ */
using System;
namespace OpenSim.Region.Capabilities namespace OpenSim.Region.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class LLSDCapsDetails public class LLSDCapsDetails
{ {
public string MapLayer = ""; public string MapLayer = String.Empty;
public string NewFileAgentInventory = ""; public string NewFileAgentInventory = String.Empty;
//public string EventQueueGet = ""; //public string EventQueueGet = String.Empty;
// public string RequestTextureDownload = ""; // public string RequestTextureDownload = String.Empty;
// public string ChatSessionRequest = ""; // public string ChatSessionRequest = String.Empty;
public string UpdateNotecardAgentInventory = ""; public string UpdateNotecardAgentInventory = String.Empty;
public string UpdateScriptAgentInventory = ""; public string UpdateScriptAgentInventory = String.Empty;
public string UpdateScriptTaskInventory = ""; public string UpdateScriptTaskInventory = String.Empty;
// public string ParcelVoiceInfoRequest = ""; // public string ParcelVoiceInfoRequest = String.Empty;
public LLSDCapsDetails() public LLSDCapsDetails()
{ {

2
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@ -136,7 +136,7 @@ namespace OpenSim.Framework.Communications
public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY) public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY)
{ {
string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + ""); string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty);
m_userService.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY); m_userService.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY);
UserProfileData userProf = UserService.GetUserProfile(firstName, lastName); UserProfileData userProf = UserService.GetUserProfile(firstName, lastName);

2
OpenSim/Framework/Communications/LoginResponse.cs
View File

@ -149,7 +149,7 @@ namespace OpenSim.Framework.UserManagement
ErrorMessage = "You have entered an invalid name/password combination. Check Caps/lock."; ErrorMessage = "You have entered an invalid name/password combination. Check Caps/lock.";
ErrorReason = "key"; ErrorReason = "key";
welcomeMessage = "Welcome to OpenSim!"; welcomeMessage = "Welcome to OpenSim!";
seedCapability = ""; seedCapability = String.Empty;
home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" + home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" +
userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" + userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" +
userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" + userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" +

44
OpenSim/Framework/Communications/LoginService.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Framework.UserManagement
m_userManager = userManager; m_userManager = userManager;
m_libraryRootFolder = libraryRootFolder; m_libraryRootFolder = libraryRootFolder;
if (welcomeMess != "") if (welcomeMess != String.Empty)
{ {
m_welcomeMessage = welcomeMess; m_welcomeMessage = welcomeMess;
} }
@ -370,16 +370,16 @@ namespace OpenSim.Framework.UserManagement
Hashtable returnactions = new Hashtable(); Hashtable returnactions = new Hashtable();
int statuscode = 200; int statuscode = 200;
string firstname = ""; string firstname = String.Empty;
string lastname = ""; string lastname = String.Empty;
string location = ""; string location = String.Empty;
string region =""; string region =String.Empty;
string grid = ""; string grid = String.Empty;
string channel = ""; string channel = String.Empty;
string version = ""; string version = String.Empty;
string lang = ""; string lang = String.Empty;
string password = ""; string password = String.Empty;
string errormessages = ""; string errormessages = String.Empty;
// the client requires the HTML form field be named 'username' // the client requires the HTML form field be named 'username'
// however, the data it sends when it loads the first time is 'firstname' // however, the data it sends when it loads the first time is 'firstname'
@ -387,33 +387,33 @@ namespace OpenSim.Framework.UserManagement
if (keysvals.Contains("firstname")) if (keysvals.Contains("firstname"))
firstname = wfcut.Replace((string)keysvals["firstname"],"",99999); firstname = wfcut.Replace((string)keysvals["firstname"],String.Empty,99999);
if (keysvals.Contains("username")) if (keysvals.Contains("username"))
firstname = wfcut.Replace((string)keysvals["username"],"",99999); firstname = wfcut.Replace((string)keysvals["username"],String.Empty,99999);
if (keysvals.Contains("lastname")) if (keysvals.Contains("lastname"))
lastname = wfcut.Replace((string)keysvals["lastname"],"",99999); lastname = wfcut.Replace((string)keysvals["lastname"],String.Empty,99999);
if (keysvals.Contains("location")) if (keysvals.Contains("location"))
location = wfcut.Replace((string)keysvals["location"],"",99999); location = wfcut.Replace((string)keysvals["location"],String.Empty,99999);
if (keysvals.Contains("region")) if (keysvals.Contains("region"))
region = wfcut.Replace((string)keysvals["region"],"",99999); region = wfcut.Replace((string)keysvals["region"],String.Empty,99999);
if (keysvals.Contains("grid")) if (keysvals.Contains("grid"))
grid = wfcut.Replace((string)keysvals["grid"],"",99999); grid = wfcut.Replace((string)keysvals["grid"],String.Empty,99999);
if (keysvals.Contains("channel")) if (keysvals.Contains("channel"))
channel = wfcut.Replace((string)keysvals["channel"],"",99999); channel = wfcut.Replace((string)keysvals["channel"],String.Empty,99999);
if (keysvals.Contains("version")) if (keysvals.Contains("version"))
version = wfcut.Replace((string)keysvals["version"],"",99999); version = wfcut.Replace((string)keysvals["version"],String.Empty,99999);
if (keysvals.Contains("lang")) if (keysvals.Contains("lang"))
lang = wfcut.Replace((string)keysvals["lang"],"",99999); lang = wfcut.Replace((string)keysvals["lang"],String.Empty,99999);
if (keysvals.Contains("password")) if (keysvals.Contains("password"))
password = wfcut.Replace((string)keysvals["password"], "", 99999); password = wfcut.Replace((string)keysvals["password"], String.Empty, 99999);
// load our login form. // load our login form.
@ -470,7 +470,7 @@ namespace OpenSim.Framework.UserManagement
{ {
// inject our values in the form at the markers // inject our values in the form at the markers
string loginform=""; string loginform=String.Empty;
string file = Path.Combine(Util.configDir(), "http_loginform.html"); string file = Path.Combine(Util.configDir(), "http_loginform.html");
if (!File.Exists(file)) if (!File.Exists(file))
{ {

2
OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
View File

@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenGrid.Framework.Communications")] [assembly : AssemblyProduct("OpenGrid.Framework.Communications")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

2
OpenSim/Framework/Communications/RestClient/RestClient.cs
View File

@ -201,7 +201,7 @@ namespace OpenSim.Framework.Communications
/// <returns>slash '/' if not already present</returns> /// <returns>slash '/' if not already present</returns>
private string slash(string s) private string slash(string s)
{ {
return isSlashed(s) ? "" : "/"; return isSlashed(s) ? String.Empty : "/";
} }
/// <summary> /// <summary>

2
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -472,7 +472,7 @@ namespace OpenSim.Framework.UserManagement
user.username = firstName; user.username = firstName;
user.surname = lastName; user.surname = lastName;
user.passwordHash = pass; user.passwordHash = pass;
user.passwordSalt = ""; user.passwordSalt = String.Empty;
user.created = Util.UnixTimeSinceEpoch(); user.created = Util.UnixTimeSinceEpoch();
user.homeLookAt = new LLVector3(100, 100, 100); user.homeLookAt = new LLVector3(100, 100, 100);
user.homeRegionX = regX; user.homeRegionX = regX;

2
OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
View File

@ -39,7 +39,7 @@ namespace OpenSim.Framework.Configuration.HTTP
private XmlConfiguration xmlConfig; private XmlConfiguration xmlConfig;
private string configFileName = ""; private string configFileName = System.String.Empty;
public HTTPConfiguration() public HTTPConfiguration()
{ {

2
OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
View File

@ -32,7 +32,7 @@ namespace OpenSim.Framework.Configuration.HTTP
{ {
private ConfigurationMember configMember; private ConfigurationMember configMember;
public string baseConfigURL = ""; public string baseConfigURL = System.String.Empty;
public RemoteConfigSettings(string filename) public RemoteConfigSettings(string filename)
{ {

4
OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
View File

@ -71,9 +71,9 @@ namespace OpenSim.Framework.Configuration
else else
{ {
createdFile = true; createdFile = true;
rootNode = doc.CreateNode(XmlNodeType.Element, "Root", ""); rootNode = doc.CreateNode(XmlNodeType.Element, "Root", String.Empty);
doc.AppendChild(rootNode); doc.AppendChild(rootNode);
configNode = doc.CreateNode(XmlNodeType.Element, "Config", ""); configNode = doc.CreateNode(XmlNodeType.Element, "Config", String.Empty);
rootNode.AppendChild(configNode); rootNode.AppendChild(configNode);
} }

18
OpenSim/Framework/ConfigurationMember.cs
View File

@ -44,8 +44,8 @@ namespace OpenSim.Framework
public delegate void ConfigurationOptionsLoad(); public delegate void ConfigurationOptionsLoad();
private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>(); private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>();
private string configurationFilename = ""; private string configurationFilename = String.Empty;
private string configurationDescription = ""; private string configurationDescription = String.Empty;
private XmlNode configurationFromXMLNode = null; private XmlNode configurationFromXMLNode = null;
private ConfigurationOptionsLoad loadFunction; private ConfigurationOptionsLoad loadFunction;
private ConfigurationOptionResult resultFunction; private ConfigurationOptionResult resultFunction;
@ -70,7 +70,7 @@ namespace OpenSim.Framework
public ConfigurationMember(XmlNode configuration_xml, string configuration_description, public ConfigurationMember(XmlNode configuration_xml, string configuration_description,
ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error) ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
{ {
configurationFilename = ""; configurationFilename = String.Empty;
configurationFromXMLNode = configuration_xml; configurationFromXMLNode = configuration_xml;
configurationDescription = configuration_description; configurationDescription = configuration_description;
loadFunction = load_function; loadFunction = load_function;
@ -100,8 +100,8 @@ namespace OpenSim.Framework
private void checkAndAddConfigOption(ConfigurationOption option) private void checkAndAddConfigOption(ConfigurationOption option)
{ {
if ((option.configurationKey != "" && option.configurationQuestion != "") || if ((option.configurationKey != String.Empty && option.configurationQuestion != String.Empty) ||
(option.configurationKey != "" && option.configurationUseDefaultNoPrompt)) (option.configurationKey != String.Empty && option.configurationUseDefaultNoPrompt))
{ {
if (!configurationOptions.Contains(option)) if (!configurationOptions.Contains(option))
{ {
@ -190,7 +190,7 @@ namespace OpenSim.Framework
return; return;
} }
if (configurationFilename.Trim() != "") if (configurationFilename.Trim() != String.Empty)
{ {
configurationPlugin.SetFileName(configurationFilename); configurationPlugin.SetFileName(configurationFilename);
try try
@ -220,11 +220,11 @@ namespace OpenSim.Framework
{ {
bool convertSuccess = false; bool convertSuccess = false;
object return_result = null; object return_result = null;
string errorMessage = ""; string errorMessage = String.Empty;
bool ignoreNextFromConfig = false; bool ignoreNextFromConfig = false;
while (convertSuccess == false) while (convertSuccess == false)
{ {
string console_result = ""; string console_result = String.Empty;
string attribute = null; string attribute = null;
if (useFile || configurationFromXMLNode != null) if (useFile || configurationFromXMLNode != null)
{ {
@ -250,7 +250,7 @@ namespace OpenSim.Framework
configOption.shouldIBeAsked(configOption.configurationKey)) || configOption.shouldIBeAsked(configOption.configurationKey)) ||
configOption.shouldIBeAsked == null) configOption.shouldIBeAsked == null)
{ {
if (configurationDescription.Trim() != "") if (configurationDescription.Trim() != String.Empty)
{ {
console_result = console_result =
MainLog.Instance.CmdPrompt( MainLog.Instance.CmdPrompt(

8
OpenSim/Framework/ConfigurationOption.cs
View File

@ -26,6 +26,8 @@
* *
*/ */
using System;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
public class ConfigurationOption public class ConfigurationOption
@ -52,9 +54,9 @@ namespace OpenSim.Framework
TYPE_DOUBLE TYPE_DOUBLE
} ; } ;
public string configurationKey = ""; public string configurationKey = String.Empty;
public string configurationQuestion = ""; public string configurationQuestion = String.Empty;
public string configurationDefault = ""; public string configurationDefault = String.Empty;
public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING; public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING;
public bool configurationUseDefaultNoPrompt = false; public bool configurationUseDefaultNoPrompt = false;

10
OpenSim/Framework/Console/AssemblyInfo.cs
View File

@ -36,12 +36,12 @@ using System.Runtime.InteropServices;
[assembly : AssemblyTitle("ServerConsole")] [assembly : AssemblyTitle("ServerConsole")]
[assembly : AssemblyDescription("")] [assembly : AssemblyDescription("")]
[assembly : AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly : AssemblyProduct("ServerConsole")] [assembly : AssemblyProduct("ServerConsole")]
[assembly : AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly : AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly: AssemblyCulture("")]
// This sets the default COM visibility of types in the assembly to invisible. // This sets the default COM visibility of types in the assembly to invisible.
// If you need to expose a type to COM, use [ComVisible(true)] on that type. // If you need to expose a type to COM, use [ComVisible(true)] on that type.

4
OpenSim/Framework/Console/LogBase.cs
View File

@ -298,7 +298,7 @@ namespace OpenSim.Framework.Console
catch (Exception e) catch (Exception e)
{ {
MainLog.Instance.Error("Console", "System.Console.ReadLine exception " + e.ToString()); MainLog.Instance.Error("Console", "System.Console.ReadLine exception " + e.ToString());
return ""; return String.Empty;
} }
} }
@ -377,7 +377,7 @@ namespace OpenSim.Framework.Console
public string CmdPrompt(string prompt, string defaultresponse) public string CmdPrompt(string prompt, string defaultresponse)
{ {
string temp = CmdPrompt(String.Format("{0} [{1}]", prompt, defaultresponse)); string temp = CmdPrompt(String.Format("{0} [{1}]", prompt, defaultresponse));
if (temp == "") if (temp == String.Empty)
{ {
return defaultresponse; return defaultresponse;
} }

30
OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.Framework.Data.DB4o")] [assembly : AssemblyProduct("OpenSim.Framework.Data.DB4o")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

12
OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
View File

@ -186,7 +186,7 @@ namespace OpenSim.Framework.Data.MSSQL
protected static string defineTable(DataTable dt) protected static string defineTable(DataTable dt)
{ {
string sql = "create table " + dt.TableName + "("; string sql = "create table " + dt.TableName + "(";
string subsql = ""; string subsql = String.Empty;
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
if (subsql.Length > 0) if (subsql.Length > 0)
@ -337,7 +337,7 @@ namespace OpenSim.Framework.Data.MSSQL
// World Map Addition // World Map Addition
string tempRegionMap = reader["regionMapTexture"].ToString(); string tempRegionMap = reader["regionMapTexture"].ToString();
if (tempRegionMap != "") if (tempRegionMap != String.Empty)
{ {
regionprofile.regionMapTextureID = new LLUUID(tempRegionMap); regionprofile.regionMapTextureID = new LLUUID(tempRegionMap);
} }
@ -644,12 +644,12 @@ namespace OpenSim.Framework.Data.MSSQL
parameters["homeLookAtZ"] = homeLookAtZ.ToString(); parameters["homeLookAtZ"] = homeLookAtZ.ToString();
parameters["created"] = created.ToString(); parameters["created"] = created.ToString();
parameters["lastLogin"] = lastlogin.ToString(); parameters["lastLogin"] = lastlogin.ToString();
parameters["userInventoryURI"] = ""; parameters["userInventoryURI"] = String.Empty;
parameters["userAssetURI"] = ""; parameters["userAssetURI"] = String.Empty;
parameters["profileCanDoMask"] = "0"; parameters["profileCanDoMask"] = "0";
parameters["profileWantDoMask"] = "0"; parameters["profileWantDoMask"] = "0";
parameters["profileAboutText"] = ""; parameters["profileAboutText"] = String.Empty;
parameters["profileFirstText"] = ""; parameters["profileFirstText"] = String.Empty;
parameters["profileImage"] = LLUUID.Zero.ToString(); parameters["profileImage"] = LLUUID.Zero.ToString();
parameters["profileFirstImage"] = LLUUID.Zero.ToString(); parameters["profileFirstImage"] = LLUUID.Zero.ToString();
parameters["webLoginKey"] = LLUUID.Random().ToString(); parameters["webLoginKey"] = LLUUID.Random().ToString();

30
OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")] [assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

10
OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
View File

@ -485,7 +485,7 @@ namespace OpenSim.Framework.Data.MySQL
foreach (DataColumn column in table.Columns) foreach (DataColumn column in table.Columns)
Debug.Write(column.ColumnName + " = " + Debug.Write(column.ColumnName + " = " +
row[column, DataRowVersion.Original] + ", "); row[column, DataRowVersion.Original] + ", ");
Debug.WriteLine(""); Debug.WriteLine(String.Empty);
} }
//--- Display the current values, if there are any. //--- Display the current values, if there are any.
if (row.HasVersion(DataRowVersion.Current)) if (row.HasVersion(DataRowVersion.Current))
@ -494,9 +494,9 @@ namespace OpenSim.Framework.Data.MySQL
foreach (DataColumn column in table.Columns) foreach (DataColumn column in table.Columns)
Debug.Write(column.ColumnName + " = " + Debug.Write(column.ColumnName + " = " +
row[column, DataRowVersion.Current] + ", "); row[column, DataRowVersion.Current] + ", ");
Debug.WriteLine(""); Debug.WriteLine(String.Empty);
} }
Debug.WriteLine(""); Debug.WriteLine(String.Empty);
} }
} }
} }
@ -1313,7 +1313,7 @@ namespace OpenSim.Framework.Data.MySQL
private MySqlCommand createUpdateCommand(string table, string pk, DataTable dt) private MySqlCommand createUpdateCommand(string table, string pk, DataTable dt)
{ {
string sql = "update " + table + " set "; string sql = "update " + table + " set ";
string subsql = ""; string subsql = String.Empty;
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
if (subsql.Length > 0) if (subsql.Length > 0)
@ -1341,7 +1341,7 @@ namespace OpenSim.Framework.Data.MySQL
private string defineTable(DataTable dt) private string defineTable(DataTable dt)
{ {
string sql = "create table " + dt.TableName + "("; string sql = "create table " + dt.TableName + "(";
string subsql = ""; string subsql = String.Empty;
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
if (subsql.Length > 0) if (subsql.Length > 0)

6
OpenSim/Framework/Data.MySQL/MySQLGridData.cs
View File

@ -219,8 +219,8 @@ namespace OpenSim.Framework.Data.MySQL
if (querysplit.Length == 2) if (querysplit.Length == 2)
{ {
Dictionary<string, string> param = new Dictionary<string, string>(); Dictionary<string, string> param = new Dictionary<string, string>();
param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], "") + "%"; param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], String.Empty) + "%";
try try
{ {
lock (database) lock (database)
@ -258,7 +258,7 @@ namespace OpenSim.Framework.Data.MySQL
lock (database) lock (database)
{ {
Dictionary<string, string> param = new Dictionary<string, string>(); Dictionary<string, string> param = new Dictionary<string, string>();
param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], System.String.Empty) + "%";
IDbCommand result = IDbCommand result =
database.Query( database.Query(

12
OpenSim/Framework/Data.MySQL/MySQLManager.cs
View File

@ -323,7 +323,7 @@ namespace OpenSim.Framework.Data.MySQL
// World Map Addition // World Map Addition
string tempRegionMap = reader["regionMapTexture"].ToString(); string tempRegionMap = reader["regionMapTexture"].ToString();
if (tempRegionMap != "") if (tempRegionMap != String.Empty)
{ {
retval.regionMapTextureID = new LLUUID(tempRegionMap); retval.regionMapTextureID = new LLUUID(tempRegionMap);
} }
@ -572,12 +572,12 @@ namespace OpenSim.Framework.Data.MySQL
parameters["?homeLookAtZ"] = homeLookAtZ.ToString(); parameters["?homeLookAtZ"] = homeLookAtZ.ToString();
parameters["?created"] = created.ToString(); parameters["?created"] = created.ToString();
parameters["?lastLogin"] = lastlogin.ToString(); parameters["?lastLogin"] = lastlogin.ToString();
parameters["?userInventoryURI"] = ""; parameters["?userInventoryURI"] = String.Empty;
parameters["?userAssetURI"] = ""; parameters["?userAssetURI"] = String.Empty;
parameters["?profileCanDoMask"] = "0"; parameters["?profileCanDoMask"] = "0";
parameters["?profileWantDoMask"] = "0"; parameters["?profileWantDoMask"] = "0";
parameters["?profileAboutText"] = ""; parameters["?profileAboutText"] = String.Empty;
parameters["?profileFirstText"] = ""; parameters["?profileFirstText"] = String.Empty;
parameters["?profileImage"] = LLUUID.Zero.ToString(); parameters["?profileImage"] = LLUUID.Zero.ToString();
parameters["?profileFirstImage"] = LLUUID.Zero.ToString(); parameters["?profileFirstImage"] = LLUUID.Zero.ToString();
parameters["?webLoginKey"] = LLUUID.Random().ToString(); parameters["?webLoginKey"] = LLUUID.Random().ToString();
@ -612,7 +612,7 @@ namespace OpenSim.Framework.Data.MySQL
{ {
bool GRID_ONLY_UPDATE_NECESSARY_DATA = false; bool GRID_ONLY_UPDATE_NECESSARY_DATA = false;
string sql = ""; string sql = String.Empty;
if (GRID_ONLY_UPDATE_NECESSARY_DATA) if (GRID_ONLY_UPDATE_NECESSARY_DATA)
{ {
sql += "INSERT INTO "; sql += "INSERT INTO ";

6
OpenSim/Framework/Data.MySQL/MySQLUserData.cs
View File

@ -347,8 +347,8 @@ namespace OpenSim.Framework.Data.MySQL
if (querysplit.Length == 2) if (querysplit.Length == 2)
{ {
Dictionary<string, string> param = new Dictionary<string, string>(); Dictionary<string, string> param = new Dictionary<string, string>();
param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], "") + "%"; param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], String.Empty) + "%";
try try
{ {
lock (database) lock (database)
@ -386,7 +386,7 @@ namespace OpenSim.Framework.Data.MySQL
lock (database) lock (database)
{ {
Dictionary<string, string> param = new Dictionary<string, string>(); Dictionary<string, string> param = new Dictionary<string, string>();
param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
IDbCommand result = IDbCommand result =
database.Query( database.Query(

30
OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.Framework.Data.MySQL")] [assembly : AssemblyProduct("OpenSim.Framework.Data.MySQL")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

30
OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")] [assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

4
OpenSim/Framework/Data.SQLite/SQLiteBase.cs
View File

@ -98,7 +98,7 @@ namespace OpenSim.Framework.Data.SQLite
protected static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) protected static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt)
{ {
string sql = "update " + table + " set "; string sql = "update " + table + " set ";
string subsql = ""; string subsql = String.Empty;
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
if (subsql.Length > 0) if (subsql.Length > 0)
@ -126,7 +126,7 @@ namespace OpenSim.Framework.Data.SQLite
protected static string defineTable(DataTable dt) protected static string defineTable(DataTable dt)
{ {
string sql = "create table " + dt.TableName + "("; string sql = "create table " + dt.TableName + "(";
string subsql = ""; string subsql = String.Empty;
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
if (subsql.Length > 0) if (subsql.Length > 0)

4
OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
View File

@ -1368,7 +1368,7 @@ namespace OpenSim.Framework.Data.SQLite
private SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) private SqliteCommand createUpdateCommand(string table, string pk, DataTable dt)
{ {
string sql = "update " + table + " set "; string sql = "update " + table + " set ";
string subsql = ""; string subsql = String.Empty;
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
if (subsql.Length > 0) if (subsql.Length > 0)
@ -1396,7 +1396,7 @@ namespace OpenSim.Framework.Data.SQLite
private string defineTable(DataTable dt) private string defineTable(DataTable dt)
{ {
string sql = "create table " + dt.TableName + "("; string sql = "create table " + dt.TableName + "(";
string subsql = ""; string subsql = String.Empty;
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
if (subsql.Length > 0) if (subsql.Length > 0)

4
OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
View File

@ -630,7 +630,7 @@ namespace OpenSim.Framework.Data.SQLite
{ {
if (row[col] == null) if (row[col] == null)
{ {
row[col] = ""; row[col] = String.Empty;
} }
} }
} }
@ -671,7 +671,7 @@ namespace OpenSim.Framework.Data.SQLite
{ {
if (row[col] == null) if (row[col] == null)
{ {
row[col] = ""; row[col] = String.Empty;
} }
} }
} }

30
OpenSim/Framework/Data/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.Framework.Data")] [assembly : AssemblyProduct("OpenSim.Framework.Data")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

28
OpenSim/Framework/Data/RegionProfileData.cs
View File

@ -41,7 +41,7 @@ namespace OpenSim.Framework.Data
/// <summary> /// <summary>
/// The name of the region /// The name of the region
/// </summary> /// </summary>
public string regionName = ""; public string regionName = String.Empty;
/// <summary> /// <summary>
/// A 64-bit number combining map position into a (mostly) unique ID /// A 64-bit number combining map position into a (mostly) unique ID
@ -65,10 +65,10 @@ namespace OpenSim.Framework.Data
/// Authentication secrets /// Authentication secrets
/// </summary> /// </summary>
/// <remarks>Not very secure, needs improvement.</remarks> /// <remarks>Not very secure, needs improvement.</remarks>
public string regionSendKey = ""; public string regionSendKey = String.Empty;
public string regionRecvKey = ""; public string regionRecvKey = String.Empty;
public string regionSecret = ""; public string regionSecret = String.Empty;
/// <summary> /// <summary>
/// Whether the region is online /// Whether the region is online
@ -78,14 +78,14 @@ namespace OpenSim.Framework.Data
/// <summary> /// <summary>
/// Information about the server that the region is currently hosted on /// Information about the server that the region is currently hosted on
/// </summary> /// </summary>
public string serverIP = ""; public string serverIP = String.Empty;
public uint serverPort; public uint serverPort;
public string serverURI = ""; public string serverURI = String.Empty;
public uint httpPort; public uint httpPort;
public uint remotingPort; public uint remotingPort;
public string httpServerURI = ""; public string httpServerURI = String.Empty;
/// <summary> /// <summary>
/// Set of optional overrides. Can be used to create non-eulicidean spaces. /// Set of optional overrides. Can be used to create non-eulicidean spaces.
@ -100,23 +100,23 @@ namespace OpenSim.Framework.Data
/// Optional: URI Location of the region database /// Optional: URI Location of the region database
/// </summary> /// </summary>
/// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks> /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
public string regionDataURI = ""; public string regionDataURI = String.Empty;
/// <summary> /// <summary>
/// Region Asset Details /// Region Asset Details
/// </summary> /// </summary>
public string regionAssetURI = ""; public string regionAssetURI = String.Empty;
public string regionAssetSendKey = ""; public string regionAssetSendKey = String.Empty;
public string regionAssetRecvKey = ""; public string regionAssetRecvKey = String.Empty;
/// <summary> /// <summary>
/// Region Userserver Details /// Region Userserver Details
/// </summary> /// </summary>
public string regionUserURI = ""; public string regionUserURI = String.Empty;
public string regionUserSendKey = ""; public string regionUserSendKey = String.Empty;
public string regionUserRecvKey = ""; public string regionUserRecvKey = String.Empty;
/// <summary> /// <summary>
/// Region Map Texture Asset /// Region Map Texture Asset

8
OpenSim/Framework/Data/ReservationData.cs
View File

@ -37,11 +37,11 @@ namespace OpenSim.Framework.Data
public int reservationMaxX = 65536; public int reservationMaxX = 65536;
public int reservationMaxY = 65536; public int reservationMaxY = 65536;
public string reservationName = ""; public string reservationName = System.String.Empty;
public string reservationCompany = ""; public string reservationCompany = System.String.Empty;
public bool status = true; public bool status = true;
public string gridSendKey = ""; public string gridSendKey = System.String.Empty;
public string gridRecvKey = ""; public string gridRecvKey = System.String.Empty;
} }
} }

92
OpenSim/Framework/EstateSettings.cs
View File

@ -756,106 +756,106 @@ namespace OpenSim.Framework
public void loadConfigurationOptions() public void loadConfigurationOptions()
{ {
configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty,
"0.0", true); "0.0", true);
configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "0",
true); true);
configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"", "0", true); String.Empty, "0", true);
configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "40", configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "40",
true); true);
configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
"", "1.0", true); String.Empty, "1.0", true);
configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty,
"0", true); "0", true);
configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty,
"0", true); "0", true);
configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty,
"0", true); "0", true);
configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21", configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "21",
true); true);
configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0",
true); true);
configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
"", "0", true); String.Empty, "0", true);
configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
"", "0", true); String.Empty, "0", true);
configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty,
"false", true); "false", true);
configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"", "1", true); String.Empty, "1", true);
configMember.addConfigurationOption("region_water_height", configMember.addConfigurationOption("region_water_height",
ConfigurationOption.ConfigurationTypes.TYPE_UINT16, "", "20", true); ConfigurationOption.ConfigurationTypes.TYPE_UINT16, String.Empty, "20", true);
configMember.addConfigurationOption("region_allow_terraform", configMember.addConfigurationOption("region_allow_terraform",
ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "true", true); ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true);
configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
"b8d3965a-ad78-bf43-699b-bff8eca6c975", true); "b8d3965a-ad78-bf43-699b-bff8eca6c975", true);
configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
"abb783e6-3e93-26c0-248a-247666855da3", true); "abb783e6-3e93-26c0-248a-247666855da3", true);
configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
"179cdabd-398a-9b6b-1391-4dc333ba321f", true); "179cdabd-398a-9b6b-1391-4dc333ba321f", true);
configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
"beb169c7-11ea-fff2-efe5-0f24dc881df2", true); "beb169c7-11ea-fff2-efe5-0f24dc881df2", true);
configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("terrain_start_height_0", configMember.addConfigurationOption("terrain_start_height_0",
ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
configMember.addConfigurationOption("terrain_start_height_1", configMember.addConfigurationOption("terrain_start_height_1",
ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
configMember.addConfigurationOption("terrain_start_height_2", configMember.addConfigurationOption("terrain_start_height_2",
ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
configMember.addConfigurationOption("terrain_start_height_3", configMember.addConfigurationOption("terrain_start_height_3",
ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
configMember.addConfigurationOption("terrain_height_range_0", configMember.addConfigurationOption("terrain_height_range_0",
ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
configMember.addConfigurationOption("terrain_height_range_1", configMember.addConfigurationOption("terrain_height_range_1",
ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
configMember.addConfigurationOption("terrain_height_range_2", configMember.addConfigurationOption("terrain_height_range_2",
ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
configMember.addConfigurationOption("terrain_height_range_3", configMember.addConfigurationOption("terrain_height_range_3",
ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
configMember.addConfigurationOption("terrain_file", configMember.addConfigurationOption("terrain_file",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, String.Empty,
"default.r32", true); "default.r32", true);
configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
"", "60.0", true); String.Empty, "60.0", true);
configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "", configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, String.Empty,
"20.0", true); "20.0", true);
configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_4", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_4", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_5", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_5", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_6", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_6", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_7", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_7", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_8", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_8", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
configMember.addConfigurationOption("estate_manager_9", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, configMember.addConfigurationOption("estate_manager_9", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
"", "00000000-0000-0000-0000-000000000000", true); String.Empty, "00000000-0000-0000-0000-000000000000", true);
} }

22
OpenSim/Framework/GridConfig.cs
View File

@ -26,23 +26,25 @@
* *
*/ */
using System;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
public class GridConfig public class GridConfig
{ {
public string GridOwner = ""; public string GridOwner = String.Empty;
public string DefaultAssetServer = ""; public string DefaultAssetServer = String.Empty;
public string AssetSendKey = ""; public string AssetSendKey = String.Empty;
public string AssetRecvKey = ""; public string AssetRecvKey = String.Empty;
public string DefaultUserServer = ""; public string DefaultUserServer = String.Empty;
public string UserSendKey = ""; public string UserSendKey = String.Empty;
public string UserRecvKey = ""; public string UserRecvKey = String.Empty;
public string SimSendKey = ""; public string SimSendKey = String.Empty;
public string SimRecvKey = ""; public string SimRecvKey = String.Empty;
public string DatabaseProvider = ""; public string DatabaseProvider = String.Empty;
public static uint DefaultHttpPort = 8001; public static uint DefaultHttpPort = 8001;

10
OpenSim/Framework/InventoryConfig.cs
View File

@ -33,12 +33,12 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public class InventoryConfig public class InventoryConfig
{ {
public string DefaultStartupMsg = ""; public string DefaultStartupMsg = System.String.Empty;
public string UserServerURL = ""; public string UserServerURL = System.String.Empty;
public string UserSendKey = ""; public string UserSendKey = System.String.Empty;
public string UserRecvKey = ""; public string UserRecvKey = System.String.Empty;
public string DatabaseProvider = ""; public string DatabaseProvider = System.String.Empty;
public static uint DefaultHttpPort = 8004; public static uint DefaultHttpPort = 8004;
public uint HttpPort = DefaultHttpPort; public uint HttpPort = DefaultHttpPort;

7
OpenSim/Framework/LandData.cs
View File

@ -26,6 +26,7 @@
* *
*/ */
using System.Collections.Generic; using System.Collections.Generic;
using System;
using libsecondlife; using libsecondlife;
namespace OpenSim.Framework namespace OpenSim.Framework
@ -34,7 +35,7 @@ namespace OpenSim.Framework
{ {
public byte[] landBitmapByteArray = new byte[512]; public byte[] landBitmapByteArray = new byte[512];
public string landName = "Your Parcel"; public string landName = "Your Parcel";
public string landDesc = ""; public string landDesc = String.Empty;
public LLUUID ownerID = LLUUID.Zero; public LLUUID ownerID = LLUUID.Zero;
public bool isGroupOwned = false; public bool isGroupOwned = false;
public LLVector3 AABBMin = new LLVector3(); public LLVector3 AABBMin = new LLVector3();
@ -67,8 +68,8 @@ namespace OpenSim.Framework
public int localID = 0; public int localID = 0;
public LLUUID globalID = LLUUID.Zero; public LLUUID globalID = LLUUID.Zero;
public string mediaURL = ""; public string mediaURL = String.Empty;
public string musicURL = ""; public string musicURL = String.Empty;
public float passHours = 0; public float passHours = 0;
public int passPrice = 0; public int passPrice = 0;
public LLUUID snapshotID = LLUUID.Zero; public LLUUID snapshotID = LLUUID.Zero;

2
OpenSim/Framework/Login.cs
View File

@ -39,7 +39,7 @@ namespace OpenSim.Framework
public LLUUID InventoryFolder; public LLUUID InventoryFolder;
public LLUUID BaseFolder; public LLUUID BaseFolder;
public uint CircuitCode; public uint CircuitCode;
public string CapsPath = ""; public string CapsPath = System.String.Empty;
public LLVector3 StartPos; public LLVector3 StartPos;
public Login() public Login()

18
OpenSim/Framework/MessageServerConfig.cs
View File

@ -36,17 +36,17 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public class MessageServerConfig public class MessageServerConfig
{ {
public string DefaultStartupMsg = ""; public string DefaultStartupMsg = String.Empty;
public string UserServerURL = ""; public string UserServerURL = String.Empty;
public string UserSendKey = ""; public string UserSendKey = String.Empty;
public string UserRecvKey = ""; public string UserRecvKey = String.Empty;
public string GridServerURL = ""; public string GridServerURL = String.Empty;
public string GridSendKey = ""; public string GridSendKey = String.Empty;
public string GridRecvKey = ""; public string GridRecvKey = String.Empty;
public string DatabaseProvider = ""; public string DatabaseProvider = String.Empty;
public string GridCommsProvider = ""; public string GridCommsProvider = String.Empty;
public static uint DefaultHttpPort = 8006; public static uint DefaultHttpPort = 8006;
public static bool DefaultHttpSSL = false; public static bool DefaultHttpSSL = false;

17
OpenSim/Framework/NetworkServersInfo.cs
View File

@ -27,23 +27,24 @@
*/ */
using Nini.Config; using Nini.Config;
using System;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
public class NetworkServersInfo public class NetworkServersInfo
{ {
public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/"; public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
public string AssetSendKey = ""; public string AssetSendKey = String.Empty;
public string GridURL = ""; public string GridURL = String.Empty;
public string GridSendKey = ""; public string GridSendKey = String.Empty;
public string GridRecvKey = ""; public string GridRecvKey = String.Empty;
public string UserURL = ""; public string UserURL = String.Empty;
public string UserSendKey = ""; public string UserSendKey = String.Empty;
public string UserRecvKey = ""; public string UserRecvKey = String.Empty;
public bool isSandbox; public bool isSandbox;
public string InventoryURL = ""; public string InventoryURL = String.Empty;
public static uint DefaultHttpListenerPort = 9000; public static uint DefaultHttpListenerPort = 9000;
public uint HttpListenerPort = DefaultHttpListenerPort; public uint HttpListenerPort = DefaultHttpListenerPort;

3
OpenSim/Framework/RegionCommsListener.cs
View File

@ -27,6 +27,7 @@
*/ */
using System.Collections.Generic; using System.Collections.Generic;
using System;
using libsecondlife; using libsecondlife;
namespace OpenSim.Framework namespace OpenSim.Framework
@ -46,7 +47,7 @@ namespace OpenSim.Framework
public event ChildAgentUpdate OnChildAgentUpdate; public event ChildAgentUpdate OnChildAgentUpdate;
public string debugRegionName = ""; public string debugRegionName = String.Empty;
/// <summary> /// <summary>

16
OpenSim/Framework/RegionInfo.cs
View File

@ -157,17 +157,17 @@ namespace OpenSim.Framework
public class RegionInfo : SimpleRegionInfo public class RegionInfo : SimpleRegionInfo
{ {
public string RegionName = ""; public string RegionName = String.Empty;
public string DataStore = ""; public string DataStore = String.Empty;
public bool isSandbox = false; public bool isSandbox = false;
public bool commFailTF = false; public bool commFailTF = false;
public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero;
public LLUUID CovenantID = LLUUID.Zero; public LLUUID CovenantID = LLUUID.Zero;
public string MasterAvatarFirstName = ""; public string MasterAvatarFirstName = String.Empty;
public string MasterAvatarLastName = ""; public string MasterAvatarLastName = String.Empty;
public string MasterAvatarSandboxPassword = ""; public string MasterAvatarSandboxPassword = String.Empty;
// Apparently, we're applying the same estatesettings regardless of whether it's local or remote. // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
private static EstateSettings m_estateSettings; private static EstateSettings m_estateSettings;
@ -241,7 +241,7 @@ namespace OpenSim.Framework
//not in use, should swap to nini though. //not in use, should swap to nini though.
public void LoadFromNiniSource(IConfigSource source, string sectionName) public void LoadFromNiniSource(IConfigSource source, string sectionName)
{ {
string errorMessage = ""; string errorMessage = String.Empty;
RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString())); RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString()));
RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
@ -275,7 +275,7 @@ namespace OpenSim.Framework
MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User"); MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User");
MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test"); MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test");
if (errorMessage != "") if (errorMessage != String.Empty)
{ {
// a error // a error
} }
@ -384,7 +384,7 @@ namespace OpenSim.Framework
break; break;
case "master_avatar_pass": case "master_avatar_pass":
string tempMD5Passwd = (string) configuration_result; string tempMD5Passwd = (string) configuration_result;
MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
break; break;
} }

6
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
View File

@ -52,8 +52,8 @@ namespace OpenSim.Framework.RegionLoader.Web
else else
{ {
IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"];
string url = startupConfig.GetString("regionload_webserver_url", "").Trim(); string url = startupConfig.GetString("regionload_webserver_url", System.String.Empty).Trim();
if (url == "") if (url == System.String.Empty)
{ {
MainLog.Instance.Error("WEBLOADER", "Unable to load webserver URL - URL was empty."); MainLog.Instance.Error("WEBLOADER", "Unable to load webserver URL - URL was empty.");
return null; return null;
@ -66,7 +66,7 @@ namespace OpenSim.Framework.RegionLoader.Web
HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
MainLog.Instance.Debug("WEBLOADER", "Downloading Region Information From Remote Server..."); MainLog.Instance.Debug("WEBLOADER", "Downloading Region Information From Remote Server...");
StreamReader reader = new StreamReader(webResponse.GetResponseStream()); StreamReader reader = new StreamReader(webResponse.GetResponseStream());
string xmlSource = ""; string xmlSource = System.String.Empty;
string tempStr = reader.ReadLine(); string tempStr = reader.ReadLine();
while (tempStr != null) while (tempStr != null)
{ {

2
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -382,7 +382,7 @@ namespace OpenSim.Framework.Servers
Hashtable keysvals = new Hashtable(); Hashtable keysvals = new Hashtable();
Hashtable headervals = new Hashtable(); Hashtable headervals = new Hashtable();
string host = ""; string host = String.Empty;
string[] querystringkeys = request.QueryString.AllKeys; string[] querystringkeys = request.QueryString.AllKeys;
string[] rHeaders = request.Headers.AllKeys; string[] rHeaders = request.Headers.AllKeys;

41
OpenSim/Framework/TaskInventoryItem.cs
View File

@ -27,6 +27,7 @@
*/ */
using libsecondlife; using libsecondlife;
using System;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
@ -44,16 +45,16 @@ namespace OpenSim.Framework
{ {
"texture", "texture",
"sound", "sound",
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"lsl_text", "lsl_text",
"" String.Empty
}; };
/// <summary> /// <summary>
@ -63,16 +64,16 @@ namespace OpenSim.Framework
{ {
"texture", "texture",
"sound", "sound",
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"", String.Empty,
"lsltext", "lsltext",
"" String.Empty
}; };
public LLUUID item_id = LLUUID.Zero; public LLUUID item_id = LLUUID.Zero;
@ -92,8 +93,8 @@ namespace OpenSim.Framework
public int type = 0; public int type = 0;
public int inv_type = 0; public int inv_type = 0;
public uint flags = 0; public uint flags = 0;
public string name = ""; public string name = String.Empty;
public string desc = ""; public string desc = String.Empty;
public uint creation_date = 0; public uint creation_date = 0;
public LLUUID ParentPartID = LLUUID.Zero; public LLUUID ParentPartID = LLUUID.Zero;

14
OpenSim/Framework/UserConfig.cs
View File

@ -26,6 +26,8 @@
* *
*/ */
using System;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
/// <summary> /// <summary>
@ -33,14 +35,14 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public class UserConfig public class UserConfig
{ {
public string DefaultStartupMsg = ""; public string DefaultStartupMsg = String.Empty;
public string GridServerURL = ""; public string GridServerURL = String.Empty;
public string GridSendKey = ""; public string GridSendKey = String.Empty;
public string GridRecvKey = ""; public string GridRecvKey = String.Empty;
public string InventoryUrl = ""; public string InventoryUrl = String.Empty;
public string DatabaseProvider = ""; public string DatabaseProvider = String.Empty;
public static uint DefaultHttpPort = 8002; public static uint DefaultHttpPort = 8002;
public static bool DefaultHttpSSL = false; public static bool DefaultHttpSSL = false;

2
OpenSim/Framework/Util.cs
View File

@ -356,7 +356,7 @@ namespace OpenSim.Framework
{ {
return capsURLS[userID]; return capsURLS[userID];
} }
return ""; return String.Empty;
} }
public static void SetCapsURL(LLUUID userID, string url) public static void SetCapsURL(LLUUID userID, string url)

2
OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
View File

@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OGS-AssetServer")] [assembly : AssemblyProduct("OGS-AssetServer")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

12
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -194,7 +194,7 @@ namespace OpenSim.Grid.GridServer
/// <returns>An XML string containing neighbour entities</returns> /// <returns>An XML string containing neighbour entities</returns>
public string GetXMLNeighbours(ulong reqhandle) public string GetXMLNeighbours(ulong reqhandle)
{ {
string response = ""; string response = String.Empty;
RegionProfileData central_region = getRegion(reqhandle); RegionProfileData central_region = getRegion(reqhandle);
RegionProfileData neighbour; RegionProfileData neighbour;
for (int x = -1; x < 2; x++) for (int x = -1; x < 2; x++)
@ -241,7 +241,7 @@ namespace OpenSim.Grid.GridServer
{ {
TheSim = getRegion(new LLUUID((string)requestData["UUID"])); 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 else
{ {
@ -615,7 +615,7 @@ namespace OpenSim.Grid.GridServer
/// <returns></returns> /// <returns></returns>
public string RestGetRegionMethod(string request, string path, string param) public string RestGetRegionMethod(string request, string path, string param)
{ {
return RestGetSimMethod("", "/sims/", param); return RestGetSimMethod(String.Empty, "/sims/", param);
} }
/// <summary> /// <summary>
@ -627,7 +627,7 @@ namespace OpenSim.Grid.GridServer
/// <returns></returns> /// <returns></returns>
public string RestSetRegionMethod(string request, string path, string param) public string RestSetRegionMethod(string request, string path, string param)
{ {
return RestSetSimMethod("", "/sims/", param); return RestSetSimMethod(String.Empty, "/sims/", param);
} }
/// <summary> /// <summary>
@ -704,7 +704,7 @@ namespace OpenSim.Grid.GridServer
TheSim.regionRecvKey = config.SimRecvKey; TheSim.regionRecvKey = config.SimRecvKey;
TheSim.regionSendKey = config.SimSendKey; TheSim.regionSendKey = config.SimSendKey;
TheSim.regionSecret = config.SimRecvKey; TheSim.regionSecret = config.SimRecvKey;
TheSim.regionDataURI = ""; TheSim.regionDataURI = String.Empty;
TheSim.regionAssetURI = config.DefaultAssetServer; TheSim.regionAssetURI = config.DefaultAssetServer;
TheSim.regionAssetRecvKey = config.AssetRecvKey; TheSim.regionAssetRecvKey = config.AssetRecvKey;
TheSim.regionAssetSendKey = config.AssetSendKey; TheSim.regionAssetSendKey = config.AssetSendKey;
@ -776,7 +776,7 @@ namespace OpenSim.Grid.GridServer
{ {
kvp.Value.AddProfile(TheSim); kvp.Value.AddProfile(TheSim);
MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); 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."); "Region successfully updated and connected to grid.");
} }
else else

8
OpenSim/Grid/GridServer/Main.cs
View File

@ -149,7 +149,7 @@ namespace OpenSim.Grid.GridServer
/* /*
foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values) foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values)
{ {
string SimResponse = ""; string SimResponse = String.Empty;
try try
{ {
WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/"); WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/");
@ -158,7 +158,7 @@ namespace OpenSim.Grid.GridServer
CheckSim.ContentLength = 0; CheckSim.ContentLength = 0;
StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII); StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII);
stOut.Write(""); stOut.Write(String.Empty);
stOut.Close(); stOut.Close();
StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream()); StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream());
@ -204,9 +204,9 @@ namespace OpenSim.Grid.GridServer
{ {
try try
{ {
string attri = ""; string attri = String.Empty;
attri = configData.GetAttribute("DataBaseProvider"); attri = configData.GetAttribute("DataBaseProvider");
if (attri == "") if (attri == String.Empty)
{ {
GridDll = "OpenSim.Framework.Data.DB4o.dll"; GridDll = "OpenSim.Framework.Data.DB4o.dll";
configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");

2
OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
View File

@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OGS-GridServer")] [assembly : AssemblyProduct("OGS-GridServer")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

2
OpenSim/Grid/MessagingServer/UserPresenceData.cs
View File

@ -39,7 +39,7 @@ namespace OpenSim.Grid.MessagingServer
{ {
public AgentCircuitData agentData = new AgentCircuitData(); public AgentCircuitData agentData = new AgentCircuitData();
public RegionProfileData regionData = new RegionProfileData(); public RegionProfileData regionData = new RegionProfileData();
public string httpURI = ""; public string httpURI = String.Empty;
public List<FriendListItem> friendData = new List<FriendListItem> (); public List<FriendListItem> friendData = new List<FriendListItem> ();
public List<LLUUID> subscriptionData = new List<LLUUID>(); public List<LLUUID> subscriptionData = new List<LLUUID>();

4
OpenSim/Grid/ScriptServer/Application.cs
View File

@ -47,9 +47,9 @@ namespace OpenSim.Grid.ScriptServer
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{ {
Console.WriteLine(""); Console.WriteLine(String.Empty);
Console.WriteLine("APPLICATION EXCEPTION DETECTED"); Console.WriteLine("APPLICATION EXCEPTION DETECTED");
Console.WriteLine(""); Console.WriteLine(String.Empty);
Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString()); Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString());
//Console.WriteLine("Exception:"); //Console.WriteLine("Exception:");
//Console.WriteLine(e.ExceptionObject.ToString()); //Console.WriteLine(e.ExceptionObject.ToString());

30
OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.Grid.ScriptServer")] [assembly : AssemblyProduct("OpenSim.Grid.ScriptServer")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

6
OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
View File

@ -87,7 +87,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
//} //}
//catch (Exception e) //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) //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; ScriptServerInterfaces.ScriptEngine ret;
@ -114,7 +114,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
//} //}
//catch (Exception e) //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; return ret;

6
OpenSim/Grid/UserServer/Main.cs
View File

@ -147,7 +147,7 @@ namespace OpenSim.Grid.UserServer
regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X")); regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X"));
regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y")); regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y"));
tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
LLUUID userID = new LLUUID(); LLUUID userID = new LLUUID();
try try
@ -220,9 +220,9 @@ namespace OpenSim.Grid.UserServer
{ {
try try
{ {
string attri = ""; string attri = String.Empty;
attri = configData.GetAttribute("DataBaseProvider"); attri = configData.GetAttribute("DataBaseProvider");
if (attri == "") if (attri == String.Empty)
{ {
StorageDll = "OpenSim.Framework.Data.DB4o.dll"; StorageDll = "OpenSim.Framework.Data.DB4o.dll";
configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");

30
OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OGS-UserServer")] [assembly : AssemblyProduct("OGS-UserServer")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

4
OpenSim/Region/Application/Application.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim
Console.Write("Performing compatibility checks... "); Console.Write("Performing compatibility checks... ");
string supported = ""; string supported = String.Empty;
if (Util.IsEnvironmentSupported(ref supported)) if (Util.IsEnvironmentSupported(ref supported))
{ {
Console.WriteLine(" Environment is compatible.\n"); Console.WriteLine(" Environment is compatible.\n");
@ -90,7 +90,7 @@ namespace OpenSim
// TODO: Add config option to allow users to turn off error reporting // TODO: Add config option to allow users to turn off error reporting
// TODO: Post error report (disabled for now) // TODO: Post error report (disabled for now)
string msg = ""; string msg = String.Empty;
msg += "\r\n"; msg += "\r\n";
msg += "APPLICATION EXCEPTION DETECTED: " + e.ToString() + "\r\n"; msg += "APPLICATION EXCEPTION DETECTED: " + e.ToString() + "\r\n";
msg += "\r\n"; msg += "\r\n";

22
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -172,8 +172,8 @@ namespace OpenSim
config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories_experimental", false); config.Set("storage_prim_inventories_experimental", false);
config.Set("startup_console_commands_file", ""); config.Set("startup_console_commands_file", String.Empty);
config.Set("shutdown_console_commands_file", ""); config.Set("shutdown_console_commands_file", String.Empty);
config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
config.Set("asset_database", "sqlite"); config.Set("asset_database", "sqlite");
} }
@ -252,8 +252,8 @@ namespace OpenSim
m_storagePersistPrimInventories m_storagePersistPrimInventories
= startupConfig.GetBoolean("storage_prim_inventories_experimental", false); = startupConfig.GetBoolean("storage_prim_inventories_experimental", false);
m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty);
m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
@ -374,7 +374,7 @@ namespace OpenSim
// } // }
//Run Startup Commands //Run Startup Commands
if (m_startupCommandsFile != "") if (m_startupCommandsFile != String.Empty)
{ {
RunCommandScript(m_startupCommandsFile); RunCommandScript(m_startupCommandsFile);
} }
@ -421,7 +421,7 @@ namespace OpenSim
SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll"); SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll");
sqlAssetServer.LoadDefaultAssets(); sqlAssetServer.LoadDefaultAssets();
assetServer = sqlAssetServer; assetServer = sqlAssetServer;
//assetServer = new GridAssetClient(""); //assetServer = new GridAssetClient(String.Empty);
} }
else else
{ {
@ -585,7 +585,7 @@ namespace OpenSim
/// </summary> /// </summary>
public virtual void Shutdown() public virtual void Shutdown()
{ {
if (m_startupCommandsFile != "") if (m_startupCommandsFile != String.Empty)
{ {
RunCommandScript(m_shutdownCommandsFile); RunCommandScript(m_shutdownCommandsFile);
} }
@ -622,10 +622,10 @@ namespace OpenSim
if (File.Exists(fileName)) if (File.Exists(fileName))
{ {
StreamReader readFile = File.OpenText(fileName); StreamReader readFile = File.OpenText(fileName);
string currentCommand = ""; string currentCommand = String.Empty;
while ((currentCommand = readFile.ReadLine()) != null) while ((currentCommand = readFile.ReadLine()) != null)
{ {
if (currentCommand != "") if (currentCommand != String.Empty)
{ {
MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'"); MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'");
MainLog.Instance.MainLogRunCommand(currentCommand); MainLog.Instance.MainLogRunCommand(currentCommand);
@ -645,7 +645,7 @@ namespace OpenSim
/// <param name="cmdparams">Additional arguments passed to the command</param> /// <param name="cmdparams">Additional arguments passed to the command</param>
public void RunCmd(string command, string[] cmdparams) public void RunCmd(string command, string[] cmdparams)
{ {
string result = ""; string result = String.Empty;
switch (command) switch (command)
{ {
@ -982,7 +982,7 @@ namespace OpenSim
private string CombineParams(string[] commandParams, int pos) private string CombineParams(string[] commandParams, int pos)
{ {
string result = ""; string result = String.Empty;
for (int i = pos; i < commandParams.Length; i++) for (int i = pos; i < commandParams.Length; i++)
{ {
result += commandParams[i] + " "; result += commandParams[i] + " ";

6
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -343,7 +343,7 @@ namespace OpenSim.Region.ClientStack
{ {
if (m_debug > 0) if (m_debug > 0)
{ {
string info = ""; string info = String.Empty;
if (m_debug < 255 && packet.Type == PacketType.AgentUpdate) if (m_debug < 255 && packet.Type == PacketType.AgentUpdate)
return; return;
if (m_debug < 254 && packet.Type == PacketType.ViewerEffect) if (m_debug < 254 && packet.Type == PacketType.ViewerEffect)
@ -783,7 +783,7 @@ namespace OpenSim.Region.ClientStack
agentData.child = false; agentData.child = false;
agentData.firstname = m_firstName; agentData.firstname = m_firstName;
agentData.lastname = m_lastName; agentData.lastname = m_lastName;
agentData.CapsPath = ""; agentData.CapsPath = String.Empty;
return agentData; return agentData;
} }
@ -2521,7 +2521,7 @@ namespace OpenSim.Region.ClientStack
case PacketType.ChatFromViewer: case PacketType.ChatFromViewer:
ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname; string fromName = String.Empty; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
byte[] message = inchatpack.ChatData.Message; byte[] message = inchatpack.ChatData.Message;
byte type = inchatpack.ChatData.Type; byte type = inchatpack.ChatData.Type;
LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;

4
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Region.Communications.Local
private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
public string _gdebugRegionName = ""; public string _gdebugRegionName = System.String.Empty;
public string gdebugRegionName public string gdebugRegionName
{ {
@ -53,7 +53,7 @@ namespace OpenSim.Region.Communications.Local
set { _gdebugRegionName = value; } set { _gdebugRegionName = value; }
} }
public string _rdebugRegionName = ""; public string _rdebugRegionName = System.String.Empty;
public string rdebugRegionName public string rdebugRegionName
{ {

2
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.Local
public override UserProfileData SetupMasterUser(string firstName, string lastName) public override UserProfileData SetupMasterUser(string firstName, string lastName)
{ {
return SetupMasterUser(firstName, lastName, ""); return SetupMasterUser(firstName, lastName, String.Empty);
} }
public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)

30
OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.Region.Communications.Local")] [assembly : AssemblyProduct("OpenSim.Region.Communications.Local")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

4
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.OGS1
public BaseHttpServer httpListener; public BaseHttpServer httpListener;
public NetworkServersInfo serversInfo; public NetworkServersInfo serversInfo;
public BaseHttpServer httpServer; public BaseHttpServer httpServer;
public string _gdebugRegionName = ""; public string _gdebugRegionName = String.Empty;
public string gdebugRegionName public string gdebugRegionName
{ {
@ -63,7 +63,7 @@ namespace OpenSim.Region.Communications.OGS1
set { _gdebugRegionName = value; } set { _gdebugRegionName = value; }
} }
public string _rdebugRegionName = ""; public string _rdebugRegionName = String.Empty;
public string rdebugRegionName public string rdebugRegionName
{ {

4
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -144,7 +144,7 @@ namespace OpenSim.Region.Communications.OGS1
{ {
Hashtable param = new Hashtable(); Hashtable param = new Hashtable();
param["queryid"] = (string) queryID.ToString(); param["queryid"] = (string) queryID.ToString();
param["avquery"] = objAlphaNumericPattern.Replace(query, ""); param["avquery"] = objAlphaNumericPattern.Replace(query, String.Empty);
IList parameters = new ArrayList(); IList parameters = new ArrayList();
parameters.Add(param); parameters.Add(param);
XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters); XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters);
@ -212,7 +212,7 @@ namespace OpenSim.Region.Communications.OGS1
public UserProfileData SetupMasterUser(string firstName, string lastName) public UserProfileData SetupMasterUser(string firstName, string lastName)
{ {
return SetupMasterUser(firstName, lastName, ""); return SetupMasterUser(firstName, lastName, String.Empty);
} }
public UserProfileData SetupMasterUser(string firstName, string lastName, string password) public UserProfileData SetupMasterUser(string firstName, string lastName, string password)

30
OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")] [assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenGrid.Framework.Communications.OGS1")] [assembly : AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
[assembly : AssemblyCopyright("Copyright © 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

2
OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
View File

@ -87,7 +87,7 @@ namespace OpenSim.Region.Environment.Modules
string bornOn = "Before now"; string bornOn = "Before now";
string flAbout = "First life? What is one of those? OpenSim is my life!"; string flAbout = "First life? What is one of those? OpenSim is my life!";
LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000"); LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
remoteClient.SendAvatarProperties(avatarID, about, bornOn, "", flAbout, 0, LLUUID.Zero, LLUUID.Zero, "", remoteClient.SendAvatarProperties(avatarID, about, bornOn, System.String.Empty, flAbout, 0, LLUUID.Zero, LLUUID.Zero, System.String.Empty,
partner); partner);
} }
} }

2
OpenSim/Region/Environment/Modules/XMLRPCModule.cs
View File

@ -331,7 +331,7 @@ namespace OpenSim.Region.Environment.Modules
m_ChannelKey = channelKey; m_ChannelKey = channelKey;
m_MessageID = LLUUID.Random(); m_MessageID = LLUUID.Random();
m_processed = false; m_processed = false;
m_resp = ""; m_resp = String.Empty;
} }
public bool IsProcessed() public bool IsProcessed()

2
OpenSim/Region/Environment/Modules/XferModule.cs
View File

@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules
public class XferDownLoad public class XferDownLoad
{ {
public byte[] Data = new byte[0]; public byte[] Data = new byte[0];
public string FileName = ""; public string FileName = String.Empty;
public ulong XferID = 0; public ulong XferID = 0;
public int DataPointer = 0; public int DataPointer = 0;
public uint Packet = 0; public uint Packet = 0;

2
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -376,7 +376,7 @@ namespace OpenSim.Region.Environment.Scenes
InventoryItemBase item = userInfo.RootFolder.HasItem(itemID); InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
if (item != null) if (item != null)
{ {
if (newName != "") if (newName != System.String.Empty)
{ {
item.inventoryName = newName; item.inventoryName = newName;
} }

10
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -389,7 +389,7 @@ namespace OpenSim.Region.Environment.Scenes
m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed); m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);
MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes"); MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes");
m_restartTimer.Start(); m_restartTimer.Start();
SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in 2 Minutes"); SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes");
//SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes"); //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes");
} }
} }
@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Scenes
if (m_RestartTimerCounter <= m_incrementsof15seconds) if (m_RestartTimerCounter <= m_incrementsof15seconds)
{ {
if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7) if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7)
SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in " + SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in " +
((8 - m_RestartTimerCounter) * 15) + " seconds"); ((8 - m_RestartTimerCounter) * 15) + " seconds");
// SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) + // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) +
@ -1408,7 +1408,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (regionHandle == m_regInfo.RegionHandle) if (regionHandle == m_regInfo.RegionHandle)
{ {
if (agent.CapsPath != "") if (agent.CapsPath != String.Empty)
{ {
Caps cap = Caps cap =
new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port,
@ -2004,7 +2004,7 @@ namespace OpenSim.Region.Environment.Scenes
private string CombineParams(string[] commandParams, int pos) private string CombineParams(string[] commandParams, int pos)
{ {
string result = ""; string result = String.Empty;
for (int i = pos; i < commandParams.Length; i++) for (int i = pos; i < commandParams.Length; i++)
{ {
result += commandParams[i] + " "; result += commandParams[i] + " ";
@ -2253,7 +2253,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
/// <param name="avatarID">AvatarID to lookup</param> /// <param name="avatarID">AvatarID to lookup</param>
/// <returns></returns> /// <returns></returns>
public bool PresenceChildStatus(LLUUID avatarID) public override bool PresenceChildStatus(LLUUID avatarID)
{ {
ScenePresence cp = GetScenePresence(avatarID); ScenePresence cp = GetScenePresence(avatarID);
return cp.IsChildAgent; return cp.IsChildAgent;

2
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Scenes
public KillObjectDelegate KillObject; public KillObjectDelegate KillObject;
public string _debugRegionName = ""; public string _debugRegionName = String.Empty;
public string debugRegionName public string debugRegionName
{ {

4
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -1114,7 +1114,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
return part.Name; return part.Name;
} }
return ""; return String.Empty;
} }
public string GetPartDescription(uint localID) public string GetPartDescription(uint localID)
@ -1124,7 +1124,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
return part.Description; return part.Description;
} }
return ""; return String.Empty;
} }
/// <summary> /// <summary>

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
public partial class SceneObjectPart : IScriptHost public partial class SceneObjectPart : IScriptHost
{ {
private string m_inventoryFileName = ""; private string m_inventoryFileName = String.Empty;
/// <summary> /// <summary>
/// The inventory folder for this prim /// The inventory folder for this prim
@ -334,7 +334,7 @@ namespace OpenSim.Region.Environment.Scenes
public class InventoryStringBuilder public class InventoryStringBuilder
{ {
public string BuildString = ""; public string BuildString = String.Empty;
public InventoryStringBuilder(LLUUID folderID, LLUUID parentID) public InventoryStringBuilder(LLUUID folderID, LLUUID parentID)
{ {

8
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -395,7 +395,7 @@ namespace OpenSim.Region.Environment.Scenes
set { m_acceleration = value; } set { m_acceleration = value; }
} }
private string m_description = ""; private string m_description = String.Empty;
public string Description public string Description
{ {
@ -418,7 +418,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
private string m_text = ""; private string m_text = String.Empty;
public Vector3 SitTargetPosition public Vector3 SitTargetPosition
{ {
@ -440,7 +440,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
private string m_sitName = ""; private string m_sitName = String.Empty;
public string SitName public string SitName
{ {
@ -448,7 +448,7 @@ namespace OpenSim.Region.Environment.Scenes
set { m_sitName = value; } set { m_sitName = value; }
} }
private string m_touchName = ""; private string m_touchName = String.Empty;
public string TouchName public string TouchName
{ {

6
OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
View File

@ -44,19 +44,19 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
public string SitName public string SitName
{ {
get { return ""; } get { return String.Empty; }
set { } set { }
} }
public string TouchName public string TouchName
{ {
get { return ""; } get { return String.Empty; }
set { } set { }
} }
public string Description public string Description
{ {
get { return ""; } get { return String.Empty; }
set { } set { }
} }

6
OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
//} //}
//catch (Exception e) //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());
//} //}
@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
//} //}
//catch (Exception e) //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());
//} //}
ScriptEngineInterface ret; ScriptEngineInterface ret;
@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
//} //}
//catch (Exception e) //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; return ret;

2
OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
View File

@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Types
public string[] GetNeighbours(string nodeName) public string[] GetNeighbours(string nodeName)
{ {
string[] retVal = new string[1]; string[] retVal = new string[1];
retVal[0] = ""; retVal[0] = System.String.Empty;
return retVal; return retVal;
} }
} }

2
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -88,7 +88,7 @@ namespace SimpleApp
m_commsManager = localComms; m_commsManager = localComms;
LocalLoginService loginService = LocalLoginService loginService =
new LocalLoginService(userService, "", localComms, m_networkServersInfo, false); new LocalLoginService(userService, String.Empty, localComms, m_networkServersInfo, false);
loginService.OnLoginToRegion += backendService.AddNewSession; loginService.OnLoginToRegion += backendService.AddNewSession;
m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);

32
OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
View File

@ -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.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -8,9 +36,9 @@ using System.Runtime.InteropServices;
[assembly : AssemblyTitle("SimpleApp")] [assembly : AssemblyTitle("SimpleApp")]
[assembly : AssemblyDescription("")] [assembly : AssemblyDescription("")]
[assembly : AssemblyConfiguration("")] [assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("Playahead AB")] [assembly : AssemblyCompany("OpenSimulator.org")]
[assembly : AssemblyProduct("SimpleApp")] [assembly : AssemblyProduct("SimpleApp")]
[assembly : AssemblyCopyright("Copyright © Playahead AB 2007")] [assembly : AssemblyCopyright("Copyright © OpenSimulator Developers 2007-2008")]
[assembly : AssemblyTrademark("")] [assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")] [assembly : AssemblyCulture("")]

6
OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
{ {
/*if (args[0].ToLower() == "lslexport") /*if (args[0].ToLower() == "lslexport")
{ {
string sequence = ""; string sequence = String.Empty;
foreach (KeyValuePair<LLUUID, SceneObject> obj in script.world.Objects) foreach (KeyValuePair<LLUUID, SceneObject> obj in script.world.Objects)
{ {
@ -82,13 +82,13 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
LLVector3 scale = prim.Scale; LLVector3 scale = prim.Scale;
LLVector3 rootPos = prim.WorldPos; LLVector3 rootPos = prim.WorldPos;
string setPrimParams = ""; string setPrimParams = String.Empty;
setPrimParams += "[PRIM_SCALE, " + scale.ToString() + ", PRIM_POS, " + rootPos.ToString() + ", PRIM_ROTATION, " + rot.ToString() + "]\n"; setPrimParams += "[PRIM_SCALE, " + scale.ToString() + ", PRIM_POS, " + rootPos.ToString() + ", PRIM_ROTATION, " + rot.ToString() + "]\n";
return setPrimParams; return setPrimParams;
*/ */
return ""; return System.String.Empty;
} }
} }
} }

14
OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
View File

@ -237,7 +237,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class PoolUtf8 : PoolItem public class PoolUtf8 : PoolItem
{ {
public string Value = ""; public string Value = String.Empty;
public void readValue(byte[] data, ref int pointer, int length) public void readValue(byte[] data, ref int pointer, int length)
{ {
@ -274,7 +274,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class PoolClass : PoolItem public class PoolClass : PoolItem
{ {
//public string name = ""; //public string name = String.Empty;
public ushort namePointer = 0; public ushort namePointer = 0;
private ClassRecord parent; private ClassRecord parent;
public PoolUtf8 Name; public PoolUtf8 Name;
@ -384,7 +384,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
{ {
public ushort AccessFlags = 0; public ushort AccessFlags = 0;
public ushort NameIndex = 0; public ushort NameIndex = 0;
public string Name = ""; public string Name = String.Empty;
public ushort DescriptorIndex = 0; public ushort DescriptorIndex = 0;
public ushort AttributeCount = 0; public ushort AttributeCount = 0;
public List<MethodAttribute> Attributes = new List<MethodAttribute>(); public List<MethodAttribute> Attributes = new List<MethodAttribute>();
@ -436,7 +436,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class MethodAttribute public class MethodAttribute
{ {
public ushort NameIndex = 0; public ushort NameIndex = 0;
public string Name = ""; public string Name = String.Empty;
public Int32 Length = 0; public Int32 Length = 0;
//for now only support code attribute //for now only support code attribute
public ushort MaxStack = 0; public ushort MaxStack = 0;
@ -502,7 +502,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class SubAttribute public class SubAttribute
{ {
public ushort NameIndex = 0; public ushort NameIndex = 0;
public string Name = ""; public string Name = String.Empty;
public Int32 Length = 0; public Int32 Length = 0;
public byte[] Data; public byte[] Data;
private ClassRecord parent; private ClassRecord parent;
@ -546,7 +546,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
{ {
public ushort AccessFlags = 0; public ushort AccessFlags = 0;
public ushort NameIndex = 0; public ushort NameIndex = 0;
public string Name = ""; public string Name = String.Empty;
public ushort DescriptorIndex = 0; public ushort DescriptorIndex = 0;
public ushort AttributeCount = 0; public ushort AttributeCount = 0;
public List<FieldAttribute> Attributes = new List<FieldAttribute>(); public List<FieldAttribute> Attributes = new List<FieldAttribute>();
@ -605,7 +605,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class FieldAttribute public class FieldAttribute
{ {
public ushort NameIndex = 0; public ushort NameIndex = 0;
public string Name = ""; public string Name = String.Empty;
public Int32 Length = 0; public Int32 Length = 0;
public byte[] Data; public byte[] Data;
private ClassRecord parent; private ClassRecord parent;

4
OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
View File

@ -46,8 +46,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
string typ = string typ =
((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]). ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]).
mNameType.Type.Value; mNameType.Type.Value;
string typeparam = ""; string typeparam = System.String.Empty;
string typereturn = ""; string typereturn = System.String.Empty;
int firstbrak = 0; int firstbrak = 0;
int secondbrak = 0; int secondbrak = 0;
firstbrak = typ.LastIndexOf('('); firstbrak = typ.LastIndexOf('(');

2
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
View File

@ -976,7 +976,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
public class BulletXCharacter : BulletXActor public class BulletXCharacter : BulletXActor
{ {
public BulletXCharacter(BulletXScene parent_scene, PhysicsVector pos) public BulletXCharacter(BulletXScene parent_scene, PhysicsVector pos)
: this("", parent_scene, pos) : this(String.Empty, parent_scene, pos)
{ {
} }

2
OpenSim/Region/Physics/Meshing/SimpleHull.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Region.Physics.Meshing
public override String ToString() public override String ToString()
{ {
String result = ""; String result = String.Empty;
foreach (Vertex v in vertices) foreach (Vertex v in vertices)
{ {
result += "b:" + v.ToString() + "\n"; result += "b:" + v.ToString() + "\n";

2
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -83,7 +83,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private bool m_alwaysRun = false; private bool m_alwaysRun = false;
private bool m_hackSentFall = false; private bool m_hackSentFall = false;
private bool m_hackSentFly = false; private bool m_hackSentFly = false;
private string m_name = ""; private string m_name = String.Empty;
private bool[] m_colliderarr = new bool[11]; private bool[] m_colliderarr = new bool[11];
private bool[] m_colliderGroundarr = new bool[11]; private bool[] m_colliderGroundarr = new bool[11];

4
OpenSim/Region/ScriptEngine/Common/Executor.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args); //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args);
//Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \"" + EventName + "\""); //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \String.Empty + EventName + "\String.Empty);
if (Events.ContainsKey(EventName) == false) if (Events.ContainsKey(EventName) == false)
{ {
@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Common
if (ev == null) // No event by that name! if (ev == null) // No event by that name!
{ {
//Console.WriteLine("ScriptEngine Can not find any event named: \"" + EventName + "\""); //Console.WriteLine("ScriptEngine Can not find any event named: \String.Empty + EventName + "\String.Empty);
return; return;
} }

2
OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
View File

@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public LSL_BuiltIn_Commands_Interface m_LSL_Functions; public LSL_BuiltIn_Commands_Interface m_LSL_Functions;
private string _Source = ""; private string _Source = String.Empty;
public string Source public string Source
{ {
get get

Some files were not shown because too many files have changed in this diff Show More