diff --git a/OpenSim/Addons/OfflineIM/Service/OfflineIMServiceBase.cs b/OpenSim/Addons/OfflineIM/Service/OfflineIMServiceBase.cs index d8e2bb8..d68ae3d 100644 --- a/OpenSim/Addons/OfflineIM/Service/OfflineIMServiceBase.cs +++ b/OpenSim/Addons/OfflineIM/Service/OfflineIMServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.OfflineIM // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin<IOfflineIMData>(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/AssetService/AssetServiceBase.cs b/OpenSim/Services/AssetService/AssetServiceBase.cs index ec6b786..af8513d 100644 --- a/OpenSim/Services/AssetService/AssetServiceBase.cs +++ b/OpenSim/Services/AssetService/AssetServiceBase.cs @@ -79,7 +79,7 @@ namespace OpenSim.Services.AssetService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin<IAssetDataPlugin>(dllName); diff --git a/OpenSim/Services/AssetService/XAssetServiceBase.cs b/OpenSim/Services/AssetService/XAssetServiceBase.cs index a74b22a..155ac04 100644 --- a/OpenSim/Services/AssetService/XAssetServiceBase.cs +++ b/OpenSim/Services/AssetService/XAssetServiceBase.cs @@ -77,7 +77,7 @@ namespace OpenSim.Services.AssetService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin<IXAssetDataPlugin>(dllName); diff --git a/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs b/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs index 8e6d0b1..fd53e74 100644 --- a/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs +++ b/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs @@ -69,7 +69,7 @@ namespace OpenSim.Services.AuthorizationService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin<IAssetDataPlugin>(dllName); diff --git a/OpenSim/Services/AvatarService/AvatarServiceBase.cs b/OpenSim/Services/AvatarService/AvatarServiceBase.cs index 740e4d1..d9b1306 100644 --- a/OpenSim/Services/AvatarService/AvatarServiceBase.cs +++ b/OpenSim/Services/AvatarService/AvatarServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.Services.AvatarService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin<IAvatarData>(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs index 1999a21..45ff259 100644 --- a/OpenSim/Services/FSAssetService/FSAssetService.cs +++ b/OpenSim/Services/FSAssetService/FSAssetService.cs @@ -138,10 +138,10 @@ namespace OpenSim.Services.FSAssetService } // No databse connection found in either config - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); - if (connectionString.Equals(String.Empty)) + if (string.IsNullOrEmpty(connectionString)) throw new Exception("Missing database connection string"); // Create Storage Provider diff --git a/OpenSim/Services/GridService/GridServiceBase.cs b/OpenSim/Services/GridService/GridServiceBase.cs index 37e10d2..a8aed67 100644 --- a/OpenSim/Services/GridService/GridServiceBase.cs +++ b/OpenSim/Services/GridService/GridServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.Services.GridService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin<IRegionData>(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/HypergridService/UserAgentServiceBase.cs b/OpenSim/Services/HypergridService/UserAgentServiceBase.cs index fae7469..d146b68 100644 --- a/OpenSim/Services/HypergridService/UserAgentServiceBase.cs +++ b/OpenSim/Services/HypergridService/UserAgentServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.Services.HypergridService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin<IHGTravelingData>(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs index f1cf783..466e6a6 100644 --- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs +++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.Services.PresenceService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin<IPresenceData>(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs index 0569101..39ad219 100644 --- a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs +++ b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs @@ -71,7 +71,7 @@ namespace OpenSim.Services.UserAccountService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin<IGridUserData>(dllName, new Object[] { connString, realm });