aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
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/Framework
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/Framework')
-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
57 files changed, 465 insertions, 282 deletions
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)