OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* test: Add scene root agent test stub, since I'll be picking up with something else the next time I start coding on OpenSim

0.6.1-post-fixes
Justin Clarke Casey 2008-11-14 21:06:40 +00:00
parent a760586f26
commit 00d6114525
5 changed files with 90 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@ -333,7 +333,7 @@ namespace OpenSim.Region.Communications.Local
}
/// <summary>
///
/// Tell a region to expect a new client connection.
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="agentData"></param>
@ -355,6 +355,14 @@ namespace OpenSim.Region.Communications.Local
return false;
}
/// <summary>
/// Tell a region to expect the crossing in of a new prim.
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="primID"></param>
/// <param name="objData"></param>
/// <param name="XMLMethod"></param>
/// <returns></returns>
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);

4
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@ -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

2
OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs
View File

@ -56,8 +56,6 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
public ulong mXferID;
private TerrainUploadComplete handlerTerrainUploadDone;
public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename)
{

2
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -264,7 +264,7 @@ namespace OpenSim.Region.Environment.Scenes
}
/// <summary>
/// Async compnent for informing client of which neighbours exists
/// Async component for informing client of which neighbours exist
/// </summary>
/// <remarks>
/// This needs to run asynchronesously, as a network timeout may block the thread for a long while

79
OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs Normal file
View File

@ -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
{
/// <summary>
/// Scene presence tests
/// </summary>
[TestFixture]
public class ScenePresenceTests
{
[SetUp]
public void Init()
{
try
{
log4net.Config.XmlConfigurator.Configure();
}
catch
{
// I don't care, just leave log4net off
}
}
/// <summary>
/// Test adding a root agent to a scene. Doesn't yet do what it says on the tin.
/// </summary>
[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.
}
}
}