From 5001f61c08fea2ebfcb2590be69073d04d129d70 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 29 Jan 2010 18:59:41 -0800
Subject: * HGGridConnector is no longer necessary. * Handle logout properly.
This needed an addition to IClientAPI, because of how the logout packet is
currently being handled -- the agent is being removed from the scene before
the different event handlers are executed, which is broken.
---
OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 24 +-
.../Sirikata/ClientStack/SirikataClientView.cs | 23 +-
.../Client/VWoHTTP/ClientStack/VWHClientView.cs | 24 +-
OpenSim/Framework/IClientAPI.cs | 13 +-
.../Region/ClientStack/LindenUDP/LLClientView.cs | 7 +
.../Region/ClientStack/LindenUDP/LLUDPServer.cs | 3 +
.../EntityTransfer/EntityTransferModule.cs | 9 +-
.../EntityTransfer/HGEntityTransferModule.cs | 28 ++-
.../Resources/CoreModulePlugin.addin.xml | 1 -
.../ServiceConnectorsOut/Grid/HGGridConnector.cs | 257 ---------------------
.../Region/Examples/SimpleModule/MyNpcCharacter.cs | 24 +-
.../Server/IRCClientView.cs | 24 +-
.../Region/OptionalModules/World/NPC/NPCAvatar.cs | 23 +-
OpenSim/Tests/Common/Mock/TestClient.cs | 22 +-
bin/config-include/GridHypergrid.ini | 5 +-
bin/config-include/StandaloneHypergrid.ini | 7 +-
16 files changed, 142 insertions(+), 352 deletions(-)
delete mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 2d80d83..3143b6d 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -160,6 +160,12 @@ namespace OpenSim.Client.MXP.ClientStack
}
}
+ public bool IsLoggingOut
+ {
+ get { return false ; }
+ set { }
+ }
+
#endregion
#region Constructors
@@ -1688,15 +1694,15 @@ namespace OpenSim.Client.MXP.ClientStack
}
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
- {
- }
-
- public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
- {
- }
-
- public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
- {
+ {
+ }
+
+ public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
+ {
+ }
+
+ public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
+ {
}
}
}
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 30d1575..dda95a1 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -192,6 +192,11 @@ namespace OpenSim.Client.Sirikata.ClientStack
get { return isActive; }
set { isActive = value; }
}
+ public bool IsLoggingOut
+ {
+ get { return false; }
+ set { }
+ }
public bool SendLogoutPacketWhenClosing
{
@@ -1177,15 +1182,15 @@ namespace OpenSim.Client.Sirikata.ClientStack
}
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
- {
- }
-
- public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
- {
- }
-
- public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
- {
+ {
+ }
+
+ public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
+ {
+ }
+
+ public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
+ {
}
#endregion
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 6a119bd..613da56 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -196,7 +196,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
get { throw new System.NotImplementedException(); }
set { throw new System.NotImplementedException(); }
}
-
+ public bool IsLoggingOut
+ {
+ get { throw new System.NotImplementedException(); }
+ set { throw new System.NotImplementedException(); }
+ }
public bool SendLogoutPacketWhenClosing
{
set { throw new System.NotImplementedException(); }
@@ -1194,15 +1198,15 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
}
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
- {
- }
-
- public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
- {
- }
-
- public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
- {
+ {
+ }
+
+ public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
+ {
+ }
+
+ public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
+ {
}
}
}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 3489af1..062659c 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -826,6 +826,11 @@ namespace OpenSim.Framework
///
bool IsActive { get; set; }
+ ///
+ /// Determines whether the client is logging out or not.
+ ///
+ bool IsLoggingOut { get; set; }
+
bool SendLogoutPacketWhenClosing { set; }
// [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
@@ -1447,10 +1452,10 @@ namespace OpenSim.Framework
void SendUseCachedMuteList();
- void SendMuteListUpdate(string filename);
-
- void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
-
+ void SendMuteListUpdate(string filename);
+
+ void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
+
void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
void KillEndDone();
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ae0bd79..79bea26 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -351,6 +351,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private bool m_SendLogoutPacketWhenClosing = true;
private AgentUpdateArgs lastarg;
private bool m_IsActive = true;
+ private bool m_IsLoggingOut = false;
protected Dictionary m_packetHandlers = new Dictionary();
protected Dictionary m_genericPacketHandlers = new Dictionary(); //PauPaw:Local Generic Message handlers
@@ -414,6 +415,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
get { return m_IsActive; }
set { m_IsActive = value; }
}
+ public bool IsLoggingOut
+ {
+ get { return m_IsLoggingOut; }
+ set { m_IsLoggingOut = value; }
+ }
+
public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
#endregion Properties
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 3c4fa72..2d956fa 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -919,7 +919,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Remove this client from the scene
IClientAPI client;
if (m_scene.TryGetClient(udpClient.AgentID, out client))
+ {
+ client.IsLoggingOut = true;
client.Close();
+ }
}
private void IncomingPacketHandler()
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ee6cb04..53de269 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -268,7 +268,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (sp.ParentID != (uint)0)
sp.StandUp();
- m_log.Debug("XXX HERE 1");
if (!sp.ValidateAttachments())
{
sp.ControllingClient.SendTeleportFailed("Inconsistent attachment state");
@@ -351,7 +350,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// ES makes the client send a UseCircuitCode message to the destination,
// which triggers a bunch of things there.
// So let's wait
- Thread.Sleep(2000);
+ Thread.Sleep(200);
eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
@@ -428,13 +427,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return;
}
- KillEntity(sp.Scene, sp.LocalId);
-
- sp.MakeChildAgent();
// CrossAttachmentsIntoNewRegion is a synchronous call. We shouldn't need to wait after it
CrossAttachmentsIntoNewRegion(finalDestination, sp, true);
+ KillEntity(sp.Scene, sp.LocalId);
+
+ sp.MakeChildAgent();
// Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index fbf8be9..28593fc 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -81,16 +81,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (m_Enabled)
{
scene.RegisterModuleInterface(this);
- scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(OnNewClient);
}
}
protected override void OnNewClient(IClientAPI client)
{
- base.OnNewClient(client);
- client.OnLogout += new Action(OnLogout);
+ client.OnTeleportHomeRequest += TeleportHome;
+ client.OnConnectionClosed += new Action(OnConnectionClosed);
}
+
public override void RegionLoaded(Scene scene)
{
base.RegionLoaded(scene);
@@ -234,18 +234,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return false;
}
- void OnLogout(IClientAPI obj)
+ void OnConnectionClosed(IClientAPI obj)
{
- m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: client {0} logged out in {1}", obj.AgentId, obj.Scene.RegionInfo.RegionName);
- AgentCircuitData aCircuit = ((Scene)(obj.Scene)).AuthenticateHandler.GetAgentCircuitData(obj.CircuitCode);
-
- if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
+ if (obj.IsLoggingOut)
{
- string url = aCircuit.ServiceURLs["HomeURI"].ToString();
- IUserAgentService security = new UserAgentServiceConnector(url);
- security.LogoutAgent(obj.AgentId, obj.SessionId);
- }
+ AgentCircuitData aCircuit = ((Scene)(obj.Scene)).AuthenticateHandler.GetAgentCircuitData(obj.CircuitCode);
+ if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
+ {
+ string url = aCircuit.ServiceURLs["HomeURI"].ToString();
+ IUserAgentService security = new UserAgentServiceConnector(url);
+ security.LogoutAgent(obj.AgentId, obj.SessionId);
+ //m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Sent logout call to UserAgentService @ {0}", url);
+ }
+ else
+ m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: HomeURI not found for agent {0} logout", obj.AgentId);
+ }
}
#endregion
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 0e3739a..e10fa60 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -50,7 +50,6 @@
-
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
deleted file mode 100644
index 67eae87..0000000
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Xml;
-
-
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Hypergrid;
-using OpenSim.Services.Interfaces;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
-using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
-using OpenSim.Server.Base;
-using OpenSim.Framework.Console;
-
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
-{
- public class HGGridConnector : ISharedRegionModule, IGridService
- {
- private static readonly ILog m_log =
- LogManager.GetLogger(
- MethodBase.GetCurrentMethod().DeclaringType);
-
- private bool m_Enabled = false;
- private bool m_Initialized = false;
-
- private Scene m_aScene;
- private Dictionary m_LocalScenes = new Dictionary();
-
- private IGridService m_GridServiceConnector;
-
- #region ISharedRegionModule
-
- public Type ReplaceableInterface
- {
- get { return null; }
- }
-
- public string Name
- {
- get { return "HGGridServicesConnector"; }
- }
-
- public void Initialise(IConfigSource source)
- {
- IConfig moduleConfig = source.Configs["Modules"];
- if (moduleConfig != null)
- {
- string name = moduleConfig.GetString("GridServices", "");
- if (name == Name)
- {
- IConfig gridConfig = source.Configs["GridService"];
- if (gridConfig == null)
- {
- m_log.Error("[HGGRID CONNECTOR]: GridService missing from OpenSim.ini");
- return;
- }
-
-
- InitialiseConnectorModule(source);
-
- m_Enabled = true;
- m_log.Info("[HGGRID CONNECTOR]: HG grid enabled");
- }
- }
- }
-
- private void InitialiseConnectorModule(IConfigSource source)
- {
- IConfig gridConfig = source.Configs["GridService"];
- if (gridConfig == null)
- {
- m_log.Error("[HGGRID CONNECTOR]: GridService missing from OpenSim.ini");
- throw new Exception("Grid connector init error");
- }
-
- string module = gridConfig.GetString("GridServiceConnectorModule", String.Empty);
- if (module == String.Empty)
- {
- m_log.Error("[HGGRID CONNECTOR]: No GridServiceConnectorModule named in section GridService");
- throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
- }
-
- Object[] args = new Object[] { source };
- m_GridServiceConnector = ServerUtils.LoadPlugin(module, args);
-
- }
-
- public void PostInitialise()
- {
- if (m_Enabled)
- ((ISharedRegionModule)m_GridServiceConnector).PostInitialise();
- }
-
- public void Close()
- {
- }
-
- public void AddRegion(Scene scene)
- {
- if (!m_Enabled)
- return;
-
- m_LocalScenes[scene.RegionInfo.RegionHandle] = scene;
- scene.RegisterModuleInterface(this);
-
- ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene);
-
- }
-
- public void RemoveRegion(Scene scene)
- {
- if (m_Enabled)
- {
- m_LocalScenes.Remove(scene.RegionInfo.RegionHandle);
- scene.UnregisterModuleInterface(this);
- ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene);
- }
- }
-
- public void RegionLoaded(Scene scene)
- {
- if (!m_Enabled)
- return;
-
- if (!m_Initialized)
- {
- m_aScene = scene;
-
- m_Initialized = true;
- }
- }
-
- #endregion
-
- #region IGridService
-
- public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
- {
- return m_GridServiceConnector.RegisterRegion(scopeID, regionInfo);
- }
-
- public bool DeregisterRegion(UUID regionID)
- {
- return m_GridServiceConnector.DeregisterRegion(regionID);
- }
-
- public List GetNeighbours(UUID scopeID, UUID regionID)
- {
- // No serving neighbours on hyperliked regions.
- // Just the regular regions.
- return m_GridServiceConnector.GetNeighbours(scopeID, regionID);
- }
-
- public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
- {
- return m_GridServiceConnector.GetRegionByUUID(scopeID, regionID);
- //if (region != null)
- // return region;
-
- //region = m_HypergridService.GetRegionByUUID(regionID);
-
- //return region;
- }
-
- public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
- {
- int snapX = (int) (x / Constants.RegionSize) * (int)Constants.RegionSize;
- int snapY = (int) (y / Constants.RegionSize) * (int)Constants.RegionSize;
-
- GridRegion region = m_GridServiceConnector.GetRegionByPosition(scopeID, x, y);
- //if (region != null)
- // return region;
-
- //region = m_HypergridService.GetRegionByPosition(snapX, snapY);
-
- return region;
- }
-
- public GridRegion GetRegionByName(UUID scopeID, string regionName)
- {
- // Try normal grid first
- GridRegion region = m_GridServiceConnector.GetRegionByName(scopeID, regionName);
- if (region != null)
- return region;
-
- //region = m_HypergridService.GetRegionByName(regionName);
-
- return region;
- }
-
- public List GetRegionsByName(UUID scopeID, string name, int maxNumber)
- {
- if (name == string.Empty)
- return new List();
-
- return m_GridServiceConnector.GetRegionsByName(scopeID, name, maxNumber);
- }
-
- public List GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
- {
- return m_GridServiceConnector.GetRegionRange(scopeID, xmin, xmax, ymin, ymax);
- }
-
- public List GetDefaultRegions(UUID scopeID)
- {
- return m_GridServiceConnector.GetDefaultRegions(scopeID);
- }
-
- public List GetFallbackRegions(UUID scopeID, int x, int y)
- {
- return m_GridServiceConnector.GetFallbackRegions(scopeID, x, y);
- }
-
- public int GetRegionFlags(UUID scopeID, UUID regionID)
- {
- return m_GridServiceConnector.GetRegionFlags(scopeID, regionID);
- }
-
- #endregion
-
-
- }
-}
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 1dfa1b1..fb29353 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -351,7 +351,11 @@ namespace OpenSim.Region.Examples.SimpleModule
get { return true; }
set { }
}
-
+ public bool IsLoggingOut
+ {
+ get { return false; }
+ set { }
+ }
public UUID ActiveGroupId
{
get { return UUID.Zero; }
@@ -1133,15 +1137,15 @@ namespace OpenSim.Region.Examples.SimpleModule
}
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
- {
- }
-
- public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
- {
- }
-
- public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
- {
+ {
+ }
+
+ public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
+ {
+ }
+
+ public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
+ {
}
}
}
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 6785c08..a781a1d 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -627,6 +627,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
set { if (!value) Disconnect("IsActive Disconnected?"); }
}
+ public bool IsLoggingOut
+ {
+ get { return false; }
+ set { }
+ }
+
public bool SendLogoutPacketWhenClosing
{
set { }
@@ -1657,15 +1663,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
- {
- }
-
- public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
- {
- }
-
- public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
- {
+ {
+ }
+
+ public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
+ {
+ }
+
+ public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
+ {
}
}
}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 4a4c515..57ab6ad 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -455,6 +455,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
set { }
}
+ public bool IsLoggingOut
+ {
+ get { return false; }
+ set { }
+ }
public UUID ActiveGroupId
{
get { return UUID.Zero; }
@@ -1138,15 +1143,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
}
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
- {
- }
-
- public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
- {
- }
-
- public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
- {
+ {
+ }
+
+ public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
+ {
+ }
+
+ public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
+ {
}
}
}
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 8b79502..0e32950 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -365,7 +365,11 @@ namespace OpenSim.Tests.Common.Mock
get { return true; }
set { }
}
-
+ public bool IsLoggingOut
+ {
+ get { return false; }
+ set { }
+ }
public UUID ActiveGroupId
{
get { return UUID.Zero; }
@@ -1194,14 +1198,14 @@ namespace OpenSim.Tests.Common.Mock
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
{
- }
-
- public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
- {
- }
-
- public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
- {
+ }
+
+ public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
+ {
+ }
+
+ public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
+ {
}
}
}
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 6c7e32e..015ced0 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -13,7 +13,7 @@
[Modules]
AssetServices = "HGAssetBroker"
InventoryServices = "HGInventoryBroker"
- GridServices = "HGGridServicesConnector"
+ GridServices = "RemoteGridServicesConnector"
AvatarServices = "RemoteAvatarServicesConnector"
NeighbourServices = "RemoteNeighbourServicesConnector"
AuthenticationServices = "RemoteAuthenticationServicesConnector"
@@ -38,10 +38,9 @@
HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
[GridService]
- ; for the HGGridServicesConnector to instantiate
- GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
; which in turn uses this
LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+ AllowHypergridMapSearch = true
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 0f8483b..395537d 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -13,9 +13,9 @@
[Modules]
AssetServices = "HGAssetBroker"
InventoryServices = "HGInventoryBroker"
- NeighbourServices = "RemoteNeighbourServicesConnector"
+ NeighbourServices = "LocalNeighbourServicesConnector"
AuthenticationServices = "LocalAuthenticationServicesConnector"
- GridServices = "HGGridServicesConnector"
+ GridServices = "LocalGridServicesConnector"
PresenceServices = "LocalPresenceServicesConnector"
UserAccountServices = "LocalUserAccountServicesConnector"
SimulationServices = "RemoteSimulationConnectorModule"
@@ -63,9 +63,6 @@
LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
[GridService]
- ; for the HGGridServicesConnector to instantiate
- GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
- AssetService = "OpenSim.Services.AssetService.dll:AssetService"
; LocalGridServicesConnector needs this
LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
Realm = "regions"
--
cgit v1.1