From ff7c8551bab7c8a5b7a075c8899c8aeb51035b67 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 17 Dec 2008 18:42:23 +0000 Subject: [PATCH] * remove mono compiler warnings * should work - the last compile failure looks like a random glitch... --- .../Scenes/SceneCommunicationService.cs | 34 +++++++++---------- .../Environment/Scenes/ScenePresence.cs | 4 +-- .../BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 4 +-- .../Physics/BulletXPlugin/BulletXPlugin.cs | 4 +-- OpenSim/Region/Physics/POSPlugin/POSScene.cs | 4 +-- .../Region/Physics/PhysXPlugin/PhysXPlugin.cs | 4 +-- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 10b0759430..b533bb7fab 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -71,7 +71,7 @@ namespace OpenSim.Region.Environment.Scenes private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; private RegionUp handlerRegionUp = null; // OnRegionUp; private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; - private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar; + //private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar; private LogOffUser handlerLogOffUser = null; private GetLandData handlerGetLandData = null; // OnGetLandData @@ -904,10 +904,10 @@ namespace OpenSim.Region.Environment.Scenes return currentNeighbours.FindAll(delegate(ulong handle) { return !previousNeighbours.Contains(handle); }); } - private List CommonNeighbours(List currentNeighbours, List previousNeighbours) - { - return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); }); - } +// private List CommonNeighbours(List currentNeighbours, List previousNeighbours) +// { +// return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); }); +// } private List OldNeighbours(List currentNeighbours, List previousNeighbours) { @@ -985,17 +985,17 @@ namespace OpenSim.Region.Environment.Scenes return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber); } - private void Dump(string msg, List handles) - { - Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg); - foreach (ulong handle in handles) - { - uint x, y; - Utils.LongToUInts(handle, out x, out y); - x = x / Constants.RegionSize; - y = y / Constants.RegionSize; - Console.WriteLine("({0}, {1})", x, y); - } - } +// private void Dump(string msg, List handles) +// { +// Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg); +// foreach (ulong handle in handles) +// { +// uint x, y; +// Utils.LongToUInts(handle, out x, out y); +// x = x / Constants.RegionSize; +// y = y / Constants.RegionSize; +// Console.WriteLine("({0}, {1})", x, y); +// } +// } } } diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index c0779f259c..8f6872ee5f 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -1932,7 +1932,6 @@ namespace OpenSim.Region.Environment.Scenes #region Overridden Methods - int x = 0; public override void Update() { SendPrimUpdates(); @@ -2436,7 +2435,8 @@ namespace OpenSim.Region.Environment.Scenes // Next, let's close the child agent connections that are too far away. CloseChildAgents(neighbourx, neighboury); - AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo(); + //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo(); + m_controllingClient.RequestClientInfo(); //Console.WriteLine("BEFORE CROSS"); //Scene.DumpChildrenSeeds(UUID); diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs index 3673302b2d..010d9d3aba 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs @@ -67,11 +67,11 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin private List _actors = new List(); private float[] _heightMap; - string sceneIdentifier; + //protected internal string sceneIdentifier; public BasicScene(string _sceneIdentifier) { - sceneIdentifier = _sceneIdentifier; + //sceneIdentifier = _sceneIdentifier; } public override void Initialise(IMesher meshmerizer, IConfigSource config) diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 8f5ffd8c96..29a19de229 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs @@ -493,11 +493,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin public IMesher mesher; // private IConfigSource m_config; - String identifier; + // protected internal String identifier; public BulletXScene(String sceneIdentifier) { - identifier = sceneIdentifier; + //identifier = sceneIdentifier; } public static float Gravity diff --git a/OpenSim/Region/Physics/POSPlugin/POSScene.cs b/OpenSim/Region/Physics/POSPlugin/POSScene.cs index 43af72dbe3..44a105dbf8 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSScene.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSScene.cs @@ -41,11 +41,11 @@ namespace OpenSim.Region.Physics.POSPlugin private float[] _heightMap; private const float gravity = -9.8f; - string sceneIdentifier; + //protected internal string sceneIdentifier; public POSScene(String _sceneIdentifier) { - sceneIdentifier = _sceneIdentifier; + //sceneIdentifier = _sceneIdentifier; } public override void Initialise(IMesher meshmerizer, IConfigSource config) diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index a7ee26d1f7..fa59dbeca4 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs @@ -78,10 +78,10 @@ namespace OpenSim.Region.Physics.PhysXPlugin private NxPhysicsSDK mySdk; private NxScene scene; - string sceneIdentifier; + // protected internal string sceneIdentifier; public PhysXScene(string _sceneIdentifier) { - sceneIdentifier = _sceneIdentifier; + //sceneIdentifier = _sceneIdentifier; mySdk = NxPhysicsSDK.CreateSDK(); Console.WriteLine("Sdk created - now creating scene");