aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2008-01-15 02:09:55 +0000
committerAdam Frisby2008-01-15 02:09:55 +0000
commitb25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch)
tree7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim
parentSet svn:eol-style. (diff)
downloadopensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.zip
opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.gz
opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.bz2
opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.xz
* Mother of all commits:
* Cleaned up copyright notices in AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them * Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs14
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs4
-rw-r--r--OpenSim/Framework/AgentInventory.cs4
-rw-r--r--OpenSim/Framework/AssemblyInfo.cs30
-rw-r--r--OpenSim/Framework/AssetBase.cs4
-rw-r--r--OpenSim/Framework/AssetConfig.cs6
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs6
-rw-r--r--OpenSim/Framework/Communications/CAPSService.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs22
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs8
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs24
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs5
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs8
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs20
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs44
-rw-r--r--OpenSim/Framework/Communications/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Communications/RestClient/RestClient.cs2
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs2
-rw-r--r--OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs2
-rw-r--r--OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs2
-rw-r--r--OpenSim/Framework/Configuration/XML/XmlConfiguration.cs4
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs18
-rw-r--r--OpenSim/Framework/ConfigurationOption.cs8
-rw-r--r--OpenSim/Framework/Console/AssemblyInfo.cs10
-rw-r--r--OpenSim/Framework/Console/LogBase.cs4
-rw-r--r--OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLManager.cs12
-rw-r--r--OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs10
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLGridData.cs6
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs12
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLUserData.cs6
-rw-r--r--OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteBase.cs4
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs4
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteUserData.cs4
-rw-r--r--OpenSim/Framework/Data/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Framework/Data/RegionProfileData.cs28
-rw-r--r--OpenSim/Framework/Data/ReservationData.cs8
-rw-r--r--OpenSim/Framework/EstateSettings.cs92
-rw-r--r--OpenSim/Framework/GridConfig.cs22
-rw-r--r--OpenSim/Framework/InventoryConfig.cs10
-rw-r--r--OpenSim/Framework/LandData.cs7
-rw-r--r--OpenSim/Framework/Login.cs2
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs18
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs17
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs3
-rw-r--r--OpenSim/Framework/RegionInfo.cs16
-rw-r--r--OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs6
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs2
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs41
-rw-r--r--OpenSim/Framework/UserConfig.cs14
-rw-r--r--OpenSim/Framework/Util.cs2
-rw-r--r--OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs12
-rw-r--r--OpenSim/Grid/GridServer/Main.cs8
-rw-r--r--OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/UserPresenceData.cs2
-rw-r--r--OpenSim/Grid/ScriptServer/Application.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs6
-rw-r--r--OpenSim/Grid/UserServer/Main.cs6
-rw-r--r--OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/Application/Application.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs22
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs2
-rw-r--r--OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/XMLRPCModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/XferModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs6
-rw-r--r--OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs32
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs6
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs14
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs4
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs2
-rw-r--r--OpenSim/Region/Physics/Meshing/SimpleHull.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Executor.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs58
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs37
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs4
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Tools/Export/OpenSimExport.cs2
120 files changed, 945 insertions, 453 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
index ffb3e48..638ed33 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Addin")] 40[assembly : AssemblyProduct("OpenSim.Addin")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index cce58c2..fa76078 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -48,7 +48,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
48 { 48 {
49 private OpenSimMain m_app; 49 private OpenSimMain m_app;
50 private BaseHttpServer m_httpd; 50 private BaseHttpServer m_httpd;
51 private string requiredPassword = ""; 51 private string requiredPassword = String.Empty;
52 52
53 public void Initialise(OpenSimMain openSim) 53 public void Initialise(OpenSimMain openSim)
54 { 54 {
@@ -57,7 +57,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
57 if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) 57 if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
58 { 58 {
59 MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled"); 59 MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled");
60 requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", ""); 60 requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty);
61 61
62 m_app = openSim; 62 m_app = openSim;
63 m_httpd = openSim.HttpServer; 63 m_httpd = openSim.HttpServer;
@@ -83,7 +83,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
83 LLUUID regionID = new LLUUID((string) requestData["regionID"]); 83 LLUUID regionID = new LLUUID((string) requestData["regionID"]);
84 84
85 Hashtable responseData = new Hashtable(); 85 Hashtable responseData = new Hashtable();
86 if (requiredPassword != "" && 86 if (requiredPassword != String.Empty &&
87 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) 87 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
88 { 88 {
89 responseData["accepted"] = "false"; 89 responseData["accepted"] = "false";
@@ -116,7 +116,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
116 Hashtable requestData = (Hashtable) request.Params[0]; 116 Hashtable requestData = (Hashtable) request.Params[0];
117 117
118 Hashtable responseData = new Hashtable(); 118 Hashtable responseData = new Hashtable();
119 if (requiredPassword != "" && 119 if (requiredPassword != String.Empty &&
120 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) 120 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
121 { 121 {
122 responseData["accepted"] = "false"; 122 responseData["accepted"] = "false";
@@ -142,7 +142,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
142 Hashtable requestData = (Hashtable)request.Params[0]; 142 Hashtable requestData = (Hashtable)request.Params[0];
143 143
144 Hashtable responseData = new Hashtable(); 144 Hashtable responseData = new Hashtable();
145 if (requiredPassword != "" && 145 if (requiredPassword != String.Empty &&
146 (!requestData.Contains("password") || (string)requestData["password"] != requiredPassword)) 146 (!requestData.Contains("password") || (string)requestData["password"] != requiredPassword))
147 { 147 {
148 responseData["accepted"] = "false"; 148 responseData["accepted"] = "false";
@@ -180,7 +180,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
180 XmlRpcResponse response = new XmlRpcResponse(); 180 XmlRpcResponse response = new XmlRpcResponse();
181 Hashtable requestData = (Hashtable) request.Params[0]; 181 Hashtable requestData = (Hashtable) request.Params[0];
182 Hashtable responseData = new Hashtable(); 182 Hashtable responseData = new Hashtable();
183 if (requiredPassword != "" && 183 if (requiredPassword != String.Empty &&
184 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) 184 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
185 { 185 {
186 responseData["accepted"] = "false"; 186 responseData["accepted"] = "false";
@@ -236,7 +236,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
236 XmlRpcResponse response = new XmlRpcResponse(); 236 XmlRpcResponse response = new XmlRpcResponse();
237 Hashtable requestData = (Hashtable) request.Params[0]; 237 Hashtable requestData = (Hashtable) request.Params[0];
238 Hashtable responseData = new Hashtable(); 238 Hashtable responseData = new Hashtable();
239 if (requiredPassword != "" && 239 if (requiredPassword != System.String.Empty &&
240 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) 240 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
241 { 241 {
242 responseData["created"] = "false"; 242 responseData["created"] = "false";
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 65a072f..43ade36 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Framework
61 public bool child; 61 public bool child;
62 public LLUUID InventoryFolder; 62 public LLUUID InventoryFolder;
63 public LLUUID BaseFolder; 63 public LLUUID BaseFolder;
64 public string CapsPath = ""; 64 public string CapsPath = String.Empty;
65 } 65 }
66 66
67 [Serializable] 67 [Serializable]
@@ -100,6 +100,6 @@ namespace OpenSim.Framework
100 public bool child; 100 public bool child;
101 public Guid InventoryFolder; 101 public Guid InventoryFolder;
102 public Guid BaseFolder; 102 public Guid BaseFolder;
103 public string CapsPath = ""; 103 public string CapsPath = String.Empty;
104 } 104 }
105} \ No newline at end of file 105} \ No newline at end of file
diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index 84a782b..83040a3 100644
--- a/OpenSim/Framework/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Framework
234 public LLUUID CreatorID; 234 public LLUUID CreatorID;
235 public sbyte InvType; 235 public sbyte InvType;
236 public sbyte Type; 236 public sbyte Type;
237 public string Name = ""; 237 public string Name = System.String.Empty;
238 public string Description; 238 public string Description;
239 239
240 public InventoryItem() 240 public InventoryItem()
@@ -245,7 +245,7 @@ namespace OpenSim.Framework
245 public string ExportString() 245 public string ExportString()
246 { 246 {
247 string typ = "notecard"; 247 string typ = "notecard";
248 string result = ""; 248 string result = System.String.Empty;
249 result += "\tinv_object\t0\n\t{\n"; 249 result += "\tinv_object\t0\n\t{\n";
250 result += "\t\tobj_id\t%s\n"; 250 result += "\t\tobj_id\t%s\n";
251 result += "\t\tparent_id\t" + ItemID.ToString() + "\n"; 251 result += "\t\tparent_id\t" + ItemID.ToString() + "\n";
diff --git a/OpenSim/Framework/AssemblyInfo.cs b/OpenSim/Framework/AssemblyInfo.cs
index b3206a7..1507d67 100644
--- a/OpenSim/Framework/AssemblyInfo.cs
+++ b/OpenSim/Framework/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.FrameWork")] 40[assembly : AssemblyProduct("OpenSim.FrameWork")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 2bef61b..aa33f63 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -37,8 +37,8 @@ namespace OpenSim.Framework
37 public LLUUID FullID; 37 public LLUUID FullID;
38 public sbyte Type; 38 public sbyte Type;
39 public sbyte InvType; 39 public sbyte InvType;
40 public string Name = ""; 40 public string Name = String.Empty;
41 public string Description = ""; 41 public string Description = String.Empty;
42 public bool Local = false; 42 public bool Local = false;
43 public bool Temporary = false; 43 public bool Temporary = false;
44 44
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index f85129b..9989bfd 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -26,6 +26,8 @@
26* 26*
27*/ 27*/
28 28
29using System;
30
29namespace OpenSim.Framework 31namespace OpenSim.Framework
30{ 32{
31 /// <summary> 33 /// <summary>
@@ -33,9 +35,9 @@ namespace OpenSim.Framework
33 /// </summary> 35 /// </summary>
34 public class AssetConfig 36 public class AssetConfig
35 { 37 {
36 public string DefaultStartupMsg = ""; 38 public string DefaultStartupMsg = String.Empty;
37 39
38 public string DatabaseProvider = ""; 40 public string DatabaseProvider = String.Empty;
39 41
40 public static uint DefaultHttpPort = 8003; 42 public static uint DefaultHttpPort = 8003;
41 public uint HttpPort = DefaultHttpPort; 43 public uint HttpPort = DefaultHttpPort;
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index d6ce0c5..59db3d6 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
99 99
100 for (int i = 0; i < source.Configs.Count; i++) 100 for (int i = 0; i < source.Configs.Count; i++)
101 { 101 {
102 assetSetPath = source.Configs[i].GetString("file", ""); 102 assetSetPath = source.Configs[i].GetString("file", String.Empty);
103 103
104 LoadXmlAssetSet(Path.Combine(Util.assetsDir(), assetSetPath), assets); 104 LoadXmlAssetSet(Path.Combine(Util.assetsDir(), assetSetPath), assets);
105 } 105 }
@@ -138,10 +138,10 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
138 for (int i = 0; i < source.Configs.Count; i++) 138 for (int i = 0; i < source.Configs.Count; i++)
139 { 139 {
140 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString()); 140 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
141 string name = source.Configs[i].GetString("name", ""); 141 string name = source.Configs[i].GetString("name", String.Empty);
142 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); 142 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
143 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0); 143 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
144 string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", "")); 144 string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty));
145 145
146 AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false); 146 AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false);
147 147
diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs
index 40f4006..59cfc06 100644
--- a/OpenSim/Framework/Communications/CAPSService.cs
+++ b/OpenSim/Framework/Communications/CAPSService.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Communications
48 public string CapsRequest(string request, string path, string param) 48 public string CapsRequest(string request, string path, string param)
49 { 49 {
50 System.Console.WriteLine("new caps request " + request + " from path " + path); 50 System.Console.WriteLine("new caps request " + request + " from path " + path);
51 return ""; 51 return System.String.Empty;
52 } 52 }
53 } 53 }
54} \ No newline at end of file 54} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 988c558..6d9a0d6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -208,7 +208,7 @@ namespace OpenSim.Framework.Communications.Cache
208 /// <param name="asset"></param> 208 /// <param name="asset"></param>
209 public void AddAsset(AssetBase asset) 209 public void AddAsset(AssetBase asset)
210 { 210 {
211 string temporary = asset.Temporary ? "temporary" : ""; 211 string temporary = asset.Temporary ? "temporary" : String.Empty;
212 string type = asset.Type == 0 ? "texture" : "asset"; 212 string type = asset.Type == 0 ? "texture" : "asset";
213 213
214 string result = "Ignored"; 214 string result = "Ignored";
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index dd1f8ba..74e2093 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -123,8 +123,8 @@ namespace OpenSim.Framework.Communications.Cache
123 public LLUUID TransactionID = LLUUID.Zero; 123 public LLUUID TransactionID = LLUUID.Zero;
124 public bool UploadComplete; 124 public bool UploadComplete;
125 public ulong XferID; 125 public ulong XferID;
126 private string m_name = ""; 126 private string m_name = String.Empty;
127 private string m_description = ""; 127 private string m_description = String.Empty;
128 private sbyte type = 0; 128 private sbyte type = 0;
129 private sbyte invType = 0; 129 private sbyte invType = 0;
130 private uint nextPerm = 0; 130 private uint nextPerm = 0;
@@ -331,12 +331,12 @@ namespace OpenSim.Framework.Communications.Cache
331 // Fields 331 // Fields
332 private BaseHttpServer httpListener; 332 private BaseHttpServer httpListener;
333 private LLUUID inventoryItemID; 333 private LLUUID inventoryItemID;
334 private string m_assetDescription = ""; 334 private string m_assetDescription = String.Empty;
335 private string m_assetName = ""; 335 private string m_assetName = String.Empty;
336 private LLUUID m_folderID; 336 private LLUUID m_folderID;
337 private LLUUID newAssetID; 337 private LLUUID newAssetID;
338 private bool m_dumpImageToFile; 338 private bool m_dumpImageToFile;
339 private string uploaderPath = ""; 339 private string uploaderPath = String.Empty;
340 340
341 // Events 341 // Events
342 public event UpLoadedAsset OnUpLoad; 342 public event UpLoadedAsset OnUpLoad;
@@ -367,7 +367,7 @@ namespace OpenSim.Framework.Communications.Cache
367 public string uploaderCaps(byte[] data, string path, string param) 367 public string uploaderCaps(byte[] data, string path, string param)
368 { 368 {
369 LLUUID inventoryItemID = this.inventoryItemID; 369 LLUUID inventoryItemID = this.inventoryItemID;
370 string text = ""; 370 string text = String.Empty;
371 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); 371 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
372 complete.new_asset = newAssetID.ToString(); 372 complete.new_asset = newAssetID.ToString();
373 complete.new_inventory_item = inventoryItemID; 373 complete.new_inventory_item = inventoryItemID;
@@ -380,7 +380,7 @@ namespace OpenSim.Framework.Communications.Cache
380 } 380 }
381 if (OnUpLoad != null) 381 if (OnUpLoad != null)
382 { 382 {
383 OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", ""); 383 OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, String.Empty, String.Empty);
384 } 384 }
385 return text; 385 return text;
386 } 386 }
@@ -391,10 +391,10 @@ namespace OpenSim.Framework.Communications.Cache
391 // Fields 391 // Fields
392 private BaseHttpServer httpListener; 392 private BaseHttpServer httpListener;
393 private LLUUID inventoryItemID; 393 private LLUUID inventoryItemID;
394 private string m_assetName = ""; 394 private string m_assetName = String.Empty;
395 private LLUUID newAssetID; 395 private LLUUID newAssetID;
396 private bool SaveImages = false; 396 private bool SaveImages = false;
397 private string uploaderPath = ""; 397 private string uploaderPath = String.Empty;
398 398
399 // Events 399 // Events
400 public event UpLoadedAsset OnUpLoad; 400 public event UpLoadedAsset OnUpLoad;
@@ -420,7 +420,7 @@ namespace OpenSim.Framework.Communications.Cache
420 public string uploaderCaps(byte[] data, string path, string param) 420 public string uploaderCaps(byte[] data, string path, string param)
421 { 421 {
422 LLUUID inventoryItemID = this.inventoryItemID; 422 LLUUID inventoryItemID = this.inventoryItemID;
423 string text = ""; 423 string text = String.Empty;
424 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); 424 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
425 complete.new_asset = newAssetID.ToString(); 425 complete.new_asset = newAssetID.ToString();
426 complete.new_inventory_item = inventoryItemID; 426 complete.new_inventory_item = inventoryItemID;
@@ -433,7 +433,7 @@ namespace OpenSim.Framework.Communications.Cache
433 } 433 }
434 if (OnUpLoad != null) 434 if (OnUpLoad != null)
435 { 435 {
436 OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", ""); 436 OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, String.Empty, String.Empty);
437 } 437 }
438 return text; 438 return text;
439 } 439 }
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 46ae9ce..ae07898 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -152,13 +152,13 @@ namespace OpenSim.Framework.Communications.Cache
152 { 152 {
153 string foldersPath 153 string foldersPath
154 = Path.Combine( 154 = Path.Combine(
155 Util.inventoryDir(), config.GetString("foldersFile", "")); 155 Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty));
156 156
157 LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); 157 LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig);
158 158
159 string itemsPath 159 string itemsPath
160 = Path.Combine( 160 = Path.Combine(
161 Util.inventoryDir(), config.GetString("itemsFile", "")); 161 Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty));
162 162
163 LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); 163 LoadFromFile(itemsPath, "Library items", ReadItemFromConfig);
164 } 164 }
@@ -210,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache
210 item.inventoryID = new LLUUID(config.GetString("inventoryID", folderID.ToString())); 210 item.inventoryID = new LLUUID(config.GetString("inventoryID", folderID.ToString()));
211 item.assetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); 211 item.assetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
212 item.parentFolderID = new LLUUID(config.GetString("folderID", folderID.ToString())); 212 item.parentFolderID = new LLUUID(config.GetString("folderID", folderID.ToString()));
213 item.inventoryDescription = config.GetString("description", ""); 213 item.inventoryDescription = config.GetString("description", System.String.Empty);
214 item.inventoryName = config.GetString("name", ""); 214 item.inventoryName = config.GetString("name", System.String.Empty);
215 item.assetType = config.GetInt("assetType", 0); 215 item.assetType = config.GetInt("assetType", 0);
216 item.invType = config.GetInt("inventoryType", 0); 216 item.invType = config.GetInt("inventoryType", 0);
217 item.inventoryCurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); 217 item.inventoryCurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 74d8125..f85b4ab 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.Capabilities
197 { 197 {
198 Console.WriteLine("texture request " + request); 198 Console.WriteLine("texture request " + request);
199 // Needs implementing (added to remove compiler warning) 199 // Needs implementing (added to remove compiler warning)
200 return ""; 200 return String.Empty;
201 } 201 }
202 202
203 #region EventQueue (Currently not enabled) 203 #region EventQueue (Currently not enabled)
@@ -211,7 +211,7 @@ namespace OpenSim.Region.Capabilities
211 /// <returns></returns> 211 /// <returns></returns>
212 public string ProcessEventQueue(string request, string path, string param) 212 public string ProcessEventQueue(string request, string path, string param)
213 { 213 {
214 string res = ""; 214 string res = String.Empty;
215 215
216 if (m_capsEventQueue.Count > 0) 216 if (m_capsEventQueue.Count > 0)
217 { 217 {
@@ -476,17 +476,17 @@ namespace OpenSim.Region.Capabilities
476 { 476 {
477 public event UpLoadedAsset OnUpLoad; 477 public event UpLoadedAsset OnUpLoad;
478 478
479 private string uploaderPath = ""; 479 private string uploaderPath = String.Empty;
480 private LLUUID newAssetID; 480 private LLUUID newAssetID;
481 private LLUUID inventoryItemID; 481 private LLUUID inventoryItemID;
482 private LLUUID parentFolder; 482 private LLUUID parentFolder;
483 private BaseHttpServer httpListener; 483 private BaseHttpServer httpListener;
484 private bool m_dumpAssetsToFile; 484 private bool m_dumpAssetsToFile;
485 private string m_assetName = ""; 485 private string m_assetName = String.Empty;
486 private string m_assetDes = ""; 486 private string m_assetDes = String.Empty;
487 487
488 private string m_invType = ""; 488 private string m_invType = String.Empty;
489 private string m_assetType = ""; 489 private string m_assetType = String.Empty;
490 490
491 public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem, 491 public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem,
492 LLUUID parentFolderID, string invType, string assetType, string path, 492 LLUUID parentFolderID, string invType, string assetType, string path,
@@ -514,7 +514,7 @@ namespace OpenSim.Region.Capabilities
514 public string uploaderCaps(byte[] data, string path, string param) 514 public string uploaderCaps(byte[] data, string path, string param)
515 { 515 {
516 LLUUID inv = inventoryItemID; 516 LLUUID inv = inventoryItemID;
517 string res = ""; 517 string res = String.Empty;
518 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 518 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
519 uploadComplete.new_asset = newAssetID.ToString(); 519 uploadComplete.new_asset = newAssetID.ToString();
520 uploadComplete.new_inventory_item = inv; 520 uploadComplete.new_inventory_item = inv;
@@ -568,7 +568,7 @@ namespace OpenSim.Region.Capabilities
568 { 568 {
569 public event UpdateItem OnUpLoad; 569 public event UpdateItem OnUpLoad;
570 570
571 private string uploaderPath = ""; 571 private string uploaderPath = String.Empty;
572 private LLUUID inventoryItemID; 572 private LLUUID inventoryItemID;
573 private BaseHttpServer httpListener; 573 private BaseHttpServer httpListener;
574 private bool m_dumpAssetToFile; 574 private bool m_dumpAssetToFile;
@@ -592,7 +592,7 @@ namespace OpenSim.Region.Capabilities
592 public string uploaderCaps(byte[] data, string path, string param) 592 public string uploaderCaps(byte[] data, string path, string param)
593 { 593 {
594 LLUUID inv = inventoryItemID; 594 LLUUID inv = inventoryItemID;
595 string res = ""; 595 string res = String.Empty;
596 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 596 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
597 LLUUID assetID = LLUUID.Zero; 597 LLUUID assetID = LLUUID.Zero;
598 598
@@ -648,7 +648,7 @@ namespace OpenSim.Region.Capabilities
648 { 648 {
649 public event UpdateTaskScript OnUpLoad; 649 public event UpdateTaskScript OnUpLoad;
650 650
651 private string uploaderPath = ""; 651 private string uploaderPath = String.Empty;
652 private LLUUID inventoryItemID; 652 private LLUUID inventoryItemID;
653 private LLUUID primID; 653 private LLUUID primID;
654 private bool isScriptRunning; 654 private bool isScriptRunning;
@@ -686,7 +686,7 @@ namespace OpenSim.Region.Capabilities
686// "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}", 686// "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}",
687// data, path, param); 687// data, path, param);
688 688
689 string res = ""; 689 string res = String.Empty;
690 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); 690 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
691 691
692 if (OnUpLoad != null) 692 if (OnUpLoad != null)
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index f838c85..e0afa5c 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -26,15 +26,16 @@
26* 26*
27*/ 27*/
28using libsecondlife; 28using libsecondlife;
29using System;
29 30
30namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
31{ 32{
32 [LLSDType("MAP")] 33 [LLSDType("MAP")]
33 public class LLSDAssetUploadComplete 34 public class LLSDAssetUploadComplete
34 { 35 {
35 public string new_asset = ""; 36 public string new_asset = String.Empty;
36 public LLUUID new_inventory_item = LLUUID.Zero; 37 public LLUUID new_inventory_item = LLUUID.Zero;
37 public string state = ""; 38 public string state = String.Empty;
38 //public bool success = false; 39 //public bool success = false;
39 40
40 public LLSDAssetUploadComplete() 41 public LLSDAssetUploadComplete()
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index 7fed27a..e611eea 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -33,11 +33,11 @@ namespace OpenSim.Region.Capabilities
33 [LLSDMap] 33 [LLSDMap]
34 public class LLSDAssetUploadRequest 34 public class LLSDAssetUploadRequest
35 { 35 {
36 public string asset_type = ""; 36 public string asset_type = System.String.Empty;
37 public string description = ""; 37 public string description = System.String.Empty;
38 public LLUUID folder_id = LLUUID.Zero; 38 public LLUUID folder_id = LLUUID.Zero;
39 public string inventory_type = ""; 39 public string inventory_type = System.String.Empty;
40 public string name = ""; 40 public string name = System.String.Empty;
41 41
42 public LLSDAssetUploadRequest() 42 public LLSDAssetUploadRequest()
43 { 43 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index 3ad618d..7744ffb 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -31,8 +31,8 @@ namespace OpenSim.Region.Capabilities
31 [LLSDMap] 31 [LLSDMap]
32 public class LLSDAssetUploadResponse 32 public class LLSDAssetUploadResponse
33 { 33 {
34 public string uploader = ""; 34 public string uploader = System.String.Empty;
35 public string state = ""; 35 public string state = System.String.Empty;
36 36
37 public LLSDAssetUploadResponse() 37 public LLSDAssetUploadResponse()
38 { 38 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
index 7b09cb3..7006b44 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
@@ -26,20 +26,22 @@
26* 26*
27*/ 27*/
28 28
29using System;
30
29namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
30{ 32{
31 [LLSDType("MAP")] 33 [LLSDType("MAP")]
32 public class LLSDCapsDetails 34 public class LLSDCapsDetails
33 { 35 {
34 public string MapLayer = ""; 36 public string MapLayer = String.Empty;
35 public string NewFileAgentInventory = ""; 37 public string NewFileAgentInventory = String.Empty;
36 //public string EventQueueGet = ""; 38 //public string EventQueueGet = String.Empty;
37 // public string RequestTextureDownload = ""; 39 // public string RequestTextureDownload = String.Empty;
38 // public string ChatSessionRequest = ""; 40 // public string ChatSessionRequest = String.Empty;
39 public string UpdateNotecardAgentInventory = ""; 41 public string UpdateNotecardAgentInventory = String.Empty;
40 public string UpdateScriptAgentInventory = ""; 42 public string UpdateScriptAgentInventory = String.Empty;
41 public string UpdateScriptTaskInventory = ""; 43 public string UpdateScriptTaskInventory = String.Empty;
42 // public string ParcelVoiceInfoRequest = ""; 44 // public string ParcelVoiceInfoRequest = String.Empty;
43 45
44 public LLSDCapsDetails() 46 public LLSDCapsDetails()
45 { 47 {
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 0c6d53f..a07b165 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Framework.Communications
136 136
137 public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY) 137 public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY)
138 { 138 {
139 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + ""); 139 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty);
140 140
141 m_userService.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY); 141 m_userService.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY);
142 UserProfileData userProf = UserService.GetUserProfile(firstName, lastName); 142 UserProfileData userProf = UserService.GetUserProfile(firstName, lastName);
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 2239a9c..7f8658d 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.UserManagement
149 ErrorMessage = "You have entered an invalid name/password combination. Check Caps/lock."; 149 ErrorMessage = "You have entered an invalid name/password combination. Check Caps/lock.";
150 ErrorReason = "key"; 150 ErrorReason = "key";
151 welcomeMessage = "Welcome to OpenSim!"; 151 welcomeMessage = "Welcome to OpenSim!";
152 seedCapability = ""; 152 seedCapability = String.Empty;
153 home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" + 153 home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" +
154 userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" + 154 userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" +
155 userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" + 155 userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" +
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 4b2d679..889b70a 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.UserManagement
58 m_userManager = userManager; 58 m_userManager = userManager;
59 m_libraryRootFolder = libraryRootFolder; 59 m_libraryRootFolder = libraryRootFolder;
60 60
61 if (welcomeMess != "") 61 if (welcomeMess != String.Empty)
62 { 62 {
63 m_welcomeMessage = welcomeMess; 63 m_welcomeMessage = welcomeMess;
64 } 64 }
@@ -370,16 +370,16 @@ namespace OpenSim.Framework.UserManagement
370 Hashtable returnactions = new Hashtable(); 370 Hashtable returnactions = new Hashtable();
371 int statuscode = 200; 371 int statuscode = 200;
372 372
373 string firstname = ""; 373 string firstname = String.Empty;
374 string lastname = ""; 374 string lastname = String.Empty;
375 string location = ""; 375 string location = String.Empty;
376 string region =""; 376 string region =String.Empty;
377 string grid = ""; 377 string grid = String.Empty;
378 string channel = ""; 378 string channel = String.Empty;
379 string version = ""; 379 string version = String.Empty;
380 string lang = ""; 380 string lang = String.Empty;
381 string password = ""; 381 string password = String.Empty;
382 string errormessages = ""; 382 string errormessages = String.Empty;
383 383
384 // the client requires the HTML form field be named 'username' 384 // the client requires the HTML form field be named 'username'
385 // however, the data it sends when it loads the first time is 'firstname' 385 // however, the data it sends when it loads the first time is 'firstname'
@@ -387,33 +387,33 @@ namespace OpenSim.Framework.UserManagement
387 387
388 388
389 if (keysvals.Contains("firstname")) 389 if (keysvals.Contains("firstname"))
390 firstname = wfcut.Replace((string)keysvals["firstname"],"",99999); 390 firstname = wfcut.Replace((string)keysvals["firstname"],String.Empty,99999);
391 if (keysvals.Contains("username")) 391 if (keysvals.Contains("username"))
392 firstname = wfcut.Replace((string)keysvals["username"],"",99999); 392 firstname = wfcut.Replace((string)keysvals["username"],String.Empty,99999);
393 393
394 if (keysvals.Contains("lastname")) 394 if (keysvals.Contains("lastname"))
395 lastname = wfcut.Replace((string)keysvals["lastname"],"",99999); 395 lastname = wfcut.Replace((string)keysvals["lastname"],String.Empty,99999);
396 396
397 if (keysvals.Contains("location")) 397 if (keysvals.Contains("location"))
398 location = wfcut.Replace((string)keysvals["location"],"",99999); 398 location = wfcut.Replace((string)keysvals["location"],String.Empty,99999);
399 399
400 if (keysvals.Contains("region")) 400 if (keysvals.Contains("region"))
401 region = wfcut.Replace((string)keysvals["region"],"",99999); 401 region = wfcut.Replace((string)keysvals["region"],String.Empty,99999);
402 402
403 if (keysvals.Contains("grid")) 403 if (keysvals.Contains("grid"))
404 grid = wfcut.Replace((string)keysvals["grid"],"",99999); 404 grid = wfcut.Replace((string)keysvals["grid"],String.Empty,99999);
405 405
406 if (keysvals.Contains("channel")) 406 if (keysvals.Contains("channel"))
407 channel = wfcut.Replace((string)keysvals["channel"],"",99999); 407 channel = wfcut.Replace((string)keysvals["channel"],String.Empty,99999);
408 408
409 if (keysvals.Contains("version")) 409 if (keysvals.Contains("version"))
410 version = wfcut.Replace((string)keysvals["version"],"",99999); 410 version = wfcut.Replace((string)keysvals["version"],String.Empty,99999);
411 411
412 if (keysvals.Contains("lang")) 412 if (keysvals.Contains("lang"))
413 lang = wfcut.Replace((string)keysvals["lang"],"",99999); 413 lang = wfcut.Replace((string)keysvals["lang"],String.Empty,99999);
414 414
415 if (keysvals.Contains("password")) 415 if (keysvals.Contains("password"))
416 password = wfcut.Replace((string)keysvals["password"], "", 99999); 416 password = wfcut.Replace((string)keysvals["password"], String.Empty, 99999);
417 417
418 418
419 // load our login form. 419 // load our login form.
@@ -470,7 +470,7 @@ namespace OpenSim.Framework.UserManagement
470 { 470 {
471 // inject our values in the form at the markers 471 // inject our values in the form at the markers
472 472
473 string loginform=""; 473 string loginform=String.Empty;
474 string file = Path.Combine(Util.configDir(), "http_loginform.html"); 474 string file = Path.Combine(Util.configDir(), "http_loginform.html");
475 if (!File.Exists(file)) 475 if (!File.Exists(file))
476 { 476 {
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
index e9c7bf3..8b6d937 100644
--- a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OpenGrid.Framework.Communications")] 39[assembly : AssemblyProduct("OpenGrid.Framework.Communications")]
40[assembly : AssemblyCopyright("Copyright © 2007")] 40[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs
index 1aaf68e..e4da4dc 100644
--- a/OpenSim/Framework/Communications/RestClient/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Framework.Communications
201 /// <returns>slash '/' if not already present</returns> 201 /// <returns>slash '/' if not already present</returns>
202 private string slash(string s) 202 private string slash(string s)
203 { 203 {
204 return isSlashed(s) ? "" : "/"; 204 return isSlashed(s) ? String.Empty : "/";
205 } 205 }
206 206
207 /// <summary> 207 /// <summary>
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 2d72629..4216553 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -472,7 +472,7 @@ namespace OpenSim.Framework.UserManagement
472 user.username = firstName; 472 user.username = firstName;
473 user.surname = lastName; 473 user.surname = lastName;
474 user.passwordHash = pass; 474 user.passwordHash = pass;
475 user.passwordSalt = ""; 475 user.passwordSalt = String.Empty;
476 user.created = Util.UnixTimeSinceEpoch(); 476 user.created = Util.UnixTimeSinceEpoch();
477 user.homeLookAt = new LLVector3(100, 100, 100); 477 user.homeLookAt = new LLVector3(100, 100, 100);
478 user.homeRegionX = regX; 478 user.homeRegionX = regX;
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index 0d48683..e27c88b 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Configuration.HTTP
39 39
40 private XmlConfiguration xmlConfig; 40 private XmlConfiguration xmlConfig;
41 41
42 private string configFileName = ""; 42 private string configFileName = System.String.Empty;
43 43
44 public HTTPConfiguration() 44 public HTTPConfiguration()
45 { 45 {
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
index 8fddb60..8575d3b 100644
--- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
+++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework.Configuration.HTTP
32 { 32 {
33 private ConfigurationMember configMember; 33 private ConfigurationMember configMember;
34 34
35 public string baseConfigURL = ""; 35 public string baseConfigURL = System.String.Empty;
36 36
37 public RemoteConfigSettings(string filename) 37 public RemoteConfigSettings(string filename)
38 { 38 {
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 8bb31f8..4c50e53 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -71,9 +71,9 @@ namespace OpenSim.Framework.Configuration
71 else 71 else
72 { 72 {
73 createdFile = true; 73 createdFile = true;
74 rootNode = doc.CreateNode(XmlNodeType.Element, "Root", ""); 74 rootNode = doc.CreateNode(XmlNodeType.Element, "Root", String.Empty);
75 doc.AppendChild(rootNode); 75 doc.AppendChild(rootNode);
76 configNode = doc.CreateNode(XmlNodeType.Element, "Config", ""); 76 configNode = doc.CreateNode(XmlNodeType.Element, "Config", String.Empty);
77 rootNode.AppendChild(configNode); 77 rootNode.AppendChild(configNode);
78 } 78 }
79 79
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 4ae59d6..7590495 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -44,8 +44,8 @@ namespace OpenSim.Framework
44 public delegate void ConfigurationOptionsLoad(); 44 public delegate void ConfigurationOptionsLoad();
45 45
46 private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>(); 46 private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>();
47 private string configurationFilename = ""; 47 private string configurationFilename = String.Empty;
48 private string configurationDescription = ""; 48 private string configurationDescription = String.Empty;
49 private XmlNode configurationFromXMLNode = null; 49 private XmlNode configurationFromXMLNode = null;
50 private ConfigurationOptionsLoad loadFunction; 50 private ConfigurationOptionsLoad loadFunction;
51 private ConfigurationOptionResult resultFunction; 51 private ConfigurationOptionResult resultFunction;
@@ -70,7 +70,7 @@ namespace OpenSim.Framework
70 public ConfigurationMember(XmlNode configuration_xml, string configuration_description, 70 public ConfigurationMember(XmlNode configuration_xml, string configuration_description,
71 ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error) 71 ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
72 { 72 {
73 configurationFilename = ""; 73 configurationFilename = String.Empty;
74 configurationFromXMLNode = configuration_xml; 74 configurationFromXMLNode = configuration_xml;
75 configurationDescription = configuration_description; 75 configurationDescription = configuration_description;
76 loadFunction = load_function; 76 loadFunction = load_function;
@@ -100,8 +100,8 @@ namespace OpenSim.Framework
100 100
101 private void checkAndAddConfigOption(ConfigurationOption option) 101 private void checkAndAddConfigOption(ConfigurationOption option)
102 { 102 {
103 if ((option.configurationKey != "" && option.configurationQuestion != "") || 103 if ((option.configurationKey != String.Empty && option.configurationQuestion != String.Empty) ||
104 (option.configurationKey != "" && option.configurationUseDefaultNoPrompt)) 104 (option.configurationKey != String.Empty && option.configurationUseDefaultNoPrompt))
105 { 105 {
106 if (!configurationOptions.Contains(option)) 106 if (!configurationOptions.Contains(option))
107 { 107 {
@@ -190,7 +190,7 @@ namespace OpenSim.Framework
190 return; 190 return;
191 } 191 }
192 192
193 if (configurationFilename.Trim() != "") 193 if (configurationFilename.Trim() != String.Empty)
194 { 194 {
195 configurationPlugin.SetFileName(configurationFilename); 195 configurationPlugin.SetFileName(configurationFilename);
196 try 196 try
@@ -220,11 +220,11 @@ namespace OpenSim.Framework
220 { 220 {
221 bool convertSuccess = false; 221 bool convertSuccess = false;
222 object return_result = null; 222 object return_result = null;
223 string errorMessage = ""; 223 string errorMessage = String.Empty;
224 bool ignoreNextFromConfig = false; 224 bool ignoreNextFromConfig = false;
225 while (convertSuccess == false) 225 while (convertSuccess == false)
226 { 226 {
227 string console_result = ""; 227 string console_result = String.Empty;
228 string attribute = null; 228 string attribute = null;
229 if (useFile || configurationFromXMLNode != null) 229 if (useFile || configurationFromXMLNode != null)
230 { 230 {
@@ -250,7 +250,7 @@ namespace OpenSim.Framework
250 configOption.shouldIBeAsked(configOption.configurationKey)) || 250 configOption.shouldIBeAsked(configOption.configurationKey)) ||
251 configOption.shouldIBeAsked == null) 251 configOption.shouldIBeAsked == null)
252 { 252 {
253 if (configurationDescription.Trim() != "") 253 if (configurationDescription.Trim() != String.Empty)
254 { 254 {
255 console_result = 255 console_result =
256 MainLog.Instance.CmdPrompt( 256 MainLog.Instance.CmdPrompt(
diff --git a/OpenSim/Framework/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs
index 7f9b5b5..d8be6f8 100644
--- a/OpenSim/Framework/ConfigurationOption.cs
+++ b/OpenSim/Framework/ConfigurationOption.cs
@@ -26,6 +26,8 @@
26* 26*
27*/ 27*/
28 28
29using System;
30
29namespace OpenSim.Framework 31namespace OpenSim.Framework
30{ 32{
31 public class ConfigurationOption 33 public class ConfigurationOption
@@ -52,9 +54,9 @@ namespace OpenSim.Framework
52 TYPE_DOUBLE 54 TYPE_DOUBLE
53 } ; 55 } ;
54 56
55 public string configurationKey = ""; 57 public string configurationKey = String.Empty;
56 public string configurationQuestion = ""; 58 public string configurationQuestion = String.Empty;
57 public string configurationDefault = ""; 59 public string configurationDefault = String.Empty;
58 60
59 public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING; 61 public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING;
60 public bool configurationUseDefaultNoPrompt = false; 62 public bool configurationUseDefaultNoPrompt = false;
diff --git a/OpenSim/Framework/Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
index 73ecd18..b321170 100644
--- a/OpenSim/Framework/Console/AssemblyInfo.cs
+++ b/OpenSim/Framework/Console/AssemblyInfo.cs
@@ -36,12 +36,12 @@ using System.Runtime.InteropServices;
36 36
37[assembly : AssemblyTitle("ServerConsole")] 37[assembly : AssemblyTitle("ServerConsole")]
38[assembly : AssemblyDescription("")] 38[assembly : AssemblyDescription("")]
39[assembly : AssemblyConfiguration("")] 39[assembly: AssemblyConfiguration("")]
40[assembly : AssemblyCompany("")] 40[assembly: AssemblyCompany("")]
41[assembly : AssemblyProduct("ServerConsole")] 41[assembly : AssemblyProduct("ServerConsole")]
42[assembly : AssemblyCopyright("")] 42[assembly: AssemblyCopyright("")]
43[assembly : AssemblyTrademark("")] 43[assembly: AssemblyTrademark("")]
44[assembly : AssemblyCulture("")] 44[assembly: AssemblyCulture("")]
45 45
46// This sets the default COM visibility of types in the assembly to invisible. 46// This sets the default COM visibility of types in the assembly to invisible.
47// If you need to expose a type to COM, use [ComVisible(true)] on that type. 47// If you need to expose a type to COM, use [ComVisible(true)] on that type.
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index e7b1945..6235c07 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -298,7 +298,7 @@ namespace OpenSim.Framework.Console
298 catch (Exception e) 298 catch (Exception e)
299 { 299 {
300 MainLog.Instance.Error("Console", "System.Console.ReadLine exception " + e.ToString()); 300 MainLog.Instance.Error("Console", "System.Console.ReadLine exception " + e.ToString());
301 return ""; 301 return String.Empty;
302 } 302 }
303 } 303 }
304 304
@@ -377,7 +377,7 @@ namespace OpenSim.Framework.Console
377 public string CmdPrompt(string prompt, string defaultresponse) 377 public string CmdPrompt(string prompt, string defaultresponse)
378 { 378 {
379 string temp = CmdPrompt(String.Format("{0} [{1}]", prompt, defaultresponse)); 379 string temp = CmdPrompt(String.Format("{0} [{1}]", prompt, defaultresponse));
380 if (temp == "") 380 if (temp == String.Empty)
381 { 381 {
382 return defaultresponse; 382 return defaultresponse;
383 } 383 }
diff --git a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
index 6183b6e..af181e4 100644
--- a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Framework.Data.DB4o")] 40[assembly : AssemblyProduct("OpenSim.Framework.Data.DB4o")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index bf57492..3a70909 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Framework.Data.MSSQL
186 protected static string defineTable(DataTable dt) 186 protected static string defineTable(DataTable dt)
187 { 187 {
188 string sql = "create table " + dt.TableName + "("; 188 string sql = "create table " + dt.TableName + "(";
189 string subsql = ""; 189 string subsql = String.Empty;
190 foreach (DataColumn col in dt.Columns) 190 foreach (DataColumn col in dt.Columns)
191 { 191 {
192 if (subsql.Length > 0) 192 if (subsql.Length > 0)
@@ -337,7 +337,7 @@ namespace OpenSim.Framework.Data.MSSQL
337 337
338 // World Map Addition 338 // World Map Addition
339 string tempRegionMap = reader["regionMapTexture"].ToString(); 339 string tempRegionMap = reader["regionMapTexture"].ToString();
340 if (tempRegionMap != "") 340 if (tempRegionMap != String.Empty)
341 { 341 {
342 regionprofile.regionMapTextureID = new LLUUID(tempRegionMap); 342 regionprofile.regionMapTextureID = new LLUUID(tempRegionMap);
343 } 343 }
@@ -644,12 +644,12 @@ namespace OpenSim.Framework.Data.MSSQL
644 parameters["homeLookAtZ"] = homeLookAtZ.ToString(); 644 parameters["homeLookAtZ"] = homeLookAtZ.ToString();
645 parameters["created"] = created.ToString(); 645 parameters["created"] = created.ToString();
646 parameters["lastLogin"] = lastlogin.ToString(); 646 parameters["lastLogin"] = lastlogin.ToString();
647 parameters["userInventoryURI"] = ""; 647 parameters["userInventoryURI"] = String.Empty;
648 parameters["userAssetURI"] = ""; 648 parameters["userAssetURI"] = String.Empty;
649 parameters["profileCanDoMask"] = "0"; 649 parameters["profileCanDoMask"] = "0";
650 parameters["profileWantDoMask"] = "0"; 650 parameters["profileWantDoMask"] = "0";
651 parameters["profileAboutText"] = ""; 651 parameters["profileAboutText"] = String.Empty;
652 parameters["profileFirstText"] = ""; 652 parameters["profileFirstText"] = String.Empty;
653 parameters["profileImage"] = LLUUID.Zero.ToString(); 653 parameters["profileImage"] = LLUUID.Zero.ToString();
654 parameters["profileFirstImage"] = LLUUID.Zero.ToString(); 654 parameters["profileFirstImage"] = LLUUID.Zero.ToString();
655 parameters["webLoginKey"] = LLUUID.Random().ToString(); 655 parameters["webLoginKey"] = LLUUID.Random().ToString();
diff --git a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
index 6846ecf..a91ce62 100644
--- a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")] 40[assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index 8055448..26985b3 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -485,7 +485,7 @@ namespace OpenSim.Framework.Data.MySQL
485 foreach (DataColumn column in table.Columns) 485 foreach (DataColumn column in table.Columns)
486 Debug.Write(column.ColumnName + " = " + 486 Debug.Write(column.ColumnName + " = " +
487 row[column, DataRowVersion.Original] + ", "); 487 row[column, DataRowVersion.Original] + ", ");
488 Debug.WriteLine(""); 488 Debug.WriteLine(String.Empty);
489 } 489 }
490 //--- Display the current values, if there are any. 490 //--- Display the current values, if there are any.
491 if (row.HasVersion(DataRowVersion.Current)) 491 if (row.HasVersion(DataRowVersion.Current))
@@ -494,9 +494,9 @@ namespace OpenSim.Framework.Data.MySQL
494 foreach (DataColumn column in table.Columns) 494 foreach (DataColumn column in table.Columns)
495 Debug.Write(column.ColumnName + " = " + 495 Debug.Write(column.ColumnName + " = " +
496 row[column, DataRowVersion.Current] + ", "); 496 row[column, DataRowVersion.Current] + ", ");
497 Debug.WriteLine(""); 497 Debug.WriteLine(String.Empty);
498 } 498 }
499 Debug.WriteLine(""); 499 Debug.WriteLine(String.Empty);
500 } 500 }
501 } 501 }
502 } 502 }
@@ -1313,7 +1313,7 @@ namespace OpenSim.Framework.Data.MySQL
1313 private MySqlCommand createUpdateCommand(string table, string pk, DataTable dt) 1313 private MySqlCommand createUpdateCommand(string table, string pk, DataTable dt)
1314 { 1314 {
1315 string sql = "update " + table + " set "; 1315 string sql = "update " + table + " set ";
1316 string subsql = ""; 1316 string subsql = String.Empty;
1317 foreach (DataColumn col in dt.Columns) 1317 foreach (DataColumn col in dt.Columns)
1318 { 1318 {
1319 if (subsql.Length > 0) 1319 if (subsql.Length > 0)
@@ -1341,7 +1341,7 @@ namespace OpenSim.Framework.Data.MySQL
1341 private string defineTable(DataTable dt) 1341 private string defineTable(DataTable dt)
1342 { 1342 {
1343 string sql = "create table " + dt.TableName + "("; 1343 string sql = "create table " + dt.TableName + "(";
1344 string subsql = ""; 1344 string subsql = String.Empty;
1345 foreach (DataColumn col in dt.Columns) 1345 foreach (DataColumn col in dt.Columns)
1346 { 1346 {
1347 if (subsql.Length > 0) 1347 if (subsql.Length > 0)
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 7cfac12..c8c4ab0 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -219,8 +219,8 @@ namespace OpenSim.Framework.Data.MySQL
219 if (querysplit.Length == 2) 219 if (querysplit.Length == 2)
220 { 220 {
221 Dictionary<string, string> param = new Dictionary<string, string>(); 221 Dictionary<string, string> param = new Dictionary<string, string>();
222 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; 222 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
223 param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], "") + "%"; 223 param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], String.Empty) + "%";
224 try 224 try
225 { 225 {
226 lock (database) 226 lock (database)
@@ -258,7 +258,7 @@ namespace OpenSim.Framework.Data.MySQL
258 lock (database) 258 lock (database)
259 { 259 {
260 Dictionary<string, string> param = new Dictionary<string, string>(); 260 Dictionary<string, string> param = new Dictionary<string, string>();
261 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; 261 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], System.String.Empty) + "%";
262 262
263 IDbCommand result = 263 IDbCommand result =
264 database.Query( 264 database.Query(
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 7645df3..15ccf5f 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -323,7 +323,7 @@ namespace OpenSim.Framework.Data.MySQL
323 323
324 // World Map Addition 324 // World Map Addition
325 string tempRegionMap = reader["regionMapTexture"].ToString(); 325 string tempRegionMap = reader["regionMapTexture"].ToString();
326 if (tempRegionMap != "") 326 if (tempRegionMap != String.Empty)
327 { 327 {
328 retval.regionMapTextureID = new LLUUID(tempRegionMap); 328 retval.regionMapTextureID = new LLUUID(tempRegionMap);
329 } 329 }
@@ -572,12 +572,12 @@ namespace OpenSim.Framework.Data.MySQL
572 parameters["?homeLookAtZ"] = homeLookAtZ.ToString(); 572 parameters["?homeLookAtZ"] = homeLookAtZ.ToString();
573 parameters["?created"] = created.ToString(); 573 parameters["?created"] = created.ToString();
574 parameters["?lastLogin"] = lastlogin.ToString(); 574 parameters["?lastLogin"] = lastlogin.ToString();
575 parameters["?userInventoryURI"] = ""; 575 parameters["?userInventoryURI"] = String.Empty;
576 parameters["?userAssetURI"] = ""; 576 parameters["?userAssetURI"] = String.Empty;
577 parameters["?profileCanDoMask"] = "0"; 577 parameters["?profileCanDoMask"] = "0";
578 parameters["?profileWantDoMask"] = "0"; 578 parameters["?profileWantDoMask"] = "0";
579 parameters["?profileAboutText"] = ""; 579 parameters["?profileAboutText"] = String.Empty;
580 parameters["?profileFirstText"] = ""; 580 parameters["?profileFirstText"] = String.Empty;
581 parameters["?profileImage"] = LLUUID.Zero.ToString(); 581 parameters["?profileImage"] = LLUUID.Zero.ToString();
582 parameters["?profileFirstImage"] = LLUUID.Zero.ToString(); 582 parameters["?profileFirstImage"] = LLUUID.Zero.ToString();
583 parameters["?webLoginKey"] = LLUUID.Random().ToString(); 583 parameters["?webLoginKey"] = LLUUID.Random().ToString();
@@ -612,7 +612,7 @@ namespace OpenSim.Framework.Data.MySQL
612 { 612 {
613 bool GRID_ONLY_UPDATE_NECESSARY_DATA = false; 613 bool GRID_ONLY_UPDATE_NECESSARY_DATA = false;
614 614
615 string sql = ""; 615 string sql = String.Empty;
616 if (GRID_ONLY_UPDATE_NECESSARY_DATA) 616 if (GRID_ONLY_UPDATE_NECESSARY_DATA)
617 { 617 {
618 sql += "INSERT INTO "; 618 sql += "INSERT INTO ";
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 76ad551..f637db6 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -347,8 +347,8 @@ namespace OpenSim.Framework.Data.MySQL
347 if (querysplit.Length == 2) 347 if (querysplit.Length == 2)
348 { 348 {
349 Dictionary<string, string> param = new Dictionary<string, string>(); 349 Dictionary<string, string> param = new Dictionary<string, string>();
350 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; 350 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
351 param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], "") + "%"; 351 param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], String.Empty) + "%";
352 try 352 try
353 { 353 {
354 lock (database) 354 lock (database)
@@ -386,7 +386,7 @@ namespace OpenSim.Framework.Data.MySQL
386 lock (database) 386 lock (database)
387 { 387 {
388 Dictionary<string, string> param = new Dictionary<string, string>(); 388 Dictionary<string, string> param = new Dictionary<string, string>();
389 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; 389 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
390 390
391 IDbCommand result = 391 IDbCommand result =
392 database.Query( 392 database.Query(
diff --git a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
index 7024bfa..b33d319 100644
--- a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Framework.Data.MySQL")] 40[assembly : AssemblyProduct("OpenSim.Framework.Data.MySQL")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index 6693c98..5de87c1 100644
--- a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")] 40[assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs
index 9131a41..87d63a5 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Framework.Data.SQLite
98 protected static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) 98 protected static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt)
99 { 99 {
100 string sql = "update " + table + " set "; 100 string sql = "update " + table + " set ";
101 string subsql = ""; 101 string subsql = String.Empty;
102 foreach (DataColumn col in dt.Columns) 102 foreach (DataColumn col in dt.Columns)
103 { 103 {
104 if (subsql.Length > 0) 104 if (subsql.Length > 0)
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Data.SQLite
126 protected static string defineTable(DataTable dt) 126 protected static string defineTable(DataTable dt)
127 { 127 {
128 string sql = "create table " + dt.TableName + "("; 128 string sql = "create table " + dt.TableName + "(";
129 string subsql = ""; 129 string subsql = String.Empty;
130 foreach (DataColumn col in dt.Columns) 130 foreach (DataColumn col in dt.Columns)
131 { 131 {
132 if (subsql.Length > 0) 132 if (subsql.Length > 0)
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
index 33b4111..1fd5c47 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
@@ -1368,7 +1368,7 @@ namespace OpenSim.Framework.Data.SQLite
1368 private SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) 1368 private SqliteCommand createUpdateCommand(string table, string pk, DataTable dt)
1369 { 1369 {
1370 string sql = "update " + table + " set "; 1370 string sql = "update " + table + " set ";
1371 string subsql = ""; 1371 string subsql = String.Empty;
1372 foreach (DataColumn col in dt.Columns) 1372 foreach (DataColumn col in dt.Columns)
1373 { 1373 {
1374 if (subsql.Length > 0) 1374 if (subsql.Length > 0)
@@ -1396,7 +1396,7 @@ namespace OpenSim.Framework.Data.SQLite
1396 private string defineTable(DataTable dt) 1396 private string defineTable(DataTable dt)
1397 { 1397 {
1398 string sql = "create table " + dt.TableName + "("; 1398 string sql = "create table " + dt.TableName + "(";
1399 string subsql = ""; 1399 string subsql = String.Empty;
1400 foreach (DataColumn col in dt.Columns) 1400 foreach (DataColumn col in dt.Columns)
1401 { 1401 {
1402 if (subsql.Length > 0) 1402 if (subsql.Length > 0)
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index c4a874f..7647d02 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -630,7 +630,7 @@ namespace OpenSim.Framework.Data.SQLite
630 { 630 {
631 if (row[col] == null) 631 if (row[col] == null)
632 { 632 {
633 row[col] = ""; 633 row[col] = String.Empty;
634 } 634 }
635 } 635 }
636 } 636 }
@@ -671,7 +671,7 @@ namespace OpenSim.Framework.Data.SQLite
671 { 671 {
672 if (row[col] == null) 672 if (row[col] == null)
673 { 673 {
674 row[col] = ""; 674 row[col] = String.Empty;
675 } 675 }
676 } 676 }
677 } 677 }
diff --git a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
index 51050d1..57cf4cf 100644
--- a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Framework.Data")] 40[assembly : AssemblyProduct("OpenSim.Framework.Data")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Framework/Data/RegionProfileData.cs b/OpenSim/Framework/Data/RegionProfileData.cs
index ec50baa..779e98c 100644
--- a/OpenSim/Framework/Data/RegionProfileData.cs
+++ b/OpenSim/Framework/Data/RegionProfileData.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Data
41 /// <summary> 41 /// <summary>
42 /// The name of the region 42 /// The name of the region
43 /// </summary> 43 /// </summary>
44 public string regionName = ""; 44 public string regionName = String.Empty;
45 45
46 /// <summary> 46 /// <summary>
47 /// A 64-bit number combining map position into a (mostly) unique ID 47 /// A 64-bit number combining map position into a (mostly) unique ID
@@ -65,10 +65,10 @@ namespace OpenSim.Framework.Data
65 /// Authentication secrets 65 /// Authentication secrets
66 /// </summary> 66 /// </summary>
67 /// <remarks>Not very secure, needs improvement.</remarks> 67 /// <remarks>Not very secure, needs improvement.</remarks>
68 public string regionSendKey = ""; 68 public string regionSendKey = String.Empty;
69 69
70 public string regionRecvKey = ""; 70 public string regionRecvKey = String.Empty;
71 public string regionSecret = ""; 71 public string regionSecret = String.Empty;
72 72
73 /// <summary> 73 /// <summary>
74 /// Whether the region is online 74 /// Whether the region is online
@@ -78,14 +78,14 @@ namespace OpenSim.Framework.Data
78 /// <summary> 78 /// <summary>
79 /// Information about the server that the region is currently hosted on 79 /// Information about the server that the region is currently hosted on
80 /// </summary> 80 /// </summary>
81 public string serverIP = ""; 81 public string serverIP = String.Empty;
82 82
83 public uint serverPort; 83 public uint serverPort;
84 public string serverURI = ""; 84 public string serverURI = String.Empty;
85 85
86 public uint httpPort; 86 public uint httpPort;
87 public uint remotingPort; 87 public uint remotingPort;
88 public string httpServerURI = ""; 88 public string httpServerURI = String.Empty;
89 89
90 /// <summary> 90 /// <summary>
91 /// Set of optional overrides. Can be used to create non-eulicidean spaces. 91 /// Set of optional overrides. Can be used to create non-eulicidean spaces.
@@ -100,23 +100,23 @@ namespace OpenSim.Framework.Data
100 /// Optional: URI Location of the region database 100 /// Optional: URI Location of the region database
101 /// </summary> 101 /// </summary>
102 /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks> 102 /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
103 public string regionDataURI = ""; 103 public string regionDataURI = String.Empty;
104 104
105 /// <summary> 105 /// <summary>
106 /// Region Asset Details 106 /// Region Asset Details
107 /// </summary> 107 /// </summary>
108 public string regionAssetURI = ""; 108 public string regionAssetURI = String.Empty;
109 109
110 public string regionAssetSendKey = ""; 110 public string regionAssetSendKey = String.Empty;
111 public string regionAssetRecvKey = ""; 111 public string regionAssetRecvKey = String.Empty;
112 112
113 /// <summary> 113 /// <summary>
114 /// Region Userserver Details 114 /// Region Userserver Details
115 /// </summary> 115 /// </summary>
116 public string regionUserURI = ""; 116 public string regionUserURI = String.Empty;
117 117
118 public string regionUserSendKey = ""; 118 public string regionUserSendKey = String.Empty;
119 public string regionUserRecvKey = ""; 119 public string regionUserRecvKey = String.Empty;
120 120
121 /// <summary> 121 /// <summary>
122 /// Region Map Texture Asset 122 /// Region Map Texture Asset
diff --git a/OpenSim/Framework/Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs
index 285f9ca..187ff32 100644
--- a/OpenSim/Framework/Data/ReservationData.cs
+++ b/OpenSim/Framework/Data/ReservationData.cs
@@ -37,11 +37,11 @@ namespace OpenSim.Framework.Data
37 public int reservationMaxX = 65536; 37 public int reservationMaxX = 65536;
38 public int reservationMaxY = 65536; 38 public int reservationMaxY = 65536;
39 39
40 public string reservationName = ""; 40 public string reservationName = System.String.Empty;
41 public string reservationCompany = ""; 41 public string reservationCompany = System.String.Empty;
42 public bool status = true; 42 public bool status = true;
43 43
44 public string gridSendKey = ""; 44 public string gridSendKey = System.String.Empty;
45 public string gridRecvKey = ""; 45 public string gridRecvKey = System.String.Empty;
46 } 46 }
47} \ No newline at end of file 47} \ No newline at end of file
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index b2bd181..b5a3468 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -756,106 +756,106 @@ namespace OpenSim.Framework
756 756
757 public void loadConfigurationOptions() 757 public void loadConfigurationOptions()
758 { 758 {
759 configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", 759 configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty,
760 "0.0", true); 760 "0.0", true);
761 configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", 761 configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "0",
762 true); 762 true);
763 configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 763 configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
764 "", "0", true); 764 String.Empty, "0", true);
765 configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "40", 765 configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "40",
766 true); 766 true);
767 767
768 configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, 768 configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
769 "", "1.0", true); 769 String.Empty, "1.0", true);
770 configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", 770 configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty,
771 "0", true); 771 "0", true);
772 configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", 772 configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty,
773 "0", true); 773 "0", true);
774 configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", 774 configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty,
775 "0", true); 775 "0", true);
776 configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21", 776 configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "21",
777 true); 777 true);
778 configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", 778 configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0",
779 true); 779 true);
780 configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, 780 configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
781 "", "0", true); 781 String.Empty, "0", true);
782 configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, 782 configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
783 "", "0", true); 783 String.Empty, "0", true);
784 configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", 784 configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty,
785 "false", true); 785 "false", true);
786 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 786 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
787 "", "1", true); 787 String.Empty, "1", true);
788 configMember.addConfigurationOption("region_water_height", 788 configMember.addConfigurationOption("region_water_height",
789 ConfigurationOption.ConfigurationTypes.TYPE_UINT16, "", "20", true); 789 ConfigurationOption.ConfigurationTypes.TYPE_UINT16, String.Empty, "20", true);
790 configMember.addConfigurationOption("region_allow_terraform", 790 configMember.addConfigurationOption("region_allow_terraform",
791 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "true", true); 791 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true);
792 792
793 configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", 793 configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
794 "b8d3965a-ad78-bf43-699b-bff8eca6c975", true); 794 "b8d3965a-ad78-bf43-699b-bff8eca6c975", true);
795 configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", 795 configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
796 "abb783e6-3e93-26c0-248a-247666855da3", true); 796 "abb783e6-3e93-26c0-248a-247666855da3", true);
797 configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", 797 configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
798 "179cdabd-398a-9b6b-1391-4dc333ba321f", true); 798 "179cdabd-398a-9b6b-1391-4dc333ba321f", true);
799 configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", 799 configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
800 "beb169c7-11ea-fff2-efe5-0f24dc881df2", true); 800 "beb169c7-11ea-fff2-efe5-0f24dc881df2", true);
801 801
802 configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 802 configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
803 "", "00000000-0000-0000-0000-000000000000", true); 803 String.Empty, "00000000-0000-0000-0000-000000000000", true);
804 configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 804 configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
805 "", "00000000-0000-0000-0000-000000000000", true); 805 String.Empty, "00000000-0000-0000-0000-000000000000", true);
806 configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 806 configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
807 "", "00000000-0000-0000-0000-000000000000", true); 807 String.Empty, "00000000-0000-0000-0000-000000000000", true);
808 configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 808 configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
809 "", "00000000-0000-0000-0000-000000000000", true); 809 String.Empty, "00000000-0000-0000-0000-000000000000", true);
810 810
811 configMember.addConfigurationOption("terrain_start_height_0", 811 configMember.addConfigurationOption("terrain_start_height_0",
812 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); 812 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
813 configMember.addConfigurationOption("terrain_start_height_1", 813 configMember.addConfigurationOption("terrain_start_height_1",
814 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); 814 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
815 configMember.addConfigurationOption("terrain_start_height_2", 815 configMember.addConfigurationOption("terrain_start_height_2",
816 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); 816 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
817 configMember.addConfigurationOption("terrain_start_height_3", 817 configMember.addConfigurationOption("terrain_start_height_3",
818 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); 818 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
819 819
820 configMember.addConfigurationOption("terrain_height_range_0", 820 configMember.addConfigurationOption("terrain_height_range_0",
821 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); 821 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
822 configMember.addConfigurationOption("terrain_height_range_1", 822 configMember.addConfigurationOption("terrain_height_range_1",
823 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); 823 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
824 configMember.addConfigurationOption("terrain_height_range_2", 824 configMember.addConfigurationOption("terrain_height_range_2",
825 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); 825 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
826 configMember.addConfigurationOption("terrain_height_range_3", 826 configMember.addConfigurationOption("terrain_height_range_3",
827 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); 827 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
828 828
829 configMember.addConfigurationOption("terrain_file", 829 configMember.addConfigurationOption("terrain_file",
830 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "", 830 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, String.Empty,
831 "default.r32", true); 831 "default.r32", true);
832 configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, 832 configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
833 "", "60.0", true); 833 String.Empty, "60.0", true);
834 configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "", 834 configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, String.Empty,
835 "20.0", true); 835 "20.0", true);
836 configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 836 configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
837 "", "00000000-0000-0000-0000-000000000000", true); 837 String.Empty, "00000000-0000-0000-0000-000000000000", true);
838 838
839 configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 839 configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
840 "", "00000000-0000-0000-0000-000000000000", true); 840 String.Empty, "00000000-0000-0000-0000-000000000000", true);
841 configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 841 configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
842 "", "00000000-0000-0000-0000-000000000000", true); 842 String.Empty, "00000000-0000-0000-0000-000000000000", true);
843 configMember.addConfigurationOption("estate_manager_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 843 configMember.addConfigurationOption("estate_manager_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
844 "", "00000000-0000-0000-0000-000000000000", true); 844 String.Empty, "00000000-0000-0000-0000-000000000000", true);
845 configMember.addConfigurationOption("estate_manager_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 845 configMember.addConfigurationOption("estate_manager_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
846 "", "00000000-0000-0000-0000-000000000000", true); 846 String.Empty, "00000000-0000-0000-0000-000000000000", true);
847 configMember.addConfigurationOption("estate_manager_4", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 847 configMember.addConfigurationOption("estate_manager_4", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
848 "", "00000000-0000-0000-0000-000000000000", true); 848 String.Empty, "00000000-0000-0000-0000-000000000000", true);
849 configMember.addConfigurationOption("estate_manager_5", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 849 configMember.addConfigurationOption("estate_manager_5", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
850 "", "00000000-0000-0000-0000-000000000000", true); 850 String.Empty, "00000000-0000-0000-0000-000000000000", true);
851 configMember.addConfigurationOption("estate_manager_6", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 851 configMember.addConfigurationOption("estate_manager_6", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
852 "", "00000000-0000-0000-0000-000000000000", true); 852 String.Empty, "00000000-0000-0000-0000-000000000000", true);
853 configMember.addConfigurationOption("estate_manager_7", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 853 configMember.addConfigurationOption("estate_manager_7", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
854 "", "00000000-0000-0000-0000-000000000000", true); 854 String.Empty, "00000000-0000-0000-0000-000000000000", true);
855 configMember.addConfigurationOption("estate_manager_8", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 855 configMember.addConfigurationOption("estate_manager_8", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
856 "", "00000000-0000-0000-0000-000000000000", true); 856 String.Empty, "00000000-0000-0000-0000-000000000000", true);
857 configMember.addConfigurationOption("estate_manager_9", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 857 configMember.addConfigurationOption("estate_manager_9", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
858 "", "00000000-0000-0000-0000-000000000000", true); 858 String.Empty, "00000000-0000-0000-0000-000000000000", true);
859 859
860 } 860 }
861 861
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index c07adea..61a53d7 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -26,23 +26,25 @@
26* 26*
27*/ 27*/
28 28
29using System;
30
29namespace OpenSim.Framework 31namespace OpenSim.Framework
30{ 32{
31 public class GridConfig 33 public class GridConfig
32 { 34 {
33 public string GridOwner = ""; 35 public string GridOwner = String.Empty;
34 public string DefaultAssetServer = ""; 36 public string DefaultAssetServer = String.Empty;
35 public string AssetSendKey = ""; 37 public string AssetSendKey = String.Empty;
36 public string AssetRecvKey = ""; 38 public string AssetRecvKey = String.Empty;
37 39
38 public string DefaultUserServer = ""; 40 public string DefaultUserServer = String.Empty;
39 public string UserSendKey = ""; 41 public string UserSendKey = String.Empty;
40 public string UserRecvKey = ""; 42 public string UserRecvKey = String.Empty;
41 43
42 public string SimSendKey = ""; 44 public string SimSendKey = String.Empty;
43 public string SimRecvKey = ""; 45 public string SimRecvKey = String.Empty;
44 46
45 public string DatabaseProvider = ""; 47 public string DatabaseProvider = String.Empty;
46 48
47 49
48 public static uint DefaultHttpPort = 8001; 50 public static uint DefaultHttpPort = 8001;
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 28cd552..108e7ff 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -33,12 +33,12 @@ namespace OpenSim.Framework
33 /// </summary> 33 /// </summary>
34 public class InventoryConfig 34 public class InventoryConfig
35 { 35 {
36 public string DefaultStartupMsg = ""; 36 public string DefaultStartupMsg = System.String.Empty;
37 public string UserServerURL = ""; 37 public string UserServerURL = System.String.Empty;
38 public string UserSendKey = ""; 38 public string UserSendKey = System.String.Empty;
39 public string UserRecvKey = ""; 39 public string UserRecvKey = System.String.Empty;
40 40
41 public string DatabaseProvider = ""; 41 public string DatabaseProvider = System.String.Empty;
42 public static uint DefaultHttpPort = 8004; 42 public static uint DefaultHttpPort = 8004;
43 43
44 public uint HttpPort = DefaultHttpPort; 44 public uint HttpPort = DefaultHttpPort;
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 885545d..bb99b27 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -26,6 +26,7 @@
26* 26*
27*/ 27*/
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System;
29using libsecondlife; 30using libsecondlife;
30 31
31namespace OpenSim.Framework 32namespace OpenSim.Framework
@@ -34,7 +35,7 @@ namespace OpenSim.Framework
34 { 35 {
35 public byte[] landBitmapByteArray = new byte[512]; 36 public byte[] landBitmapByteArray = new byte[512];
36 public string landName = "Your Parcel"; 37 public string landName = "Your Parcel";
37 public string landDesc = ""; 38 public string landDesc = String.Empty;
38 public LLUUID ownerID = LLUUID.Zero; 39 public LLUUID ownerID = LLUUID.Zero;
39 public bool isGroupOwned = false; 40 public bool isGroupOwned = false;
40 public LLVector3 AABBMin = new LLVector3(); 41 public LLVector3 AABBMin = new LLVector3();
@@ -67,8 +68,8 @@ namespace OpenSim.Framework
67 public int localID = 0; 68 public int localID = 0;
68 public LLUUID globalID = LLUUID.Zero; 69 public LLUUID globalID = LLUUID.Zero;
69 70
70 public string mediaURL = ""; 71 public string mediaURL = String.Empty;
71 public string musicURL = ""; 72 public string musicURL = String.Empty;
72 public float passHours = 0; 73 public float passHours = 0;
73 public int passPrice = 0; 74 public int passPrice = 0;
74 public LLUUID snapshotID = LLUUID.Zero; 75 public LLUUID snapshotID = LLUUID.Zero;
diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs
index 5228fe9..7021194 100644
--- a/OpenSim/Framework/Login.cs
+++ b/OpenSim/Framework/Login.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework
39 public LLUUID InventoryFolder; 39 public LLUUID InventoryFolder;
40 public LLUUID BaseFolder; 40 public LLUUID BaseFolder;
41 public uint CircuitCode; 41 public uint CircuitCode;
42 public string CapsPath = ""; 42 public string CapsPath = System.String.Empty;
43 public LLVector3 StartPos; 43 public LLVector3 StartPos;
44 44
45 public Login() 45 public Login()
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 5cef362..ccb6e7a 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -36,17 +36,17 @@ namespace OpenSim.Framework
36 /// </summary> 36 /// </summary>
37 public class MessageServerConfig 37 public class MessageServerConfig
38 { 38 {
39 public string DefaultStartupMsg = ""; 39 public string DefaultStartupMsg = String.Empty;
40 public string UserServerURL = ""; 40 public string UserServerURL = String.Empty;
41 public string UserSendKey = ""; 41 public string UserSendKey = String.Empty;
42 public string UserRecvKey = ""; 42 public string UserRecvKey = String.Empty;
43 43
44 public string GridServerURL = ""; 44 public string GridServerURL = String.Empty;
45 public string GridSendKey = ""; 45 public string GridSendKey = String.Empty;
46 public string GridRecvKey = ""; 46 public string GridRecvKey = String.Empty;
47 47
48 public string DatabaseProvider = ""; 48 public string DatabaseProvider = String.Empty;
49 public string GridCommsProvider = ""; 49 public string GridCommsProvider = String.Empty;
50 50
51 public static uint DefaultHttpPort = 8006; 51 public static uint DefaultHttpPort = 8006;
52 public static bool DefaultHttpSSL = false; 52 public static bool DefaultHttpSSL = false;
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index cf1457d..c67a6bf 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -27,23 +27,24 @@
27*/ 27*/
28 28
29using Nini.Config; 29using Nini.Config;
30using System;
30 31
31namespace OpenSim.Framework 32namespace OpenSim.Framework
32{ 33{
33 public class NetworkServersInfo 34 public class NetworkServersInfo
34 { 35 {
35 public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/"; 36 public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
36 public string AssetSendKey = ""; 37 public string AssetSendKey = String.Empty;
37 38
38 public string GridURL = ""; 39 public string GridURL = String.Empty;
39 public string GridSendKey = ""; 40 public string GridSendKey = String.Empty;
40 public string GridRecvKey = ""; 41 public string GridRecvKey = String.Empty;
41 public string UserURL = ""; 42 public string UserURL = String.Empty;
42 public string UserSendKey = ""; 43 public string UserSendKey = String.Empty;
43 public string UserRecvKey = ""; 44 public string UserRecvKey = String.Empty;
44 public bool isSandbox; 45 public bool isSandbox;
45 46
46 public string InventoryURL = ""; 47 public string InventoryURL = String.Empty;
47 48
48 public static uint DefaultHttpListenerPort = 9000; 49 public static uint DefaultHttpListenerPort = 9000;
49 public uint HttpListenerPort = DefaultHttpListenerPort; 50 public uint HttpListenerPort = DefaultHttpListenerPort;
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 9472a9e..1db5aae 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -27,6 +27,7 @@
27*/ 27*/
28 28
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System;
30using libsecondlife; 31using libsecondlife;
31 32
32namespace OpenSim.Framework 33namespace OpenSim.Framework
@@ -46,7 +47,7 @@ namespace OpenSim.Framework
46 public event ChildAgentUpdate OnChildAgentUpdate; 47 public event ChildAgentUpdate OnChildAgentUpdate;
47 48
48 49
49 public string debugRegionName = ""; 50 public string debugRegionName = String.Empty;
50 51
51 52
52 /// <summary> 53 /// <summary>
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 3c4fcba..8d4e905 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -157,17 +157,17 @@ namespace OpenSim.Framework
157 157
158 public class RegionInfo : SimpleRegionInfo 158 public class RegionInfo : SimpleRegionInfo
159 { 159 {
160 public string RegionName = ""; 160 public string RegionName = String.Empty;
161 161
162 public string DataStore = ""; 162 public string DataStore = String.Empty;
163 public bool isSandbox = false; 163 public bool isSandbox = false;
164 public bool commFailTF = false; 164 public bool commFailTF = false;
165 165
166 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; 166 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero;
167 public LLUUID CovenantID = LLUUID.Zero; 167 public LLUUID CovenantID = LLUUID.Zero;
168 public string MasterAvatarFirstName = ""; 168 public string MasterAvatarFirstName = String.Empty;
169 public string MasterAvatarLastName = ""; 169 public string MasterAvatarLastName = String.Empty;
170 public string MasterAvatarSandboxPassword = ""; 170 public string MasterAvatarSandboxPassword = String.Empty;
171 171
172 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 172 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
173 private static EstateSettings m_estateSettings; 173 private static EstateSettings m_estateSettings;
@@ -241,7 +241,7 @@ namespace OpenSim.Framework
241 //not in use, should swap to nini though. 241 //not in use, should swap to nini though.
242 public void LoadFromNiniSource(IConfigSource source, string sectionName) 242 public void LoadFromNiniSource(IConfigSource source, string sectionName)
243 { 243 {
244 string errorMessage = ""; 244 string errorMessage = String.Empty;
245 RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString())); 245 RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString()));
246 RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); 246 RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
247 m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); 247 m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
@@ -275,7 +275,7 @@ namespace OpenSim.Framework
275 MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User"); 275 MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User");
276 MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test"); 276 MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test");
277 277
278 if (errorMessage != "") 278 if (errorMessage != String.Empty)
279 { 279 {
280 // a error 280 // a error
281 } 281 }
@@ -384,7 +384,7 @@ namespace OpenSim.Framework
384 break; 384 break;
385 case "master_avatar_pass": 385 case "master_avatar_pass":
386 string tempMD5Passwd = (string) configuration_result; 386 string tempMD5Passwd = (string) configuration_result;
387 MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); 387 MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
388 break; 388 break;
389 } 389 }
390 390
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 80acbae..8a1a038 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -52,8 +52,8 @@ namespace OpenSim.Framework.RegionLoader.Web
52 else 52 else
53 { 53 {
54 IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; 54 IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"];
55 string url = startupConfig.GetString("regionload_webserver_url", "").Trim(); 55 string url = startupConfig.GetString("regionload_webserver_url", System.String.Empty).Trim();
56 if (url == "") 56 if (url == System.String.Empty)
57 { 57 {
58 MainLog.Instance.Error("WEBLOADER", "Unable to load webserver URL - URL was empty."); 58 MainLog.Instance.Error("WEBLOADER", "Unable to load webserver URL - URL was empty.");
59 return null; 59 return null;
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.RegionLoader.Web
66 HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); 66 HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
67 MainLog.Instance.Debug("WEBLOADER", "Downloading Region Information From Remote Server..."); 67 MainLog.Instance.Debug("WEBLOADER", "Downloading Region Information From Remote Server...");
68 StreamReader reader = new StreamReader(webResponse.GetResponseStream()); 68 StreamReader reader = new StreamReader(webResponse.GetResponseStream());
69 string xmlSource = ""; 69 string xmlSource = System.String.Empty;
70 string tempStr = reader.ReadLine(); 70 string tempStr = reader.ReadLine();
71 while (tempStr != null) 71 while (tempStr != null)
72 { 72 {
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 78554c3..df3b049 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -382,7 +382,7 @@ namespace OpenSim.Framework.Servers
382 382
383 Hashtable keysvals = new Hashtable(); 383 Hashtable keysvals = new Hashtable();
384 Hashtable headervals = new Hashtable(); 384 Hashtable headervals = new Hashtable();
385 string host = ""; 385 string host = String.Empty;
386 386
387 string[] querystringkeys = request.QueryString.AllKeys; 387 string[] querystringkeys = request.QueryString.AllKeys;
388 string[] rHeaders = request.Headers.AllKeys; 388 string[] rHeaders = request.Headers.AllKeys;
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 196e096..107993b 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -27,6 +27,7 @@
27*/ 27*/
28 28
29using libsecondlife; 29using libsecondlife;
30using System;
30 31
31namespace OpenSim.Framework 32namespace OpenSim.Framework
32{ 33{
@@ -44,16 +45,16 @@ namespace OpenSim.Framework
44 { 45 {
45 "texture", 46 "texture",
46 "sound", 47 "sound",
47 "", 48 String.Empty,
48 "", 49 String.Empty,
49 "", 50 String.Empty,
50 "", 51 String.Empty,
51 "", 52 String.Empty,
52 "", 53 String.Empty,
53 "", 54 String.Empty,
54 "", 55 String.Empty,
55 "lsl_text", 56 "lsl_text",
56 "" 57 String.Empty
57 }; 58 };
58 59
59 /// <summary> 60 /// <summary>
@@ -63,16 +64,16 @@ namespace OpenSim.Framework
63 { 64 {
64 "texture", 65 "texture",
65 "sound", 66 "sound",
66 "", 67 String.Empty,
67 "", 68 String.Empty,
68 "", 69 String.Empty,
69 "", 70 String.Empty,
70 "", 71 String.Empty,
71 "", 72 String.Empty,
72 "", 73 String.Empty,
73 "", 74 String.Empty,
74 "lsltext", 75 "lsltext",
75 "" 76 String.Empty
76 }; 77 };
77 78
78 public LLUUID item_id = LLUUID.Zero; 79 public LLUUID item_id = LLUUID.Zero;
@@ -92,8 +93,8 @@ namespace OpenSim.Framework
92 public int type = 0; 93 public int type = 0;
93 public int inv_type = 0; 94 public int inv_type = 0;
94 public uint flags = 0; 95 public uint flags = 0;
95 public string name = ""; 96 public string name = String.Empty;
96 public string desc = ""; 97 public string desc = String.Empty;
97 public uint creation_date = 0; 98 public uint creation_date = 0;
98 99
99 public LLUUID ParentPartID = LLUUID.Zero; 100 public LLUUID ParentPartID = LLUUID.Zero;
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index c9957ef..a4b8a5d 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -26,6 +26,8 @@
26* 26*
27*/ 27*/
28 28
29using System;
30
29namespace OpenSim.Framework 31namespace OpenSim.Framework
30{ 32{
31 /// <summary> 33 /// <summary>
@@ -33,14 +35,14 @@ namespace OpenSim.Framework
33 /// </summary> 35 /// </summary>
34 public class UserConfig 36 public class UserConfig
35 { 37 {
36 public string DefaultStartupMsg = ""; 38 public string DefaultStartupMsg = String.Empty;
37 public string GridServerURL = ""; 39 public string GridServerURL = String.Empty;
38 public string GridSendKey = ""; 40 public string GridSendKey = String.Empty;
39 public string GridRecvKey = ""; 41 public string GridRecvKey = String.Empty;
40 42
41 public string InventoryUrl = ""; 43 public string InventoryUrl = String.Empty;
42 44
43 public string DatabaseProvider = ""; 45 public string DatabaseProvider = String.Empty;
44 46
45 public static uint DefaultHttpPort = 8002; 47 public static uint DefaultHttpPort = 8002;
46 public static bool DefaultHttpSSL = false; 48 public static bool DefaultHttpSSL = false;
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index f80350e..191205b 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -356,7 +356,7 @@ namespace OpenSim.Framework
356 { 356 {
357 return capsURLS[userID]; 357 return capsURLS[userID];
358 } 358 }
359 return ""; 359 return String.Empty;
360 } 360 }
361 361
362 public static void SetCapsURL(LLUUID userID, string url) 362 public static void SetCapsURL(LLUUID userID, string url)
diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index d598094..7c659dd 100644
--- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OGS-AssetServer")] 39[assembly : AssemblyProduct("OGS-AssetServer")]
40[assembly : AssemblyCopyright("Copyright © 2007")] 40[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 1e21d9e..b4b91bb 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -194,7 +194,7 @@ namespace OpenSim.Grid.GridServer
194 /// <returns>An XML string containing neighbour entities</returns> 194 /// <returns>An XML string containing neighbour entities</returns>
195 public string GetXMLNeighbours(ulong reqhandle) 195 public string GetXMLNeighbours(ulong reqhandle)
196 { 196 {
197 string response = ""; 197 string response = String.Empty;
198 RegionProfileData central_region = getRegion(reqhandle); 198 RegionProfileData central_region = getRegion(reqhandle);
199 RegionProfileData neighbour; 199 RegionProfileData neighbour;
200 for (int x = -1; x < 2; x++) 200 for (int x = -1; x < 2; x++)
@@ -241,7 +241,7 @@ namespace OpenSim.Grid.GridServer
241 { 241 {
242 TheSim = getRegion(new LLUUID((string)requestData["UUID"])); 242 TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
243 243
244 // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); 244 // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod",String.Empty, 5,"Region attempting login with UUID.");
245 } 245 }
246 else 246 else
247 { 247 {
@@ -615,7 +615,7 @@ namespace OpenSim.Grid.GridServer
615 /// <returns></returns> 615 /// <returns></returns>
616 public string RestGetRegionMethod(string request, string path, string param) 616 public string RestGetRegionMethod(string request, string path, string param)
617 { 617 {
618 return RestGetSimMethod("", "/sims/", param); 618 return RestGetSimMethod(String.Empty, "/sims/", param);
619 } 619 }
620 620
621 /// <summary> 621 /// <summary>
@@ -627,7 +627,7 @@ namespace OpenSim.Grid.GridServer
627 /// <returns></returns> 627 /// <returns></returns>
628 public string RestSetRegionMethod(string request, string path, string param) 628 public string RestSetRegionMethod(string request, string path, string param)
629 { 629 {
630 return RestSetSimMethod("", "/sims/", param); 630 return RestSetSimMethod(String.Empty, "/sims/", param);
631 } 631 }
632 632
633 /// <summary> 633 /// <summary>
@@ -704,7 +704,7 @@ namespace OpenSim.Grid.GridServer
704 TheSim.regionRecvKey = config.SimRecvKey; 704 TheSim.regionRecvKey = config.SimRecvKey;
705 TheSim.regionSendKey = config.SimSendKey; 705 TheSim.regionSendKey = config.SimSendKey;
706 TheSim.regionSecret = config.SimRecvKey; 706 TheSim.regionSecret = config.SimRecvKey;
707 TheSim.regionDataURI = ""; 707 TheSim.regionDataURI = String.Empty;
708 TheSim.regionAssetURI = config.DefaultAssetServer; 708 TheSim.regionAssetURI = config.DefaultAssetServer;
709 TheSim.regionAssetRecvKey = config.AssetRecvKey; 709 TheSim.regionAssetRecvKey = config.AssetRecvKey;
710 TheSim.regionAssetSendKey = config.AssetSendKey; 710 TheSim.regionAssetSendKey = config.AssetSendKey;
@@ -776,7 +776,7 @@ namespace OpenSim.Grid.GridServer
776 { 776 {
777 kvp.Value.AddProfile(TheSim); 777 kvp.Value.AddProfile(TheSim);
778 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); 778 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")");
779 logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", "", 5, 779 logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", String.Empty, 5,
780 "Region successfully updated and connected to grid."); 780 "Region successfully updated and connected to grid.");
781 } 781 }
782 else 782 else
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 6bb4c75..d4947b3 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Grid.GridServer
149 /* 149 /*
150 foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values) 150 foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values)
151 { 151 {
152 string SimResponse = ""; 152 string SimResponse = String.Empty;
153 try 153 try
154 { 154 {
155 WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/"); 155 WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/");
@@ -158,7 +158,7 @@ namespace OpenSim.Grid.GridServer
158 CheckSim.ContentLength = 0; 158 CheckSim.ContentLength = 0;
159 159
160 StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII); 160 StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII);
161 stOut.Write(""); 161 stOut.Write(String.Empty);
162 stOut.Close(); 162 stOut.Close();
163 163
164 StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream()); 164 StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream());
@@ -204,9 +204,9 @@ namespace OpenSim.Grid.GridServer
204 { 204 {
205 try 205 try
206 { 206 {
207 string attri = ""; 207 string attri = String.Empty;
208 attri = configData.GetAttribute("DataBaseProvider"); 208 attri = configData.GetAttribute("DataBaseProvider");
209 if (attri == "") 209 if (attri == String.Empty)
210 { 210 {
211 GridDll = "OpenSim.Framework.Data.DB4o.dll"; 211 GridDll = "OpenSim.Framework.Data.DB4o.dll";
212 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); 212 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
index 6f837e6..df06c90 100644
--- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OGS-GridServer")] 39[assembly : AssemblyProduct("OGS-GridServer")]
40[assembly : AssemblyCopyright("Copyright © 2007")] 40[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
index fdc5d10..5470d32 100644
--- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs
+++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Grid.MessagingServer
39 { 39 {
40 public AgentCircuitData agentData = new AgentCircuitData(); 40 public AgentCircuitData agentData = new AgentCircuitData();
41 public RegionProfileData regionData = new RegionProfileData(); 41 public RegionProfileData regionData = new RegionProfileData();
42 public string httpURI = ""; 42 public string httpURI = String.Empty;
43 public List<FriendListItem> friendData = new List<FriendListItem> (); 43 public List<FriendListItem> friendData = new List<FriendListItem> ();
44 public List<LLUUID> subscriptionData = new List<LLUUID>(); 44 public List<LLUUID> subscriptionData = new List<LLUUID>();
45 45
diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs
index 70dfcd3..5857101 100644
--- a/OpenSim/Grid/ScriptServer/Application.cs
+++ b/OpenSim/Grid/ScriptServer/Application.cs
@@ -47,9 +47,9 @@ namespace OpenSim.Grid.ScriptServer
47 47
48 private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) 48 private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
49 { 49 {
50 Console.WriteLine(""); 50 Console.WriteLine(String.Empty);
51 Console.WriteLine("APPLICATION EXCEPTION DETECTED"); 51 Console.WriteLine("APPLICATION EXCEPTION DETECTED");
52 Console.WriteLine(""); 52 Console.WriteLine(String.Empty);
53 Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString()); 53 Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString());
54 //Console.WriteLine("Exception:"); 54 //Console.WriteLine("Exception:");
55 //Console.WriteLine(e.ExceptionObject.ToString()); 55 //Console.WriteLine(e.ExceptionObject.ToString());
diff --git a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
index 2886ec7..539d55a 100644
--- a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Grid.ScriptServer")] 40[assembly : AssemblyProduct("OpenSim.Grid.ScriptServer")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
index aefaa10..c9c0fb0 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
87 //} 87 //}
88 //catch (Exception e) 88 //catch (Exception e)
89 //{ 89 //{
90 // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString()); 90 // m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString());
91 //} 91 //}
92 92
93 93
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
104 //} 104 //}
105 //catch (Exception e) 105 //catch (Exception e)
106 //{ 106 //{
107 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 107 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
108 //} 108 //}
109 109
110 ScriptServerInterfaces.ScriptEngine ret; 110 ScriptServerInterfaces.ScriptEngine ret;
@@ -114,7 +114,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
114 //} 114 //}
115 //catch (Exception e) 115 //catch (Exception e)
116 //{ 116 //{
117 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 117 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
118 //} 118 //}
119 119
120 return ret; 120 return ret;
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index f40c6f6..00a1641 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Grid.UserServer
147 regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X")); 147 regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X"));
148 regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y")); 148 regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y"));
149 149
150 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); 150 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
151 151
152 LLUUID userID = new LLUUID(); 152 LLUUID userID = new LLUUID();
153 try 153 try
@@ -220,9 +220,9 @@ namespace OpenSim.Grid.UserServer
220 { 220 {
221 try 221 try
222 { 222 {
223 string attri = ""; 223 string attri = String.Empty;
224 attri = configData.GetAttribute("DataBaseProvider"); 224 attri = configData.GetAttribute("DataBaseProvider");
225 if (attri == "") 225 if (attri == String.Empty)
226 { 226 {
227 StorageDll = "OpenSim.Framework.Data.DB4o.dll"; 227 StorageDll = "OpenSim.Framework.Data.DB4o.dll";
228 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); 228 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
diff --git a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
index 079e05e..06d4a0e 100644
--- a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OGS-UserServer")] 40[assembly : AssemblyProduct("OGS-UserServer")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index ca1e9c9..d253775 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -45,7 +45,7 @@ namespace OpenSim
45 45
46 46
47 Console.Write("Performing compatibility checks... "); 47 Console.Write("Performing compatibility checks... ");
48 string supported = ""; 48 string supported = String.Empty;
49 if (Util.IsEnvironmentSupported(ref supported)) 49 if (Util.IsEnvironmentSupported(ref supported))
50 { 50 {
51 Console.WriteLine(" Environment is compatible.\n"); 51 Console.WriteLine(" Environment is compatible.\n");
@@ -90,7 +90,7 @@ namespace OpenSim
90 // TODO: Add config option to allow users to turn off error reporting 90 // TODO: Add config option to allow users to turn off error reporting
91 // TODO: Post error report (disabled for now) 91 // TODO: Post error report (disabled for now)
92 92
93 string msg = ""; 93 string msg = String.Empty;
94 msg += "\r\n"; 94 msg += "\r\n";
95 msg += "APPLICATION EXCEPTION DETECTED: " + e.ToString() + "\r\n"; 95 msg += "APPLICATION EXCEPTION DETECTED: " + e.ToString() + "\r\n";
96 msg += "\r\n"; 96 msg += "\r\n";
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7249322..7d83df7 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -172,8 +172,8 @@ namespace OpenSim
172 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); 172 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); 173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
174 config.Set("storage_prim_inventories_experimental", false); 174 config.Set("storage_prim_inventories_experimental", false);
175 config.Set("startup_console_commands_file", ""); 175 config.Set("startup_console_commands_file", String.Empty);
176 config.Set("shutdown_console_commands_file", ""); 176 config.Set("shutdown_console_commands_file", String.Empty);
177 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 177 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
178 config.Set("asset_database", "sqlite"); 178 config.Set("asset_database", "sqlite");
179 } 179 }
@@ -252,8 +252,8 @@ namespace OpenSim
252 m_storagePersistPrimInventories 252 m_storagePersistPrimInventories
253 = startupConfig.GetBoolean("storage_prim_inventories_experimental", false); 253 = startupConfig.GetBoolean("storage_prim_inventories_experimental", false);
254 254
255 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); 255 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty);
256 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); 256 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
257 257
258 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 258 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
259 259
@@ -374,7 +374,7 @@ namespace OpenSim
374 // } 374 // }
375 375
376 //Run Startup Commands 376 //Run Startup Commands
377 if (m_startupCommandsFile != "") 377 if (m_startupCommandsFile != String.Empty)
378 { 378 {
379 RunCommandScript(m_startupCommandsFile); 379 RunCommandScript(m_startupCommandsFile);
380 } 380 }
@@ -421,7 +421,7 @@ namespace OpenSim
421 SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll"); 421 SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll");
422 sqlAssetServer.LoadDefaultAssets(); 422 sqlAssetServer.LoadDefaultAssets();
423 assetServer = sqlAssetServer; 423 assetServer = sqlAssetServer;
424 //assetServer = new GridAssetClient(""); 424 //assetServer = new GridAssetClient(String.Empty);
425 } 425 }
426 else 426 else
427 { 427 {
@@ -585,7 +585,7 @@ namespace OpenSim
585 /// </summary> 585 /// </summary>
586 public virtual void Shutdown() 586 public virtual void Shutdown()
587 { 587 {
588 if (m_startupCommandsFile != "") 588 if (m_startupCommandsFile != String.Empty)
589 { 589 {
590 RunCommandScript(m_shutdownCommandsFile); 590 RunCommandScript(m_shutdownCommandsFile);
591 } 591 }
@@ -622,10 +622,10 @@ namespace OpenSim
622 if (File.Exists(fileName)) 622 if (File.Exists(fileName))
623 { 623 {
624 StreamReader readFile = File.OpenText(fileName); 624 StreamReader readFile = File.OpenText(fileName);
625 string currentCommand = ""; 625 string currentCommand = String.Empty;
626 while ((currentCommand = readFile.ReadLine()) != null) 626 while ((currentCommand = readFile.ReadLine()) != null)
627 { 627 {
628 if (currentCommand != "") 628 if (currentCommand != String.Empty)
629 { 629 {
630 MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'"); 630 MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'");
631 MainLog.Instance.MainLogRunCommand(currentCommand); 631 MainLog.Instance.MainLogRunCommand(currentCommand);
@@ -645,7 +645,7 @@ namespace OpenSim
645 /// <param name="cmdparams">Additional arguments passed to the command</param> 645 /// <param name="cmdparams">Additional arguments passed to the command</param>
646 public void RunCmd(string command, string[] cmdparams) 646 public void RunCmd(string command, string[] cmdparams)
647 { 647 {
648 string result = ""; 648 string result = String.Empty;
649 649
650 switch (command) 650 switch (command)
651 { 651 {
@@ -982,7 +982,7 @@ namespace OpenSim
982 982
983 private string CombineParams(string[] commandParams, int pos) 983 private string CombineParams(string[] commandParams, int pos)
984 { 984 {
985 string result = ""; 985 string result = String.Empty;
986 for (int i = pos; i < commandParams.Length; i++) 986 for (int i = pos; i < commandParams.Length; i++)
987 { 987 {
988 result += commandParams[i] + " "; 988 result += commandParams[i] + " ";
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index c937fab..d3a8254 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -343,7 +343,7 @@ namespace OpenSim.Region.ClientStack
343 { 343 {
344 if (m_debug > 0) 344 if (m_debug > 0)
345 { 345 {
346 string info = ""; 346 string info = String.Empty;
347 if (m_debug < 255 && packet.Type == PacketType.AgentUpdate) 347 if (m_debug < 255 && packet.Type == PacketType.AgentUpdate)
348 return; 348 return;
349 if (m_debug < 254 && packet.Type == PacketType.ViewerEffect) 349 if (m_debug < 254 && packet.Type == PacketType.ViewerEffect)
@@ -783,7 +783,7 @@ namespace OpenSim.Region.ClientStack
783 agentData.child = false; 783 agentData.child = false;
784 agentData.firstname = m_firstName; 784 agentData.firstname = m_firstName;
785 agentData.lastname = m_lastName; 785 agentData.lastname = m_lastName;
786 agentData.CapsPath = ""; 786 agentData.CapsPath = String.Empty;
787 return agentData; 787 return agentData;
788 } 788 }
789 789
@@ -2521,7 +2521,7 @@ namespace OpenSim.Region.ClientStack
2521 case PacketType.ChatFromViewer: 2521 case PacketType.ChatFromViewer:
2522 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; 2522 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
2523 2523
2524 string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname; 2524 string fromName = String.Empty; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
2525 byte[] message = inchatpack.ChatData.Message; 2525 byte[] message = inchatpack.ChatData.Message;
2526 byte type = inchatpack.ChatData.Type; 2526 byte type = inchatpack.ChatData.Type;
2527 LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; 2527 LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 4dec884..8cba6fd 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Communications.Local
45 45
46 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); 46 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
47 47
48 public string _gdebugRegionName = ""; 48 public string _gdebugRegionName = System.String.Empty;
49 49
50 public string gdebugRegionName 50 public string gdebugRegionName
51 { 51 {
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Communications.Local
53 set { _gdebugRegionName = value; } 53 set { _gdebugRegionName = value; }
54 } 54 }
55 55
56 public string _rdebugRegionName = ""; 56 public string _rdebugRegionName = System.String.Empty;
57 57
58 public string rdebugRegionName 58 public string rdebugRegionName
59 { 59 {
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 6269565..e02a600 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.Local
55 55
56 public override UserProfileData SetupMasterUser(string firstName, string lastName) 56 public override UserProfileData SetupMasterUser(string firstName, string lastName)
57 { 57 {
58 return SetupMasterUser(firstName, lastName, ""); 58 return SetupMasterUser(firstName, lastName, String.Empty);
59 } 59 }
60 60
61 public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) 61 public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index 481577e..1f73d1a 100644
--- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Region.Communications.Local")] 40[assembly : AssemblyProduct("OpenSim.Region.Communications.Local")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index e1d29bc..e3d10b5 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.OGS1
55 public BaseHttpServer httpListener; 55 public BaseHttpServer httpListener;
56 public NetworkServersInfo serversInfo; 56 public NetworkServersInfo serversInfo;
57 public BaseHttpServer httpServer; 57 public BaseHttpServer httpServer;
58 public string _gdebugRegionName = ""; 58 public string _gdebugRegionName = String.Empty;
59 59
60 public string gdebugRegionName 60 public string gdebugRegionName
61 { 61 {
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Communications.OGS1
63 set { _gdebugRegionName = value; } 63 set { _gdebugRegionName = value; }
64 } 64 }
65 65
66 public string _rdebugRegionName = ""; 66 public string _rdebugRegionName = String.Empty;
67 67
68 public string rdebugRegionName 68 public string rdebugRegionName
69 { 69 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index e645074..36ab4bb 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Communications.OGS1
144 { 144 {
145 Hashtable param = new Hashtable(); 145 Hashtable param = new Hashtable();
146 param["queryid"] = (string) queryID.ToString(); 146 param["queryid"] = (string) queryID.ToString();
147 param["avquery"] = objAlphaNumericPattern.Replace(query, ""); 147 param["avquery"] = objAlphaNumericPattern.Replace(query, String.Empty);
148 IList parameters = new ArrayList(); 148 IList parameters = new ArrayList();
149 parameters.Add(param); 149 parameters.Add(param);
150 XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters); 150 XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters);
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Communications.OGS1
212 212
213 public UserProfileData SetupMasterUser(string firstName, string lastName) 213 public UserProfileData SetupMasterUser(string firstName, string lastName)
214 { 214 {
215 return SetupMasterUser(firstName, lastName, ""); 215 return SetupMasterUser(firstName, lastName, String.Empty);
216 } 216 }
217 217
218 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 218 public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 631cfd0..2aa5739 100644
--- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenGrid.Framework.Communications.OGS1")] 40[assembly : AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index 1b7e2a4..66c9fd5 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Environment.Modules
87 string bornOn = "Before now"; 87 string bornOn = "Before now";
88 string flAbout = "First life? What is one of those? OpenSim is my life!"; 88 string flAbout = "First life? What is one of those? OpenSim is my life!";
89 LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000"); 89 LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
90 remoteClient.SendAvatarProperties(avatarID, about, bornOn, "", flAbout, 0, LLUUID.Zero, LLUUID.Zero, "", 90 remoteClient.SendAvatarProperties(avatarID, about, bornOn, System.String.Empty, flAbout, 0, LLUUID.Zero, LLUUID.Zero, System.String.Empty,
91 partner); 91 partner);
92 } 92 }
93 } 93 }
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 481ba3f..76c6a53 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -331,7 +331,7 @@ namespace OpenSim.Region.Environment.Modules
331 m_ChannelKey = channelKey; 331 m_ChannelKey = channelKey;
332 m_MessageID = LLUUID.Random(); 332 m_MessageID = LLUUID.Random();
333 m_processed = false; 333 m_processed = false;
334 m_resp = ""; 334 m_resp = String.Empty;
335 } 335 }
336 336
337 public bool IsProcessed() 337 public bool IsProcessed()
diff --git a/OpenSim/Region/Environment/Modules/XferModule.cs b/OpenSim/Region/Environment/Modules/XferModule.cs
index 807b46c..f8da9af 100644
--- a/OpenSim/Region/Environment/Modules/XferModule.cs
+++ b/OpenSim/Region/Environment/Modules/XferModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules
131 public class XferDownLoad 131 public class XferDownLoad
132 { 132 {
133 public byte[] Data = new byte[0]; 133 public byte[] Data = new byte[0];
134 public string FileName = ""; 134 public string FileName = String.Empty;
135 public ulong XferID = 0; 135 public ulong XferID = 0;
136 public int DataPointer = 0; 136 public int DataPointer = 0;
137 public uint Packet = 0; 137 public uint Packet = 0;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index db3da48..31bd0b3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -376,7 +376,7 @@ namespace OpenSim.Region.Environment.Scenes
376 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID); 376 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
377 if (item != null) 377 if (item != null)
378 { 378 {
379 if (newName != "") 379 if (newName != System.String.Empty)
380 { 380 {
381 item.inventoryName = newName; 381 item.inventoryName = newName;
382 } 382 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 575fe01..43486e8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Environment.Scenes
389 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed); 389 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);
390 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes"); 390 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes");
391 m_restartTimer.Start(); 391 m_restartTimer.Start();
392 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in 2 Minutes"); 392 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes");
393 //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes"); 393 //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes");
394 } 394 }
395 } 395 }
@@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Scenes
404 if (m_RestartTimerCounter <= m_incrementsof15seconds) 404 if (m_RestartTimerCounter <= m_incrementsof15seconds)
405 { 405 {
406 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7) 406 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7)
407 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in " + 407 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in " +
408 ((8 - m_RestartTimerCounter) * 15) + " seconds"); 408 ((8 - m_RestartTimerCounter) * 15) + " seconds");
409 409
410 // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) + 410 // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) +
@@ -1408,7 +1408,7 @@ namespace OpenSim.Region.Environment.Scenes
1408 { 1408 {
1409 if (regionHandle == m_regInfo.RegionHandle) 1409 if (regionHandle == m_regInfo.RegionHandle)
1410 { 1410 {
1411 if (agent.CapsPath != "") 1411 if (agent.CapsPath != String.Empty)
1412 { 1412 {
1413 Caps cap = 1413 Caps cap =
1414 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, 1414 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port,
@@ -2004,7 +2004,7 @@ namespace OpenSim.Region.Environment.Scenes
2004 2004
2005 private string CombineParams(string[] commandParams, int pos) 2005 private string CombineParams(string[] commandParams, int pos)
2006 { 2006 {
2007 string result = ""; 2007 string result = String.Empty;
2008 for (int i = pos; i < commandParams.Length; i++) 2008 for (int i = pos; i < commandParams.Length; i++)
2009 { 2009 {
2010 result += commandParams[i] + " "; 2010 result += commandParams[i] + " ";
@@ -2253,7 +2253,7 @@ namespace OpenSim.Region.Environment.Scenes
2253 /// </summary> 2253 /// </summary>
2254 /// <param name="avatarID">AvatarID to lookup</param> 2254 /// <param name="avatarID">AvatarID to lookup</param>
2255 /// <returns></returns> 2255 /// <returns></returns>
2256 public bool PresenceChildStatus(LLUUID avatarID) 2256 public override bool PresenceChildStatus(LLUUID avatarID)
2257 { 2257 {
2258 ScenePresence cp = GetScenePresence(avatarID); 2258 ScenePresence cp = GetScenePresence(avatarID);
2259 return cp.IsChildAgent; 2259 return cp.IsChildAgent;
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 3942397..29747c1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Scenes
54 54
55 55
56 public KillObjectDelegate KillObject; 56 public KillObjectDelegate KillObject;
57 public string _debugRegionName = ""; 57 public string _debugRegionName = String.Empty;
58 58
59 public string debugRegionName 59 public string debugRegionName
60 { 60 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 879e4a3..ffc72c9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1114,7 +1114,7 @@ namespace OpenSim.Region.Environment.Scenes
1114 { 1114 {
1115 return part.Name; 1115 return part.Name;
1116 } 1116 }
1117 return ""; 1117 return String.Empty;
1118 } 1118 }
1119 1119
1120 public string GetPartDescription(uint localID) 1120 public string GetPartDescription(uint localID)
@@ -1124,7 +1124,7 @@ namespace OpenSim.Region.Environment.Scenes
1124 { 1124 {
1125 return part.Description; 1125 return part.Description;
1126 } 1126 }
1127 return ""; 1127 return String.Empty;
1128 } 1128 }
1129 1129
1130 /// <summary> 1130 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 1dd7e35..fc74c4e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Scenes
41{ 41{
42 public partial class SceneObjectPart : IScriptHost 42 public partial class SceneObjectPart : IScriptHost
43 { 43 {
44 private string m_inventoryFileName = ""; 44 private string m_inventoryFileName = String.Empty;
45 45
46 /// <summary> 46 /// <summary>
47 /// The inventory folder for this prim 47 /// The inventory folder for this prim
@@ -334,7 +334,7 @@ namespace OpenSim.Region.Environment.Scenes
334 334
335 public class InventoryStringBuilder 335 public class InventoryStringBuilder
336 { 336 {
337 public string BuildString = ""; 337 public string BuildString = String.Empty;
338 338
339 public InventoryStringBuilder(LLUUID folderID, LLUUID parentID) 339 public InventoryStringBuilder(LLUUID folderID, LLUUID parentID)
340 { 340 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 4456182..f2594a9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -395,7 +395,7 @@ namespace OpenSim.Region.Environment.Scenes
395 set { m_acceleration = value; } 395 set { m_acceleration = value; }
396 } 396 }
397 397
398 private string m_description = ""; 398 private string m_description = String.Empty;
399 399
400 public string Description 400 public string Description
401 { 401 {
@@ -418,7 +418,7 @@ namespace OpenSim.Region.Environment.Scenes
418 } 418 }
419 } 419 }
420 420
421 private string m_text = ""; 421 private string m_text = String.Empty;
422 422
423 public Vector3 SitTargetPosition 423 public Vector3 SitTargetPosition
424 { 424 {
@@ -440,7 +440,7 @@ namespace OpenSim.Region.Environment.Scenes
440 } 440 }
441 } 441 }
442 442
443 private string m_sitName = ""; 443 private string m_sitName = String.Empty;
444 444
445 public string SitName 445 public string SitName
446 { 446 {
@@ -448,7 +448,7 @@ namespace OpenSim.Region.Environment.Scenes
448 set { m_sitName = value; } 448 set { m_sitName = value; }
449 } 449 }
450 450
451 private string m_touchName = ""; 451 private string m_touchName = String.Empty;
452 452
453 public string TouchName 453 public string TouchName
454 { 454 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
index c1bf72b..58cf4c6 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -44,19 +44,19 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
44 44
45 public string SitName 45 public string SitName
46 { 46 {
47 get { return ""; } 47 get { return String.Empty; }
48 set { } 48 set { }
49 } 49 }
50 50
51 public string TouchName 51 public string TouchName
52 { 52 {
53 get { return ""; } 53 get { return String.Empty; }
54 set { } 54 set { }
55 } 55 }
56 56
57 public string Description 57 public string Description
58 { 58 {
59 get { return ""; } 59 get { return String.Empty; }
60 set { } 60 set { }
61 } 61 }
62 62
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 5dbe500..74f9358 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
88 //} 88 //}
89 //catch (Exception e) 89 //catch (Exception e)
90 //{ 90 //{
91 // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString()); 91 // m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString());
92 //} 92 //}
93 93
94 94
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
105 //} 105 //}
106 //catch (Exception e) 106 //catch (Exception e)
107 //{ 107 //{
108 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 108 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
109 //} 109 //}
110 110
111 ScriptEngineInterface ret; 111 ScriptEngineInterface ret;
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
115 //} 115 //}
116 //catch (Exception e) 116 //catch (Exception e)
117 //{ 117 //{
118 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 118 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
119 //} 119 //}
120 120
121 return ret; 121 return ret;
diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
index 70b957e..e654d2d 100644
--- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Types
262 public string[] GetNeighbours(string nodeName) 262 public string[] GetNeighbours(string nodeName)
263 { 263 {
264 string[] retVal = new string[1]; 264 string[] retVal = new string[1];
265 retVal[0] = ""; 265 retVal[0] = System.String.Empty;
266 return retVal; 266 return retVal;
267 } 267 }
268 } 268 }
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 9844f9e..8b8bcf4 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -88,7 +88,7 @@ namespace SimpleApp
88 m_commsManager = localComms; 88 m_commsManager = localComms;
89 89
90 LocalLoginService loginService = 90 LocalLoginService loginService =
91 new LocalLoginService(userService, "", localComms, m_networkServersInfo, false); 91 new LocalLoginService(userService, String.Empty, localComms, m_networkServersInfo, false);
92 loginService.OnLoginToRegion += backendService.AddNewSession; 92 loginService.OnLoginToRegion += backendService.AddNewSession;
93 93
94 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); 94 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
diff --git a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
index a5c8f05..564dfee 100644
--- a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -8,9 +36,9 @@ using System.Runtime.InteropServices;
8[assembly : AssemblyTitle("SimpleApp")] 36[assembly : AssemblyTitle("SimpleApp")]
9[assembly : AssemblyDescription("")] 37[assembly : AssemblyDescription("")]
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("Playahead AB")] 39[assembly : AssemblyCompany("OpenSimulator.org")]
12[assembly : AssemblyProduct("SimpleApp")] 40[assembly : AssemblyProduct("SimpleApp")]
13[assembly : AssemblyCopyright("Copyright © Playahead AB 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
index a25d027..6b1f291 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
50 { 50 {
51 /*if (args[0].ToLower() == "lslexport") 51 /*if (args[0].ToLower() == "lslexport")
52 { 52 {
53 string sequence = ""; 53 string sequence = String.Empty;
54 54
55 foreach (KeyValuePair<LLUUID, SceneObject> obj in script.world.Objects) 55 foreach (KeyValuePair<LLUUID, SceneObject> obj in script.world.Objects)
56 { 56 {
@@ -82,13 +82,13 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
82 LLVector3 scale = prim.Scale; 82 LLVector3 scale = prim.Scale;
83 LLVector3 rootPos = prim.WorldPos; 83 LLVector3 rootPos = prim.WorldPos;
84 84
85 string setPrimParams = ""; 85 string setPrimParams = String.Empty;
86 86
87 setPrimParams += "[PRIM_SCALE, " + scale.ToString() + ", PRIM_POS, " + rootPos.ToString() + ", PRIM_ROTATION, " + rot.ToString() + "]\n"; 87 setPrimParams += "[PRIM_SCALE, " + scale.ToString() + ", PRIM_POS, " + rootPos.ToString() + ", PRIM_ROTATION, " + rot.ToString() + "]\n";
88 88
89 return setPrimParams; 89 return setPrimParams;
90 */ 90 */
91 return ""; 91 return System.String.Empty;
92 } 92 }
93 } 93 }
94} \ No newline at end of file 94} \ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
index b152df2..3e5ae5a 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
237 237
238 public class PoolUtf8 : PoolItem 238 public class PoolUtf8 : PoolItem
239 { 239 {
240 public string Value = ""; 240 public string Value = String.Empty;
241 241
242 public void readValue(byte[] data, ref int pointer, int length) 242 public void readValue(byte[] data, ref int pointer, int length)
243 { 243 {
@@ -274,7 +274,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
274 274
275 public class PoolClass : PoolItem 275 public class PoolClass : PoolItem
276 { 276 {
277 //public string name = ""; 277 //public string name = String.Empty;
278 public ushort namePointer = 0; 278 public ushort namePointer = 0;
279 private ClassRecord parent; 279 private ClassRecord parent;
280 public PoolUtf8 Name; 280 public PoolUtf8 Name;
@@ -384,7 +384,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
384 { 384 {
385 public ushort AccessFlags = 0; 385 public ushort AccessFlags = 0;
386 public ushort NameIndex = 0; 386 public ushort NameIndex = 0;
387 public string Name = ""; 387 public string Name = String.Empty;
388 public ushort DescriptorIndex = 0; 388 public ushort DescriptorIndex = 0;
389 public ushort AttributeCount = 0; 389 public ushort AttributeCount = 0;
390 public List<MethodAttribute> Attributes = new List<MethodAttribute>(); 390 public List<MethodAttribute> Attributes = new List<MethodAttribute>();
@@ -436,7 +436,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
436 public class MethodAttribute 436 public class MethodAttribute
437 { 437 {
438 public ushort NameIndex = 0; 438 public ushort NameIndex = 0;
439 public string Name = ""; 439 public string Name = String.Empty;
440 public Int32 Length = 0; 440 public Int32 Length = 0;
441 //for now only support code attribute 441 //for now only support code attribute
442 public ushort MaxStack = 0; 442 public ushort MaxStack = 0;
@@ -502,7 +502,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
502 public class SubAttribute 502 public class SubAttribute
503 { 503 {
504 public ushort NameIndex = 0; 504 public ushort NameIndex = 0;
505 public string Name = ""; 505 public string Name = String.Empty;
506 public Int32 Length = 0; 506 public Int32 Length = 0;
507 public byte[] Data; 507 public byte[] Data;
508 private ClassRecord parent; 508 private ClassRecord parent;
@@ -546,7 +546,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
546 { 546 {
547 public ushort AccessFlags = 0; 547 public ushort AccessFlags = 0;
548 public ushort NameIndex = 0; 548 public ushort NameIndex = 0;
549 public string Name = ""; 549 public string Name = String.Empty;
550 public ushort DescriptorIndex = 0; 550 public ushort DescriptorIndex = 0;
551 public ushort AttributeCount = 0; 551 public ushort AttributeCount = 0;
552 public List<FieldAttribute> Attributes = new List<FieldAttribute>(); 552 public List<FieldAttribute> Attributes = new List<FieldAttribute>();
@@ -605,7 +605,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
605 public class FieldAttribute 605 public class FieldAttribute
606 { 606 {
607 public ushort NameIndex = 0; 607 public ushort NameIndex = 0;
608 public string Name = ""; 608 public string Name = String.Empty;
609 public Int32 Length = 0; 609 public Int32 Length = 0;
610 public byte[] Data; 610 public byte[] Data;
611 private ClassRecord parent; 611 private ClassRecord parent;
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
index fb8a16e..59f4c0e 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
@@ -46,8 +46,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
46 string typ = 46 string typ =
47 ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]). 47 ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]).
48 mNameType.Type.Value; 48 mNameType.Type.Value;
49 string typeparam = ""; 49 string typeparam = System.String.Empty;
50 string typereturn = ""; 50 string typereturn = System.String.Empty;
51 int firstbrak = 0; 51 int firstbrak = 0;
52 int secondbrak = 0; 52 int secondbrak = 0;
53 firstbrak = typ.LastIndexOf('('); 53 firstbrak = typ.LastIndexOf('(');
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index a88299e..082021f 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -976,7 +976,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
976 public class BulletXCharacter : BulletXActor 976 public class BulletXCharacter : BulletXActor
977 { 977 {
978 public BulletXCharacter(BulletXScene parent_scene, PhysicsVector pos) 978 public BulletXCharacter(BulletXScene parent_scene, PhysicsVector pos)
979 : this("", parent_scene, pos) 979 : this(String.Empty, parent_scene, pos)
980 { 980 {
981 } 981 }
982 982
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
index 809f3d5..4532bda 100644
--- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs
+++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Physics.Meshing
53 53
54 public override String ToString() 54 public override String ToString()
55 { 55 {
56 String result = ""; 56 String result = String.Empty;
57 foreach (Vertex v in vertices) 57 foreach (Vertex v in vertices)
58 { 58 {
59 result += "b:" + v.ToString() + "\n"; 59 result += "b:" + v.ToString() + "\n";
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index b824cbe..bfdb90f 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Physics.OdePlugin
83 private bool m_alwaysRun = false; 83 private bool m_alwaysRun = false;
84 private bool m_hackSentFall = false; 84 private bool m_hackSentFall = false;
85 private bool m_hackSentFly = false; 85 private bool m_hackSentFly = false;
86 private string m_name = ""; 86 private string m_name = String.Empty;
87 87
88 private bool[] m_colliderarr = new bool[11]; 88 private bool[] m_colliderarr = new bool[11];
89 private bool[] m_colliderGroundarr = new bool[11]; 89 private bool[] m_colliderGroundarr = new bool[11];
diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs
index 1805e38..df28d7d 100644
--- a/OpenSim/Region/ScriptEngine/Common/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.ScriptEngine.Common
88 88
89 //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args); 89 //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args);
90 90
91 //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \"" + EventName + "\""); 91 //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \String.Empty + EventName + "\String.Empty);
92 92
93 if (Events.ContainsKey(EventName) == false) 93 if (Events.ContainsKey(EventName) == false)
94 { 94 {
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Common
112 112
113 if (ev == null) // No event by that name! 113 if (ev == null) // No event by that name!
114 { 114 {
115 //Console.WriteLine("ScriptEngine Can not find any event named: \"" + EventName + "\""); 115 //Console.WriteLine("ScriptEngine Can not find any event named: \String.Empty + EventName + "\String.Empty);
116 return; 116 return;
117 } 117 }
118 118
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
index 33e5c68..5149f3a 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Common
79 79
80 80
81 public LSL_BuiltIn_Commands_Interface m_LSL_Functions; 81 public LSL_BuiltIn_Commands_Interface m_LSL_Functions;
82 private string _Source = ""; 82 private string _Source = String.Empty;
83 public string Source 83 public string Source
84 { 84 {
85 get 85 get
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 4cceb5f..1400617 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -297,7 +297,7 @@ namespace OpenSim.Region.ScriptEngine.Common
297 297
298 public int llListen(int channelID, string name, string ID, string msg) 298 public int llListen(int channelID, string name, string ID, string msg)
299 { 299 {
300 if (ID == "") 300 if (ID == String.Empty)
301 { 301 {
302 ID = LLUUID.Zero.ToString(); 302 ID = LLUUID.Zero.ToString();
303 } 303 }
@@ -338,19 +338,19 @@ namespace OpenSim.Region.ScriptEngine.Common
338 public string llDetectedName(int number) 338 public string llDetectedName(int number)
339 { 339 {
340 NotImplemented("llDetectedName"); 340 NotImplemented("llDetectedName");
341 return ""; 341 return String.Empty;
342 } 342 }
343 343
344 public string llDetectedKey(int number) 344 public string llDetectedKey(int number)
345 { 345 {
346 NotImplemented("llDetectedKey"); 346 NotImplemented("llDetectedKey");
347 return ""; 347 return String.Empty;
348 } 348 }
349 349
350 public string llDetectedOwner(int number) 350 public string llDetectedOwner(int number)
351 { 351 {
352 NotImplemented("llDetectedOwner"); 352 NotImplemented("llDetectedOwner");
353 return ""; 353 return String.Empty;
354 } 354 }
355 355
356 public int llDetectedType(int number) 356 public int llDetectedType(int number)
@@ -693,7 +693,7 @@ namespace OpenSim.Region.ScriptEngine.Common
693 return texface.TextureID.ToString(); 693 return texface.TextureID.ToString();
694 } 694 }
695 NotImplemented("llGetTexture"); 695 NotImplemented("llGetTexture");
696 return ""; 696 return String.Empty;
697 } 697 }
698 698
699 public void llSetPos(LSL_Types.Vector3 pos) 699 public void llSetPos(LSL_Types.Vector3 pos)
@@ -1175,7 +1175,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1175 public string llGetPermissionsKey() 1175 public string llGetPermissionsKey()
1176 { 1176 {
1177 NotImplemented("llGetPermissionsKey"); 1177 NotImplemented("llGetPermissionsKey");
1178 return ""; 1178 return String.Empty;
1179 } 1179 }
1180 1180
1181 public int llGetPermissions() 1181 public int llGetPermissions()
@@ -1336,7 +1336,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1336 public string llGetInventoryName(int type, int number) 1336 public string llGetInventoryName(int type, int number)
1337 { 1337 {
1338 NotImplemented("llGetInventoryName"); 1338 NotImplemented("llGetInventoryName");
1339 return ""; 1339 return String.Empty;
1340 } 1340 }
1341 1341
1342 public void llSetScriptState(string name, int run) 1342 public void llSetScriptState(string name, int run)
@@ -1378,13 +1378,13 @@ namespace OpenSim.Region.ScriptEngine.Common
1378 public string llRequestAgentData(string id, int data) 1378 public string llRequestAgentData(string id, int data)
1379 { 1379 {
1380 NotImplemented("llRequestAgentData"); 1380 NotImplemented("llRequestAgentData");
1381 return ""; 1381 return String.Empty;
1382 } 1382 }
1383 1383
1384 public string llRequestInventoryData(string name) 1384 public string llRequestInventoryData(string name)
1385 { 1385 {
1386 NotImplemented("llRequestInventoryData"); 1386 NotImplemented("llRequestInventoryData");
1387 return ""; 1387 return String.Empty;
1388 } 1388 }
1389 1389
1390 public void llSetDamage(double damage) 1390 public void llSetDamage(double damage)
@@ -1473,7 +1473,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1473 public string llGetAnimation(string id) 1473 public string llGetAnimation(string id)
1474 { 1474 {
1475 NotImplemented("llGetAnimation"); 1475 NotImplemented("llGetAnimation");
1476 return ""; 1476 return String.Empty;
1477 } 1477 }
1478 1478
1479 public void llResetScript() 1479 public void llResetScript()
@@ -1495,7 +1495,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1495 1495
1496 public string llGetScriptName() 1496 public string llGetScriptName()
1497 { 1497 {
1498 return ""; 1498 return String.Empty;
1499 } 1499 }
1500 1500
1501 public int llGetNumberOfSides() 1501 public int llGetNumberOfSides()
@@ -1534,7 +1534,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1534 1534
1535 public string llGetInventoryKey(string name) 1535 public string llGetInventoryKey(string name)
1536 { 1536 {
1537 return ""; 1537 return String.Empty;
1538 } 1538 }
1539 1539
1540 public void llAllowInventoryDrop(int add) 1540 public void llAllowInventoryDrop(int add)
@@ -1592,7 +1592,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1592 public string llGetOwnerKey(string id) 1592 public string llGetOwnerKey(string id)
1593 { 1593 {
1594 NotImplemented("llGetOwnerKey"); 1594 NotImplemented("llGetOwnerKey");
1595 return ""; 1595 return String.Empty;
1596 } 1596 }
1597 1597
1598 public LSL_Types.Vector3 llGetCenterOfMass() 1598 public LSL_Types.Vector3 llGetCenterOfMass()
@@ -1610,14 +1610,14 @@ namespace OpenSim.Region.ScriptEngine.Common
1610 // s = 1; 1610 // s = 1;
1611 //int c = 0; 1611 //int c = 0;
1612 //LSL_Types.list chunk = new LSL_Types.list(); 1612 //LSL_Types.list chunk = new LSL_Types.list();
1613 //string chunkString = ""; 1613 //string chunkString = String.Empty;
1614 //foreach (string element in src) 1614 //foreach (string element in src)
1615 //{ 1615 //{
1616 // c++; 1616 // c++;
1617 // if (c > s) 1617 // if (c > s)
1618 // { 1618 // {
1619 // sorted.Add(chunkString, chunk); 1619 // sorted.Add(chunkString, chunk);
1620 // chunkString = ""; 1620 // chunkString = String.Empty;
1621 // chunk = new LSL_Types.list(); 1621 // chunk = new LSL_Types.list();
1622 // c = 0; 1622 // c = 0;
1623 // } 1623 // }
@@ -1693,7 +1693,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1693 } 1693 }
1694 if (index >= src.Length) 1694 if (index >= src.Length)
1695 { 1695 {
1696 return ""; 1696 return String.Empty;
1697 } 1697 }
1698 return src.Data[index].ToString(); 1698 return src.Data[index].ToString();
1699 } 1699 }
@@ -1814,7 +1814,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1814 1814
1815 public string llList2CSV(LSL_Types.list src) 1815 public string llList2CSV(LSL_Types.list src)
1816 { 1816 {
1817 string ret = ""; 1817 string ret = String.Empty;
1818 foreach (object o in src.Data) 1818 foreach (object o in src.Data)
1819 { 1819 {
1820 ret = ret + o.ToString() + ","; 1820 ret = ret + o.ToString() + ",";
@@ -1968,7 +1968,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1968 public string llKey2Name(string id) 1968 public string llKey2Name(string id)
1969 { 1969 {
1970 NotImplemented("llKey2Name"); 1970 NotImplemented("llKey2Name");
1971 return ""; 1971 return String.Empty;
1972 } 1972 }
1973 1973
1974 public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) 1974 public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate)
@@ -2006,7 +2006,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2006 public string llGetNotecardLine(string name, int line) 2006 public string llGetNotecardLine(string name, int line)
2007 { 2007 {
2008 NotImplemented("llGetNotecardLine"); 2008 NotImplemented("llGetNotecardLine");
2009 return ""; 2009 return String.Empty;
2010 } 2010 }
2011 2011
2012 public LSL_Types.Vector3 llGetAgentSize(string id) 2012 public LSL_Types.Vector3 llGetAgentSize(string id)
@@ -2257,7 +2257,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2257 if (AVID != LLUUID.Zero) 2257 if (AVID != LLUUID.Zero)
2258 return AVID.ToString(); 2258 return AVID.ToString();
2259 else 2259 else
2260 return ""; 2260 return String.Empty;
2261 } 2261 }
2262 2262
2263 public void llAddToLandPassList(string avatar, double hours) 2263 public void llAddToLandPassList(string avatar, double hours)
@@ -2289,9 +2289,9 @@ namespace OpenSim.Region.ScriptEngine.Common
2289 { 2289 {
2290 if (src.Length == 0) 2290 if (src.Length == 0)
2291 { 2291 {
2292 return ""; 2292 return String.Empty;
2293 } 2293 }
2294 string ret = ""; 2294 string ret = String.Empty;
2295 foreach (object o in src.Data) 2295 foreach (object o in src.Data)
2296 { 2296 {
2297 ret = ret + o.ToString() + seperator; 2297 ret = ret + o.ToString() + seperator;
@@ -2352,7 +2352,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2352 if (xmlrpcMod.IsEnabled()) 2352 if (xmlrpcMod.IsEnabled())
2353 { 2353 {
2354 LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID); 2354 LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID);
2355 object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), "", 0, "" }; 2355 object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), String.Empty, 0, String.Empty };
2356 m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj); 2356 m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj);
2357 } 2357 }
2358 } 2358 }
@@ -2360,7 +2360,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2360 public string llSendRemoteData(string channel, string dest, int idata, string sdata) 2360 public string llSendRemoteData(string channel, string dest, int idata, string sdata)
2361 { 2361 {
2362 NotImplemented("llSendRemoteData"); 2362 NotImplemented("llSendRemoteData");
2363 return ""; 2363 return String.Empty;
2364 } 2364 }
2365 2365
2366 public void llRemoteDataReply(string channel, string message_id, string sdata, int idata) 2366 public void llRemoteDataReply(string channel, string message_id, string sdata, int idata)
@@ -2578,7 +2578,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2578 public string llGetNumberOfNotecardLines(string name) 2578 public string llGetNumberOfNotecardLines(string name)
2579 { 2579 {
2580 NotImplemented("llGetNumberOfNotecardLines"); 2580 NotImplemented("llGetNumberOfNotecardLines");
2581 return ""; 2581 return String.Empty;
2582 } 2582 }
2583 2583
2584 public LSL_Types.list llGetBoundingBox(string obj) 2584 public LSL_Types.list llGetBoundingBox(string obj)
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2600 public string llIntegerToBase64(int number) 2600 public string llIntegerToBase64(int number)
2601 { 2601 {
2602 NotImplemented("llIntegerToBase64"); 2602 NotImplemented("llIntegerToBase64");
2603 return ""; 2603 return String.Empty;
2604 } 2604 }
2605 2605
2606 public int llBase64ToInteger(string str) 2606 public int llBase64ToInteger(string str)
@@ -2660,7 +2660,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2660 public string llGetInventoryCreator(string item) 2660 public string llGetInventoryCreator(string item)
2661 { 2661 {
2662 NotImplemented("llGetInventoryCreator"); 2662 NotImplemented("llGetInventoryCreator");
2663 return ""; 2663 return String.Empty;
2664 } 2664 }
2665 2665
2666 public void llOwnerSay(string msg) 2666 public void llOwnerSay(string msg)
@@ -2828,7 +2828,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2828 2828
2829 public string llXorBase64StringsCorrect(string str1, string str2) 2829 public string llXorBase64StringsCorrect(string str1, string str2)
2830 { 2830 {
2831 string ret = ""; 2831 string ret = String.Empty;
2832 string src1 = llBase64ToString(str1); 2832 string src1 = llBase64ToString(str1);
2833 string src2 = llBase64ToString(str2); 2833 string src2 = llBase64ToString(str2);
2834 int c = 0; 2834 int c = 0;
@@ -3002,7 +3002,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3002 public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, 3002 public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams,
3003 int timer) 3003 int timer)
3004 { 3004 {
3005 if (dynamicID == "") 3005 if (dynamicID == String.Empty)
3006 { 3006 {
3007 IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); 3007 IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
3008 LLUUID createdTexture = 3008 LLUUID createdTexture =
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index 0ae7a0a..e48f667 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -429,10 +429,10 @@ namespace OpenSim.Region.ScriptEngine.Common
429 public override string ToString() 429 public override string ToString()
430 { 430 {
431 string output; 431 string output;
432 output = ""; 432 output = String.Empty;
433 if (m_data.Length == 0) 433 if (m_data.Length == 0)
434 { 434 {
435 return ""; 435 return String.Empty;
436 } 436 }
437 foreach (object o in m_data) 437 foreach (object o in m_data)
438 { 438 {
diff --git a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs
index 48cf45a..1572a51 100644
--- a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.Common")] 40[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.Common")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
index 6df8343..0a8f7ea 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
148 // Handled by long commands 148 // Handled by long commands
149 public void timer(uint localID, LLUUID itemID) 149 public void timer(uint localID, LLUUID itemID)
150 { 150 {
151 //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, ""); 151 //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, String.Empty);
152 } 152 }
153 153
154 public void listen(uint localID, LLUUID itemID) 154 public void listen(uint localID, LLUUID itemID)
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index 8081e2c..af91027 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -323,7 +323,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
323 // Do we have any scripts in this object at all? If not, return 323 // Do we have any scripts in this object at all? If not, return
324 if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false) 324 if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false)
325 { 325 {
326 //Console.WriteLine("Event \"" + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); 326 //Console.WriteLine("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID.");
327 return; 327 return;
328 } 328 }
329 329
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs
index 635c32a..7271d72 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs
@@ -259,7 +259,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
259 //Deliver data to prim's remote_data handler 259 //Deliver data to prim's remote_data handler
260 object[] resobj = new object[] 260 object[] resobj = new object[]
261 { 261 {
262 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), "", 262 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), String.Empty,
263 rInfo.GetIntValue(), 263 rInfo.GetIntValue(),
264 rInfo.GetStrVal() 264 rInfo.GetStrVal()
265 }; 265 };
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index 8f74620..784e849 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
161 catch (ThreadAbortException tae) 161 catch (ThreadAbortException tae)
162 { 162 {
163 string a = tae.ToString(); 163 string a = tae.ToString();
164 a = ""; 164 a = String.Empty;
165 // Expected 165 // Expected
166 } 166 }
167 } 167 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 9cd22e2..2adc060 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
143 // TODO: Return errors to user somehow 143 // TODO: Return errors to user somehow
144 if (results.Errors.Count > 0) 144 if (results.Errors.Count > 0)
145 { 145 {
146 string errtext = ""; 146 string errtext = String.Empty;
147 foreach (CompilerError CompErr in results.Errors) 147 foreach (CompilerError CompErr in results.Errors)
148 { 148 {
149 errtext += "Line number " + (CompErr.Line - 1) + 149 errtext += "Line number " + (CompErr.Line - 1) +
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 724d8f5..f3302ee 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -28,6 +28,7 @@
28 28
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text.RegularExpressions; 30using System.Text.RegularExpressions;
31using System;
31 32
32namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL 33namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
33{ 34{
@@ -58,7 +59,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
58 public string Convert(string Script) 59 public string Convert(string Script)
59 { 60 {
60 quotes.Clear(); 61 quotes.Clear();
61 string Return = ""; 62 string Return = System.String.Empty;
62 Script = " \r\n" + Script; 63 Script = " \r\n" + Script;
63 64
64 // 65 //
@@ -72,13 +73,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
72 73
73 // QUOTE REPLACEMENT 74 // QUOTE REPLACEMENT
74 // temporarily replace quotes so we can work our magic on the script without 75 // temporarily replace quotes so we can work our magic on the script without
75 // always considering if we are inside our outside ""'s 76 // always considering if we are inside our outside String.Empty's
76 string _Script = ""; 77 string _Script = System.String.Empty;
77 string C; 78 string C;
78 bool in_quote = false; 79 bool in_quote = false;
79 bool quote_replaced = false; 80 bool quote_replaced = false;
80 string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_"; 81 string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_";
81 string quote = ""; 82 string quote = System.String.Empty;
82 bool last_was_escape = false; 83 bool last_was_escape = false;
83 int quote_replaced_count = 0; 84 int quote_replaced_count = 0;
84 for (int p = 0; p < Script.Length; p++) 85 for (int p = 0; p < Script.Length; p++)
@@ -97,7 +98,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
97 } 98 }
98 else 99 else
99 { 100 {
100 if (quote == "") 101 if (quote == System.String.Empty)
101 { 102 {
102 // We didn't replace quote, probably because of empty string? 103 // We didn't replace quote, probably because of empty string?
103 _Script += quote_replacement_string + 104 _Script += quote_replacement_string +
@@ -107,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
107 quotes.Add( 108 quotes.Add(
108 quote_replacement_string + 109 quote_replacement_string +
109 quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote); 110 quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote);
110 quote = ""; 111 quote = System.String.Empty;
111 } 112 }
112 break; 113 break;
113 } 114 }
@@ -151,10 +152,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
151 // 152 //
152 int ilevel = 0; 153 int ilevel = 0;
153 int lastlevel = 0; 154 int lastlevel = 0;
154 string ret = ""; 155 string ret = System.String.Empty;
155 string cache = ""; 156 string cache = System.String.Empty;
156 bool in_state = false; 157 bool in_state = false;
157 string current_statename = ""; 158 string current_statename = System.String.Empty;
158 for (int p = 0; p < Script.Length; p++) 159 for (int p = 0; p < Script.Length; p++)
159 { 160 {
160 C = Script.Substring(p, 1); 161 C = Script.Substring(p, 1);
@@ -191,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
191 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); 192 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
192 } 193 }
193 ret += cache; 194 ret += cache;
194 cache = ""; 195 cache = String.Empty;
195 } 196 }
196 if (ilevel == 0 && lastlevel == 1) 197 if (ilevel == 0 && lastlevel == 1)
197 { 198 {
@@ -199,7 +200,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
199 if (in_state == true) 200 if (in_state == true)
200 { 201 {
201 cache = cache.Remove(cache.Length - 1, 1); 202 cache = cache.Remove(cache.Length - 1, 1);
202 //cache = Regex.Replace(cache, "}$", "", RegexOptions.Multiline | RegexOptions.Singleline); 203 //cache = Regex.Replace(cache, "}$", String.Empty, RegexOptions.Multiline | RegexOptions.Singleline);
203 204
204 //Replace function names 205 //Replace function names
205 // void dataserver(key query_id, string data) { 206 // void dataserver(key query_id, string data) {
@@ -213,9 +214,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
213 } 214 }
214 215
215 ret += cache; 216 ret += cache;
216 cache = ""; 217 cache = String.Empty;
217 in_state = true; 218 in_state = true;
218 current_statename = ""; 219 current_statename = String.Empty;
219 } 220 }
220 221
221 break; 222 break;
@@ -223,10 +224,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
223 lastlevel = ilevel; 224 lastlevel = ilevel;
224 } 225 }
225 ret += cache; 226 ret += cache;
226 cache = ""; 227 cache = String.Empty;
227 228
228 Script = ret; 229 Script = ret;
229 ret = ""; 230 ret = String.Empty;
230 231
231 232
232 foreach (string key in dataTypes.Keys) 233 foreach (string key in dataTypes.Keys)
@@ -287,7 +288,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
287 288
288 // Add namespace, class name and inheritance 289 // Add namespace, class name and inheritance
289 290
290 Return = "" + 291 Return = String.Empty +
291 "using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;"; 292 "using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;";
292 //"using System; " + 293 //"using System; " +
293 //"using System.Collections.Generic; " + 294 //"using System.Collections.Generic; " +
@@ -309,9 +310,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
309 //} 310 //}
310 311
311 312
312 Return += "" + 313 Return += String.Empty +
313 "namespace SecondLife { "; 314 "namespace SecondLife { ";
314 Return += "" + 315 Return += String.Empty +
315 //"[Serializable] " + 316 //"[Serializable] " +
316 "public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { "; 317 "public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { ";
317 Return += @"public Script() { } "; 318 Return += @"public Script() { } ";
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
index 00027ca..e484906 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.DotNetEngine")] 40[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.DotNetEngine")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 0c28ac7..2bb40ee 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
64 64
65 // We will initialize and start the script. 65 // We will initialize and start the script.
66 // It will be up to the script itself to hook up the correct events. 66 // It will be up to the script itself to hook up the correct events.
67 string ScriptSource = ""; 67 string ScriptSource = String.Empty;
68 68
69 SceneObjectPart m_host = World.GetSceneObjectPart(localID); 69 SceneObjectPart m_host = World.GetSceneObjectPart(localID);
70 70
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
index 6dde3e5..c6fa4ce 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
63 LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name); 63 LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name);
64 LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll"); 64 LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll");
65 LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode..."); 65 LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode...");
66 LSOEngine.LSO.Common.SendToLog(""); 66 LSOEngine.LSO.Common.SendToLog(String.Empty);
67 67
68 68
69 // Create Assembly 69 // Create Assembly
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
81 (asmName.Name, 81 (asmName.Name,
82 DLL_FileName); 82 DLL_FileName);
83 83
84 //Common.SendToDebug("asmName.Name is still \"" + asmName.Name + "\""); 84 //Common.SendToDebug("asmName.Name is still \String.Empty + asmName.Name + "\String.Empty);
85 // Create a Class (/Type) 85 // Create a Class (/Type)
86 TypeBuilder typeBuilder = modBuilder.DefineType( 86 TypeBuilder typeBuilder = modBuilder.DefineType(
87 "LSL_ScriptObject", 87 "LSL_ScriptObject",
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
152 152
153 //foreach (string s in ret) 153 //foreach (string s in ret)
154 //{ 154 //{
155 // Common.SendToLog(""); 155 // Common.SendToLog(String.Empty);
156 // Common.SendToLog("*** Executing LSL Server Event: " + s); 156 // Common.SendToLog("*** Executing LSL Server Event: " + s);
157 // //object test = type.GetMember(s); 157 // //object test = type.GetMember(s);
158 // //object runner = type.InvokeMember(s, BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.Instance, null, MyScript, args); 158 // //object runner = type.InvokeMember(s, BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.Instance, null, MyScript, args);
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
index d0cc0f9..efe8648 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
@@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
430 430
431 private string Read_String() 431 private string Read_String()
432 { 432 {
433 string ret = ""; 433 string ret = String.Empty;
434 byte reader = br_read(1)[0]; 434 byte reader = br_read(1)[0];
435 while (reader != 0x000) 435 while (reader != 0x000)
436 { 436 {
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs
index 78014d6..763a759 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly: AssemblyProduct("OpenSim.Region.ScriptEngine.LSOEngine")] 40[assembly: AssemblyProduct("OpenSim.Region.ScriptEngine.LSOEngine")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
index 56c422f..bd26ce4 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
61 61
62 // We will initialize and start the script. 62 // We will initialize and start the script.
63 // It will be up to the script itself to hook up the correct events. 63 // It will be up to the script itself to hook up the correct events.
64 string ScriptSource = ""; 64 string ScriptSource = String.Empty;
65 65
66 SceneObjectPart m_host = World.GetSceneObjectPart(localID); 66 SceneObjectPart m_host = World.GetSceneObjectPart(localID);
67 67
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs
index d78caf9..0462ba4 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.RemoteServer")] 40[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.RemoteServer")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index ac9b741..d6c4675 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -798,7 +798,7 @@ namespace OpenSim.DataStore.MSSQL
798 private SqlCommand createUpdateCommand(string table, string pk, DataTable dt) 798 private SqlCommand createUpdateCommand(string table, string pk, DataTable dt)
799 { 799 {
800 string sql = "update " + table + " set "; 800 string sql = "update " + table + " set ";
801 string subsql = ""; 801 string subsql = String.Empty;
802 foreach (DataColumn col in dt.Columns) 802 foreach (DataColumn col in dt.Columns)
803 { 803 {
804 if (subsql.Length > 0) 804 if (subsql.Length > 0)
@@ -825,7 +825,7 @@ namespace OpenSim.DataStore.MSSQL
825 private string defineTable(DataTable dt) 825 private string defineTable(DataTable dt)
826 { 826 {
827 string sql = "create table " + dt.TableName + "("; 827 string sql = "create table " + dt.TableName + "(";
828 string subsql = ""; 828 string subsql = String.Empty;
829 foreach (DataColumn col in dt.Columns) 829 foreach (DataColumn col in dt.Columns)
830 { 830 {
831 if (subsql.Length > 0) 831 if (subsql.Length > 0)
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs
index 7608202..3d4dd3c 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.DataStore.NullStorage")] 40[assembly : AssemblyProduct("OpenSim.DataStore.NullStorage")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
index 3195140..33537fa 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")] 39[assembly : AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")]
40[assembly : AssemblyCopyright("Copyright © 2007")] 40[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs
index e260dc0..8f4957c 100644
--- a/OpenSim/Tools/Export/OpenSimExport.cs
+++ b/OpenSim/Tools/Export/OpenSimExport.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Tools.Export
54 54
55 sman = new StorageManager( 55 sman = new StorageManager(
56 startup.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"), 56 startup.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"),
57 startup.GetString("storage_connection_string", ""), 57 startup.GetString("storage_connection_string", String.Empty),
58 false 58 false
59 ); 59 );
60 } 60 }