diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Tests/Common/Helpers | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Tests/Common/Helpers')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs index cf7583e..e6adcf7 100644 --- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs | |||
@@ -120,4 +120,4 @@ namespace OpenSim.Tests.Common | |||
120 | }; | 120 | }; |
121 | } | 121 | } |
122 | } | 122 | } |
123 | } \ No newline at end of file | 123 | } |
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 1fb1c5c..9ed3eae 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -152,13 +152,22 @@ namespace OpenSim.Tests.Common | |||
152 | 152 | ||
153 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | 153 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); |
154 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | 154 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); |
155 | <<<<<<< HEAD | ||
155 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | 156 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); |
156 | PhysicsScene physicsScene | 157 | PhysicsScene physicsScene |
158 | ======= | ||
159 | Vector3 regionExtent = new Vector3(regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | ||
160 | PhysicsScene physicsScene | ||
161 | >>>>>>> avn/ubitvar | ||
157 | = physicsPluginManager.GetPhysicsScene( | 162 | = physicsPluginManager.GetPhysicsScene( |
158 | "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); | 163 | "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); |
159 | 164 | ||
160 | TestScene testScene = new TestScene( | 165 | TestScene testScene = new TestScene( |
166 | <<<<<<< HEAD | ||
161 | regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null); | 167 | regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null); |
168 | ======= | ||
169 | regInfo, m_acm, physicsScene, scs, m_simDataService, m_estateDataService, configSource, null); | ||
170 | >>>>>>> avn/ubitvar | ||
162 | 171 | ||
163 | INonSharedRegionModule godsModule = new GodsModule(); | 172 | INonSharedRegionModule godsModule = new GodsModule(); |
164 | godsModule.Initialise(new IniConfigSource()); | 173 | godsModule.Initialise(new IniConfigSource()); |
@@ -201,7 +210,11 @@ namespace OpenSim.Tests.Common | |||
201 | testScene.SetModuleInterfaces(); | 210 | testScene.SetModuleInterfaces(); |
202 | 211 | ||
203 | testScene.LandChannel = new TestLandChannel(testScene); | 212 | testScene.LandChannel = new TestLandChannel(testScene); |
213 | <<<<<<< HEAD | ||
204 | testScene.LoadWorldMap(); | 214 | testScene.LoadWorldMap(); |
215 | ======= | ||
216 | testScene.LoadWorldMap(); | ||
217 | >>>>>>> avn/ubitvar | ||
205 | 218 | ||
206 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | 219 | testScene.RegionInfo.EstateSettings = new EstateSettings(); |
207 | testScene.LoginsEnabled = true; | 220 | testScene.LoginsEnabled = true; |