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/GroupsServiceHGConnectorModule.cs')
-rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index cff7adf..c3c759e 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | |||
@@ -543,7 +543,6 @@ namespace OpenSim.Groups | |||
543 | List<string> urls = new List<string>(); | 543 | List<string> urls = new List<string>(); |
544 | foreach (GroupMembersData m in members) | 544 | foreach (GroupMembersData m in members) |
545 | { | 545 | { |
546 | UUID userID = UUID.Zero; | ||
547 | if (!m_UserManagement.IsLocalGridUser(m.AgentID)) | 546 | if (!m_UserManagement.IsLocalGridUser(m.AgentID)) |
548 | { | 547 | { |
549 | string gURL = m_UserManagement.GetUserServerURL(m.AgentID, "GroupsServerURI"); | 548 | string gURL = m_UserManagement.GetUserServerURL(m.AgentID, "GroupsServerURI"); |