From 7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Nov 2013 21:45:08 +0000
Subject: refactor: replace verbose checks with String.IsNullOrEmpty where
applicable.
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
---
OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | 2 +-
OpenSim/Framework/InventoryItemBase.cs | 2 +-
OpenSim/Framework/Monitoring/Stats/Stat.cs | 6 +++---
.../Framework/Serialization/External/UserInventoryItemSerializer.cs | 2 +-
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 +-
OpenSim/Framework/TaskInventoryItem.cs | 2 +-
OpenSim/Framework/WebUtil.cs | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 43162fc..3152a7d 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.Configuration.XML
public void Commit()
{
- if (fileName == null || fileName == String.Empty)
+ if (string.IsNullOrEmpty(fileName))
return;
if (!Directory.Exists(Util.configDir()))
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 3d45e76..558dfd0 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Framework
{
get
{
- if (m_creatorData != null && m_creatorData != string.Empty)
+ if (!string.IsNullOrEmpty(m_creatorData))
return m_creatorId + ';' + m_creatorData;
else
return m_creatorId;
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 2b34493..e095801 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Monitoring
Container,
ShortName,
Value,
- UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
+ string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
AppendMeasuresOfInterest(sb);
@@ -316,9 +316,9 @@ namespace OpenSim.Framework.Monitoring
sb.AppendFormat(
", {0:0.##}{1}/s, {2:0.##}{3}/s",
lastChangeOverTime,
- UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName),
+ string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName),
averageChangeOverTime,
- UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
+ string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
}
}
}
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 88f9581..f2a6b8b 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -277,7 +277,7 @@ namespace OpenSim.Framework.Serialization.External
writer.WriteStartElement("GroupOwned");
writer.WriteString(inventoryItem.GroupOwned.ToString());
writer.WriteEndElement();
- if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty)
+ if (options.ContainsKey("creators") && !string.IsNullOrEmpty(inventoryItem.CreatorData))
writer.WriteElementString("CreatorData", inventoryItem.CreatorData);
else if (options.ContainsKey("home"))
{
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 76b4257..e1ae74e 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -785,7 +785,7 @@ namespace OpenSim.Framework.Servers.HttpServer
"[BASE HTTP SERVER]: HTTP IN {0} :{1} {2} content type handler {3} {4} from {5}",
RequestNumber,
Port,
- (request.ContentType == null || request.ContentType == "") ? "not set" : request.ContentType,
+ string.IsNullOrEmpty(request.ContentType) ? "not set" : request.ContentType,
request.HttpMethod,
request.Url.PathAndQuery,
request.RemoteIPEndPoint);
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index a06f8e7..307cb75 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Framework
{
get
{
- if (_creatorData != null && _creatorData != string.Empty)
+ if (!string.IsNullOrEmpty(_creatorData))
return _creatorID.ToString() + ';' + _creatorData;
else
return _creatorID.ToString();
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 706b33f..bcf6af8 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -720,7 +720,7 @@ namespace OpenSim.Framework
///
public static string[] GetPreferredImageTypes(string accept)
{
- if (accept == null || accept == string.Empty)
+ if (string.IsNullOrEmpty(accept))
return new string[0];
string[] types = accept.Split(new char[] { ',' });
--
cgit v1.1
From 9ba5a7e190497be05a4e1f54ba3140366750277a Mon Sep 17 00:00:00 2001
From: Latif Khalifa
Date: Sun, 17 Nov 2013 13:43:05 +0100
Subject: Normalize viewer version string to accomodate new style version
reporting in the viewers
---
OpenSim/Framework/AgentCircuitData.cs | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index ffcc584..acf925a 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -128,7 +128,30 @@ namespace OpenSim.Framework
///
/// Viewer's version string as reported by the viewer at login
///
- public string Viewer;
+ private string ViewerInternal;
+
+ ///
+ /// Viewer's version string
+ ///
+ public string Viewer
+ {
+ set { ViewerInternal = value; }
+ // Try to return consistent viewer string taking into account
+ // that viewers have chaagned how version is reported
+ // See http://opensimulator.org/mantis/view.php?id=6851
+ get
+ {
+ // Old style version string contains viewer name followed by a space followed by a version number
+ if (ViewerInternal.Contains(" "))
+ {
+ return ViewerInternal;
+ }
+ else // New style version contains no spaces, just version number
+ {
+ return Channel + " " + ViewerInternal;
+ }
+ }
+ }
///
/// The channel strinf sent by the viewer at login
--
cgit v1.1
From b71952df49784167a4c2eed218424064b90bfd63 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 19 Nov 2013 23:36:44 +0000
Subject: Stop AgentCircuitData.Viewer.get() from throwing an error if no
Viewer has been set.
Continue to return null instead.
---
OpenSim/Framework/AgentCircuitData.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index acf925a..51f0a1e 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
get
{
// Old style version string contains viewer name followed by a space followed by a version number
- if (ViewerInternal.Contains(" "))
+ if (ViewerInternal == null || ViewerInternal.Contains(" "))
{
return ViewerInternal;
}
--
cgit v1.1
From f9984a9685ac92a34272f7231a0ec4097fc31a79 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 19 Nov 2013 23:39:52 +0000
Subject: rename private field ACD.ViewerInternal to m_viewerInternal in line
with conventions used elsewhere in code
---
OpenSim/Framework/AgentCircuitData.cs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 51f0a1e..f2fe494 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -128,27 +128,28 @@ namespace OpenSim.Framework
///
/// Viewer's version string as reported by the viewer at login
///
- private string ViewerInternal;
+ private string m_viewerInternal;
///
/// Viewer's version string
///
public string Viewer
{
- set { ViewerInternal = value; }
+ set { m_viewerInternal = value; }
+
// Try to return consistent viewer string taking into account
// that viewers have chaagned how version is reported
// See http://opensimulator.org/mantis/view.php?id=6851
get
{
// Old style version string contains viewer name followed by a space followed by a version number
- if (ViewerInternal == null || ViewerInternal.Contains(" "))
+ if (m_viewerInternal == null || m_viewerInternal.Contains(" "))
{
- return ViewerInternal;
+ return m_viewerInternal;
}
else // New style version contains no spaces, just version number
{
- return Channel + " " + ViewerInternal;
+ return Channel + " " + m_viewerInternal;
}
}
}
--
cgit v1.1