From 00d61145255d08ccd4bcc0e60262cbedabf08476 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 14 Nov 2008 21:06:40 +0000 Subject: * test: Add scene root agent test stub, since I'll be picking up with something else the next time I start coding on OpenSim --- .../Communications/Local/LocalBackEndServices.cs | 11 ++- .../Communications/Local/LocalLoginService.cs | 4 +- .../World/Estate/EstateTerrainXferHandler.cs | 2 - .../Scenes/SceneCommunicationService.cs | 2 +- .../Environment/Scenes/Tests/ScenePresenceTests.cs | 79 ++++++++++++++++++++++ 5 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs (limited to 'OpenSim') diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index ddba124..552f8c3 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs @@ -333,7 +333,7 @@ namespace OpenSim.Region.Communications.Local } /// - /// + /// Tell a region to expect a new client connection. /// /// /// @@ -355,6 +355,14 @@ namespace OpenSim.Region.Communications.Local return false; } + /// + /// Tell a region to expect the crossing in of a new prim. + /// + /// + /// + /// + /// + /// public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod) { if (m_regionListeners.ContainsKey(regionHandle)) @@ -431,7 +439,6 @@ namespace OpenSim.Region.Communications.Local agent.BaseFolder = loginData.BaseFolder; agent.InventoryFolder = loginData.InventoryFolder; agent.startpos = loginData.StartPos; - agent.CapsPath = loginData.CapsPath; TriggerExpectUser(regionHandle, agent); diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 70be635..9caeda4 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs @@ -176,6 +176,7 @@ namespace OpenSim.Region.Communications.Local regionX, regionY, theUser.HomeLocation.X, theUser.HomeLocation.Y, theUser.HomeLocation.Z, theUser.HomeLookAt.X, theUser.HomeLookAt.Y, theUser.HomeLookAt.Z); + m_log.InfoFormat("[LOGIN] Home region of user {0} {1} is not available; using computed region position {2} {3}", theUser.FirstName, theUser.SurName, regionX, regionY); @@ -318,9 +319,6 @@ namespace OpenSim.Region.Communications.Local seedcap = "http://" + regionInfo.ExternalEndPoint.Address.ToString() + ":" + serversInfo.HttpListenerPort + "/CAPS/" + capsPath + "0000/"; } - - - response.SeedCapability = seedcap; //regionInfo.ExternalEndPoint.Address.ToString() + ":" + regionInfo.HttpPort + "/CAPS/" + capsPath + "0000/"; // Notify the target of an incoming user diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs index 9b4e187..6d69443 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs @@ -56,8 +56,6 @@ namespace OpenSim.Region.Environment.Modules.World.Estate public ulong mXferID; private TerrainUploadComplete handlerTerrainUploadDone; - - public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) { diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 830a63d..3948d31 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -264,7 +264,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// Async compnent for informing client of which neighbours exists + /// Async component for informing client of which neighbours exist /// /// /// This needs to run asynchronesously, as a network timeout may block the thread for a long while diff --git a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs new file mode 100644 index 0000000..e1b97e8 --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs @@ -0,0 +1,79 @@ +/* + * 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 OpenSim 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 NUnit.Framework; +using OpenMetaverse; +using OpenSim.Framework; +using OpenSim.Region.Environment.Scenes; + +namespace OpenSim.Region.Environment.Scenes.Tests +{ + /// + /// Scene presence tests + /// + [TestFixture] + public class ScenePresenceTests + { + [SetUp] + public void Init() + { + try + { + log4net.Config.XmlConfigurator.Configure(); + } + catch + { + // I don't care, just leave log4net off + } + } + + /// + /// Test adding a root agent to a scene. Doesn't yet do what it says on the tin. + /// + [Test] + public void TestAddRootAgent() + { + Scene scene = SceneTestUtils.SetupScene(); + + AgentCircuitData agent = new AgentCircuitData(); + agent.AgentID = UUID.Zero; + agent.firstname = "testfirstname"; + agent.lastname = "testlastname"; + agent.SessionID = UUID.Zero; + agent.SecureSessionID = UUID.Zero; + agent.circuitcode = 123; + agent.BaseFolder = UUID.Zero; + agent.InventoryFolder = UUID.Zero; + agent.startpos = Vector3.Zero; + agent.CapsPath = "http://wibble.com"; + + //scene.NewUserConnection(agent); + + // There are going to be more parts to this. + } + } +} -- cgit v1.1