aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-15 21:45:08 +0000
committerJustin Clark-Casey (justincc)2013-11-15 21:45:08 +0000
commit7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9 (patch)
tree24a0c3d086944436431ccae6302cd7cc0ffa8407 /OpenSim/Region/CoreModules/Framework
parentIf a local land ID is given to the "land show" command, then output to consol... (diff)
downloadopensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.zip
opensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.gz
opensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.bz2
opensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.xz
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index 144895c..b7a4d1a 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
174 174
175 private void AdjustIdentifiers(AssetMetadata meta) 175 private void AdjustIdentifiers(AssetMetadata meta)
176 { 176 {
177 if (meta.CreatorID != null && meta.CreatorID != string.Empty) 177 if (!string.IsNullOrEmpty(meta.CreatorID))
178 { 178 {
179 UUID uuid = UUID.Zero; 179 UUID uuid = UUID.Zero;
180 UUID.TryParse(meta.CreatorID, out uuid); 180 UUID.TryParse(meta.CreatorID, out uuid);
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index d3926cc..3fb5195 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -466,7 +466,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
466 return userdata.ServerURLs[serverType].ToString(); 466 return userdata.ServerURLs[serverType].ToString();
467 } 467 }
468 468
469 if (userdata.HomeURL != null && userdata.HomeURL != string.Empty) 469 if (!string.IsNullOrEmpty(userdata.HomeURL))
470 { 470 {
471 //m_log.DebugFormat( 471 //m_log.DebugFormat(
472 // "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}", 472 // "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}",
@@ -552,7 +552,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
552 552
553 if (oldUser != null) 553 if (oldUser != null)
554 { 554 {
555 if (creatorData == null || creatorData == String.Empty) 555 if (string.IsNullOrEmpty(creatorData))
556 { 556 {
557 //ignore updates without creator data 557 //ignore updates without creator data
558 return; 558 return;