aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs79
3 files changed, 80 insertions, 3 deletions
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
56 public ulong mXferID; 56 public ulong mXferID;
57 private TerrainUploadComplete handlerTerrainUploadDone; 57 private TerrainUploadComplete handlerTerrainUploadDone;
58 58
59
60
61 public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) 59 public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename)
62 { 60 {
63 61
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
264 } 264 }
265 265
266 /// <summary> 266 /// <summary>
267 /// Async compnent for informing client of which neighbours exists 267 /// Async component for informing client of which neighbours exist
268 /// </summary> 268 /// </summary>
269 /// <remarks> 269 /// <remarks>
270 /// This needs to run asynchronesously, as a network timeout may block the thread for a long while 270 /// 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 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using NUnit.Framework;
29using OpenMetaverse;
30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes;
32
33namespace OpenSim.Region.Environment.Scenes.Tests
34{
35 /// <summary>
36 /// Scene presence tests
37 /// </summary>
38 [TestFixture]
39 public class ScenePresenceTests
40 {
41 [SetUp]
42 public void Init()
43 {
44 try
45 {
46 log4net.Config.XmlConfigurator.Configure();
47 }
48 catch
49 {
50 // I don't care, just leave log4net off
51 }
52 }
53
54 /// <summary>
55 /// Test adding a root agent to a scene. Doesn't yet do what it says on the tin.
56 /// </summary>
57 [Test]
58 public void TestAddRootAgent()
59 {
60 Scene scene = SceneTestUtils.SetupScene();
61
62 AgentCircuitData agent = new AgentCircuitData();
63 agent.AgentID = UUID.Zero;
64 agent.firstname = "testfirstname";
65 agent.lastname = "testlastname";
66 agent.SessionID = UUID.Zero;
67 agent.SecureSessionID = UUID.Zero;
68 agent.circuitcode = 123;
69 agent.BaseFolder = UUID.Zero;
70 agent.InventoryFolder = UUID.Zero;
71 agent.startpos = Vector3.Zero;
72 agent.CapsPath = "http://wibble.com";
73
74 //scene.NewUserConnection(agent);
75
76 // There are going to be more parts to this.
77 }
78 }
79}