diff options
| author | Robert Adams | 2013-11-15 14:56:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-15 14:56:13 -0800 |
| commit | 604b39cea908029c80aa8ee5ff3aee5c8000c0e4 (patch) | |
| tree | bea875d6651531a030630e161b658c74d3aaf357 /OpenSim/Addons | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.zip opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.gz opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.bz2 opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs index 59fec6f..653dbac 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs | |||
| @@ -101,7 +101,7 @@ namespace OpenSim.Groups | |||
| 101 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 101 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
| 102 | if (GroupID != UUID.Zero) | 102 | if (GroupID != UUID.Zero) |
| 103 | sendData["GroupID"] = GroupID.ToString(); | 103 | sendData["GroupID"] = GroupID.ToString(); |
| 104 | if (GroupName != null && GroupName != string.Empty) | 104 | if (!string.IsNullOrEmpty(GroupName)) |
| 105 | sendData["Name"] = GroupsDataUtils.Sanitize(GroupName); | 105 | sendData["Name"] = GroupsDataUtils.Sanitize(GroupName); |
| 106 | 106 | ||
| 107 | sendData["RequestingAgentID"] = RequestingAgentID; | 107 | sendData["RequestingAgentID"] = RequestingAgentID; |
| @@ -275,7 +275,7 @@ namespace OpenSim.Groups | |||
| 275 | 275 | ||
| 276 | //m_log.DebugFormat("[XXX]: reply was {0}", reply); | 276 | //m_log.DebugFormat("[XXX]: reply was {0}", reply); |
| 277 | 277 | ||
| 278 | if (reply == string.Empty || reply == null) | 278 | if (string.IsNullOrEmpty(reply)) |
| 279 | return null; | 279 | return null; |
| 280 | 280 | ||
| 281 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( | 281 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( |
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs index 161ca0c..ed41978 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs | |||
| @@ -120,7 +120,7 @@ namespace OpenSim.Groups | |||
| 120 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 120 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
| 121 | if (GroupID != UUID.Zero) | 121 | if (GroupID != UUID.Zero) |
| 122 | sendData["GroupID"] = GroupID.ToString(); | 122 | sendData["GroupID"] = GroupID.ToString(); |
| 123 | if (GroupName != null && GroupName != string.Empty) | 123 | if (!string.IsNullOrEmpty(GroupName)) |
| 124 | sendData["Name"] = GroupsDataUtils.Sanitize(GroupName); | 124 | sendData["Name"] = GroupsDataUtils.Sanitize(GroupName); |
| 125 | 125 | ||
| 126 | sendData["RequestingAgentID"] = RequestingAgentID; | 126 | sendData["RequestingAgentID"] = RequestingAgentID; |