aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/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/Framework
parentIf a local land ID is given to the "land show" command, then output to consol... (diff)
downloadopensim-SC_OLD-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.zip
opensim-SC_OLD-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.gz
opensim-SC_OLD-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.bz2
opensim-SC_OLD-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/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 9e6c25d..dcbb509 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -473,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes
473 { 473 {
474 get 474 get
475 { 475 {
476 if (CreatorData != null && CreatorData != string.Empty) 476 if (!string.IsNullOrEmpty(CreatorData))
477 return CreatorID.ToString() + ';' + CreatorData; 477 return CreatorID.ToString() + ';' + CreatorData;
478 else 478 else
479 return CreatorID.ToString(); 479 return CreatorID.ToString();
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 3ea936c..f07dee9 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1223,7 +1223,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1223 1223
1224 WriteUUID(writer, "CreatorID", sop.CreatorID, options); 1224 WriteUUID(writer, "CreatorID", sop.CreatorID, options);
1225 1225
1226 if (sop.CreatorData != null && sop.CreatorData != string.Empty) 1226 if (!string.IsNullOrEmpty(sop.CreatorData))
1227 writer.WriteElementString("CreatorData", sop.CreatorData); 1227 writer.WriteElementString("CreatorData", sop.CreatorData);
1228 else if (options.ContainsKey("home")) 1228 else if (options.ContainsKey("home"))
1229 { 1229 {
@@ -1396,7 +1396,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1396 1396
1397 WriteUUID(writer, "CreatorID", item.CreatorID, options); 1397 WriteUUID(writer, "CreatorID", item.CreatorID, options);
1398 1398
1399 if (item.CreatorData != null && item.CreatorData != string.Empty) 1399 if (!string.IsNullOrEmpty(item.CreatorData))
1400 writer.WriteElementString("CreatorData", item.CreatorData); 1400 writer.WriteElementString("CreatorData", item.CreatorData);
1401 else if (options.ContainsKey("home")) 1401 else if (options.ContainsKey("home"))
1402 { 1402 {