aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs3
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISceneObject.cs27
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs4
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs4
10 files changed, 43 insertions, 19 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 7d4a39c..adafa6c 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -56,7 +56,6 @@ namespace OpenSim
56 { 56 {
57 } 57 }
58 58
59
60 /// <summary> 59 /// <summary>
61 /// Performs initialisation of the scene, such as loading configuration from disk. 60 /// Performs initialisation of the scene, such as loading configuration from disk.
62 /// </summary> 61 /// </summary>
@@ -282,6 +281,7 @@ namespace OpenSim
282 } 281 }
283 */ 282 */
284 283
284 /*
285 private void ReadLinkFromConfig(IConfig config) 285 private void ReadLinkFromConfig(IConfig config)
286 { 286 {
287 RegionInfo regInfo; 287 RegionInfo regInfo;
@@ -311,6 +311,7 @@ namespace OpenSim
311 } 311 }
312 } 312 }
313 } 313 }
314 */
314 315
315 private void LinkRegionCmdUsage() 316 private void LinkRegionCmdUsage()
316 { 317 {
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 3ad7249..5de812c 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Communications.Local
43 43
44 public class LocalLoginService : LoginService 44 public class LocalLoginService : LoginService
45 { 45 {
46 protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 protected NetworkServersInfo serversInfo; 48 protected NetworkServersInfo serversInfo;
49 protected uint defaultHomeX; 49 protected uint defaultHomeX;
diff --git a/OpenSim/Region/Framework/Interfaces/ISceneObject.cs b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
index c713cc3..5b1152c 100644
--- a/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
@@ -1,3 +1,30 @@
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 OpenSimulator 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
1using OpenMetaverse; 28using OpenMetaverse;
2 29
3namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 98b0f97..85b5da0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1054,12 +1054,8 @@ namespace OpenSim.Region.Framework.Scenes
1054 newpos.Y = enterDistance; 1054 newpos.Y = enterDistance;
1055 } 1055 }
1056 1056
1057 Vector3 vel = agent.Velocity;
1058
1059 CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync; 1057 CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync;
1060 d.BeginInvoke(agent, newpos, neighbourx, neighboury, isFlying, CrossAgentToNewRegionCompleted, d); 1058 d.BeginInvoke(agent, newpos, neighbourx, neighboury, isFlying, CrossAgentToNewRegionCompleted, d);
1061
1062
1063 } 1059 }
1064 1060
1065 public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, bool isFlying); 1061 public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, bool isFlying);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 433b74a..1d37e38 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -66,11 +66,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
66 scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000, cm); 66 scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000, cm);
67 scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); 67 scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm);
68 68
69 IRegionModule interregionComms = new RESTInterregionComms(); 69 IRegionModule interregionComms = new RESTInterregionComms();
70 interregionComms.Initialise(scene, new IniConfigSource()); 70 interregionComms.Initialise(scene, new IniConfigSource());
71 interregionComms.Initialise(scene2, new IniConfigSource()); 71 interregionComms.Initialise(scene2, new IniConfigSource());
72 interregionComms.Initialise(scene3, new IniConfigSource()); 72 interregionComms.Initialise(scene3, new IniConfigSource());
73 interregionComms.PostInitialise(); 73 interregionComms.PostInitialise();
74 SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); 74 SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms);
75 SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); 75 SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms);
76 SceneSetupHelpers.SetupSceneModules(scene3, new IniConfigSource(), interregionComms); 76 SceneSetupHelpers.SetupSceneModules(scene3, new IniConfigSource(), interregionComms);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index fc91016..e092334 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
80 80
81 // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used. 81 // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
82 client.TeleportTargetScene = sceneB; 82 client.TeleportTargetScene = sceneB;
83 // Commenting this out for now -- Diva 83 // Commenting this out for now -- Diva
84 //client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40)); 84 //client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
85 85
86 //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB"); 86 //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
93 // "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", 93 // "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/",
94 // Is.EqualTo(client.CapsSeedUrl), 94 // Is.EqualTo(client.CapsSeedUrl),
95 // "Incorrect caps object path set up in sceneB"); 95 // "Incorrect caps object path set up in sceneB");
96 // ---- up to here -- Diva 96 // ---- up to here -- Diva
97 97
98 // This assertion will currently fail since we don't remove the caps paths when no longer needed 98 // This assertion will currently fail since we don't remove the caps paths when no longer needed
99 //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path"); 99 //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
index 63c74e1..dbd84fb 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -66,7 +66,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
66 66
67 #region Static Fields 67 #region Static Fields
68 68
69 protected static readonly ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 69 //private static readonly ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
70 70
71 #endregion Static Fields 71 #endregion Static Fields
72 72
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs
index c68d1cb..f7bef75 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.CoreModules.Scripting.RegionReady
41{ 41{
42 public class RegionReady : IRegionModule 42 public class RegionReady : IRegionModule
43 { 43 {
44 private readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 private IConfig m_config = null; 45 private IConfig m_config = null;
46 private bool m_firstEmptyCompileQueue; 46 private bool m_firstEmptyCompileQueue;
47 private bool m_oarFileLoading; 47 private bool m_oarFileLoading;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index b2981fe..16e0efe 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -837,7 +837,7 @@ namespace OpenSim.Region.Physics.OdePlugin
837 d.Vector3 pos = d.BodyGetPosition(Body); 837 d.Vector3 pos = d.BodyGetPosition(Body);
838 float ground_height = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y); 838 float ground_height = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
839 float target_altitude = ground_height + 3.0f; // This is the min fly height 839 float target_altitude = ground_height + 3.0f; // This is the min fly height
840 if(pos.Z < target_altitude) 840 if (pos.Z < target_altitude)
841 { 841 {
842 vec.Z += (target_altitude - pos.Z) * PID_P * 5.0f; 842 vec.Z += (target_altitude - pos.Z) * PID_P * 5.0f;
843 } 843 }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 0f18be4..ae47636 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1,4 +1,3 @@
1
2/* 1/*
3 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
4 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
@@ -10,7 +9,7 @@
10 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
13 * * Neither the name of the OpenSim Project nor the 12 * * Neither the name of the OpenSimulator Project nor the
14 * names of its contributors may be used to endorse or promote products 13 * names of its contributors may be used to endorse or promote products
15 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
16 * 15 *
@@ -25,6 +24,7 @@
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 26 */
27
28//#define USE_DRAWSTUFF 28//#define USE_DRAWSTUFF
29 29
30using System; 30using System;