diff options
author | Justin Clarke Casey | 2008-10-31 18:39:51 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-31 18:39:51 +0000 |
commit | 269303d97d96b1deeabd610389ca2bdb17c2b7d9 (patch) | |
tree | 84d6902977d745e5e9e934fa830d4da06b6f8a10 /OpenSim/Region/Environment/Scenes | |
parent | * Enables PrimitiveBaseShape to be used inside a libOpenMV project by adding ... (diff) | |
download | opensim-SC_OLD-269303d97d96b1deeabd610389ca2bdb17c2b7d9.zip opensim-SC_OLD-269303d97d96b1deeabd610389ca2bdb17c2b7d9.tar.gz opensim-SC_OLD-269303d97d96b1deeabd610389ca2bdb17c2b7d9.tar.bz2 opensim-SC_OLD-269303d97d96b1deeabd610389ca2bdb17c2b7d9.tar.xz |
* test: Add basic scene test which merely instantiates the scene right now
* set debug scene name on scene registration, rather than within the Scene constructor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs | 61 |
3 files changed, 64 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 0dd89ae..f411a7f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -273,7 +273,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
273 | m_authenticateHandler = authen; | 273 | m_authenticateHandler = authen; |
274 | CommsManager = commsMan; | 274 | CommsManager = commsMan; |
275 | m_sceneGridService = sceneGridService; | 275 | m_sceneGridService = sceneGridService; |
276 | m_sceneGridService.debugRegionName = regInfo.RegionName; | ||
277 | m_storageManager = storeManager; | 276 | m_storageManager = storeManager; |
278 | AssetCache = assetCach; | 277 | AssetCache = assetCach; |
279 | m_regInfo = regInfo; | 278 | m_regInfo = regInfo; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 447cd6f..b716980 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -76,19 +76,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
76 | private GetLandData handlerGetLandData = null; // OnGetLandData | 76 | private GetLandData handlerGetLandData = null; // OnGetLandData |
77 | 77 | ||
78 | public KiPrimitiveDelegate KiPrimitive; | 78 | public KiPrimitiveDelegate KiPrimitive; |
79 | public string _debugRegionName = String.Empty; | ||
80 | |||
81 | public string debugRegionName | ||
82 | { | ||
83 | get { return _debugRegionName; } | ||
84 | set { _debugRegionName = value; } | ||
85 | } | ||
86 | 79 | ||
87 | public SceneCommunicationService(CommunicationsManager commsMan) | 80 | public SceneCommunicationService(CommunicationsManager commsMan) |
88 | { | 81 | { |
89 | m_commsProvider = commsMan; | 82 | m_commsProvider = commsMan; |
90 | m_commsProvider.GridService.gdebugRegionName = _debugRegionName; | ||
91 | m_commsProvider.InterRegion.rdebugRegionName = _debugRegionName; | ||
92 | } | 83 | } |
93 | 84 | ||
94 | /// <summary> | 85 | /// <summary> |
@@ -99,13 +90,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
99 | public void RegisterRegion(RegionInfo regionInfos) | 90 | public void RegisterRegion(RegionInfo regionInfos) |
100 | { | 91 | { |
101 | m_regionInfo = regionInfos; | 92 | m_regionInfo = regionInfos; |
93 | m_commsProvider.GridService.gdebugRegionName = regionInfos.RegionName; | ||
94 | m_commsProvider.InterRegion.rdebugRegionName = regionInfos.RegionName; | ||
102 | regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo); | 95 | regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo); |
103 | 96 | ||
104 | if (regionCommsHost != null) | 97 | if (regionCommsHost != null) |
105 | { | 98 | { |
106 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got" + regionCommsHost.ToString()); | 99 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got" + regionCommsHost.ToString()); |
107 | 100 | ||
108 | regionCommsHost.debugRegionName = _debugRegionName; | 101 | regionCommsHost.debugRegionName = regionInfos.RegionName; |
109 | regionCommsHost.OnExpectPrim += IncomingPrimCrossing; | 102 | regionCommsHost.OnExpectPrim += IncomingPrimCrossing; |
110 | regionCommsHost.OnExpectUser += NewUserConnection; | 103 | regionCommsHost.OnExpectUser += NewUserConnection; |
111 | regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing; | 104 | regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing; |
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs new file mode 100644 index 0000000..94dfd75 --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs | |||
@@ -0,0 +1,61 @@ | |||
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 | |||
28 | using System; | ||
29 | using Nini.Config; | ||
30 | using NUnit.Framework; | ||
31 | using OpenSim.Framework; | ||
32 | using OpenSim.Framework.Communications; | ||
33 | using OpenSim.Region.Environment.Scenes; | ||
34 | |||
35 | namespace OpenSim.Region.Environment.Scenes.Tests | ||
36 | { | ||
37 | /// <summary> | ||
38 | /// Scene oriented tests | ||
39 | /// </summary> | ||
40 | [TestFixture] | ||
41 | public class SceneTests | ||
42 | { | ||
43 | [Test] | ||
44 | public void TestAddSceneObject() | ||
45 | { | ||
46 | //System.Console.WriteLine("Hello mum!"); | ||
47 | |||
48 | RegionInfo regInfo = new RegionInfo(1000, 1000, null, null); | ||
49 | regInfo.RegionName = "Unit test region"; | ||
50 | AgentCircuitManager acm = new AgentCircuitManager(); | ||
51 | //CommunicationsManager cm = new CommunicationsManager(null, null, null, false, null); | ||
52 | CommunicationsManager cm = null; | ||
53 | //SceneCommunicationService scs = new SceneCommunicationService(cm); | ||
54 | SceneCommunicationService scs = null; | ||
55 | StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); | ||
56 | IConfigSource configSource = new IniConfigSource(); | ||
57 | |||
58 | new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); | ||
59 | } | ||
60 | } | ||
61 | } \ No newline at end of file | ||