diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs')
-rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs | 4 |
1 files changed, 2 insertions, 2 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( |