diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
Diffstat (limited to 'OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs')
-rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index 3584f78..d2bcba5 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | |||
@@ -47,7 +47,6 @@ namespace OpenSim.Groups | |||
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private HGGroupsService m_GroupsService; | 49 | private HGGroupsService m_GroupsService; |
50 | private string m_HomeURI = string.Empty; | ||
51 | private string m_ConfigName = "Groups"; | 50 | private string m_ConfigName = "Groups"; |
52 | 51 | ||
53 | // Called by Robust shell | 52 | // Called by Robust shell |
@@ -113,7 +112,7 @@ namespace OpenSim.Groups | |||
113 | m_GroupsService = service; | 112 | m_GroupsService = service; |
114 | } | 113 | } |
115 | 114 | ||
116 | public override byte[] Handle(string path, Stream requestData, | 115 | protected override byte[] ProcessRequest(string path, Stream requestData, |
117 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 116 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
118 | { | 117 | { |
119 | StreamReader sr = new StreamReader(requestData); | 118 | StreamReader sr = new StreamReader(requestData); |
@@ -209,7 +208,6 @@ namespace OpenSim.Groups | |||
209 | UUID groupID = new UUID(request["GroupID"].ToString()); | 208 | UUID groupID = new UUID(request["GroupID"].ToString()); |
210 | string agentID = request["AgentID"].ToString(); | 209 | string agentID = request["AgentID"].ToString(); |
211 | string token = request["AccessToken"].ToString(); | 210 | string token = request["AccessToken"].ToString(); |
212 | string reason = string.Empty; | ||
213 | 211 | ||
214 | m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token); | 212 | m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token); |
215 | } | 213 | } |