aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorUbitUmarov2017-05-07 04:21:33 +0100
committerUbitUmarov2017-05-07 04:21:33 +0100
commit11f6d28a0631d7bf96eed220dc58ab0824fb8f57 (patch)
treec2c08d0908e332983284299a6739c8bc0c136078 /OpenSim/Region/OptionalModules
parent merge fix (diff)
parentlet StreamReader be in using statements (diff)
downloadopensim-SC-11f6d28a0631d7bf96eed220dc58ab0824fb8f57.zip
opensim-SC-11f6d28a0631d7bf96eed220dc58ab0824fb8f57.tar.gz
opensim-SC-11f6d28a0631d7bf96eed220dc58ab0824fb8f57.tar.bz2
opensim-SC-11f6d28a0631d7bf96eed220dc58ab0824fb8f57.tar.xz
fix merge
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs5
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs3
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index c0de3d9..a5dc0ad 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -460,9 +460,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
460 460
461 if (resp.ContentLength > 0) 461 if (resp.ContentLength > 0)
462 { 462 {
463 StreamReader content = new StreamReader(resp.GetResponseStream()); 463 using(StreamReader content = new StreamReader(resp.GetResponseStream()))
464 m_log.ErrorFormat("[Concierge] response from {0} content: {1}", bs.Uri, content.ReadToEnd()); 464 m_log.ErrorFormat("[Concierge] response from {0} content: {1}", bs.Uri, content.ReadToEnd());
465 content.Close();
466 } 465 }
467 } 466 }
468 } 467 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index d52a1d5..65d50bb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -901,7 +901,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
901 remoteClient.SendCreateGroupReply(groupID, true, "Group created successfully"); 901 remoteClient.SendCreateGroupReply(groupID, true, "Group created successfully");
902 902
903 // Update the founder with new group information. 903 // Update the founder with new group information.
904 SendAgentGroupDataUpdate(remoteClient, false); 904 SendAgentGroupDataUpdate(remoteClient, true);
905 905
906 return groupID; 906 return groupID;
907 } 907 }
@@ -1520,6 +1520,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1520 lastname, activeGroupPowers, activeGroupName, 1520 lastname, activeGroupPowers, activeGroupName,
1521 activeGroupTitle); 1521 activeGroupTitle);
1522 1522
1523
1523 if (tellOthers) 1524 if (tellOthers)
1524 SendScenePresenceUpdate(agentID, activeGroupTitle); 1525 SendScenePresenceUpdate(agentID, activeGroupTitle);
1525 1526