OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* remove mono compiler warnings 

* should work - the last compile failure looks like a random glitch...
0.6.1-post-fixes
Justin Clarke Casey 2008-12-17 18:42:23 +00:00
parent b37c8d6cbd
commit ff7c8551ba
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -71,7 +71,7 @@ namespace OpenSim.Region.Environment.Scenes
private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
private RegionUp handlerRegionUp = null; // OnRegionUp; private RegionUp handlerRegionUp = null; // OnRegionUp;
private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar; //private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;
private LogOffUser handlerLogOffUser = null; private LogOffUser handlerLogOffUser = null;
private GetLandData handlerGetLandData = null; // OnGetLandData private GetLandData handlerGetLandData = null; // OnGetLandData
@ -904,10 +904,10 @@ namespace OpenSim.Region.Environment.Scenes
return currentNeighbours.FindAll(delegate(ulong handle) { return !previousNeighbours.Contains(handle); }); return currentNeighbours.FindAll(delegate(ulong handle) { return !previousNeighbours.Contains(handle); });
} }
private List<ulong> CommonNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours) // private List<ulong> CommonNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
{ // {
return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); }); // return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); });
} // }
private List<ulong> OldNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours) private List<ulong> OldNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
{ {
@ -985,17 +985,17 @@ namespace OpenSim.Region.Environment.Scenes
return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber); return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber);
} }
private void Dump(string msg, List<ulong> handles) // private void Dump(string msg, List<ulong> handles)
{ // {
Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg); // Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg);
foreach (ulong handle in handles) // foreach (ulong handle in handles)
{ // {
uint x, y; // uint x, y;
Utils.LongToUInts(handle, out x, out y); // Utils.LongToUInts(handle, out x, out y);
x = x / Constants.RegionSize; // x = x / Constants.RegionSize;
y = y / Constants.RegionSize; // y = y / Constants.RegionSize;
Console.WriteLine("({0}, {1})", x, y); // Console.WriteLine("({0}, {1})", x, y);
} // }
} // }
} }
} }

4
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -1932,7 +1932,6 @@ namespace OpenSim.Region.Environment.Scenes
#region Overridden Methods #region Overridden Methods
int x = 0;
public override void Update() public override void Update()
{ {
SendPrimUpdates(); SendPrimUpdates();
@ -2436,7 +2435,8 @@ namespace OpenSim.Region.Environment.Scenes
// Next, let's close the child agent connections that are too far away. // Next, let's close the child agent connections that are too far away.
CloseChildAgents(neighbourx, neighboury); CloseChildAgents(neighbourx, neighboury);
AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo(); //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
m_controllingClient.RequestClientInfo();
//Console.WriteLine("BEFORE CROSS"); //Console.WriteLine("BEFORE CROSS");
//Scene.DumpChildrenSeeds(UUID); //Scene.DumpChildrenSeeds(UUID);

4
OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
View File

@ -67,11 +67,11 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
private List<BasicActor> _actors = new List<BasicActor>(); private List<BasicActor> _actors = new List<BasicActor>();
private float[] _heightMap; private float[] _heightMap;
string sceneIdentifier; //protected internal string sceneIdentifier;
public BasicScene(string _sceneIdentifier) public BasicScene(string _sceneIdentifier)
{ {
sceneIdentifier = _sceneIdentifier; //sceneIdentifier = _sceneIdentifier;
} }
public override void Initialise(IMesher meshmerizer, IConfigSource config) public override void Initialise(IMesher meshmerizer, IConfigSource config)

4
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
View File

@ -493,11 +493,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin
public IMesher mesher; public IMesher mesher;
// private IConfigSource m_config; // private IConfigSource m_config;
String identifier; // protected internal String identifier;
public BulletXScene(String sceneIdentifier) public BulletXScene(String sceneIdentifier)
{ {
identifier = sceneIdentifier; //identifier = sceneIdentifier;
} }
public static float Gravity public static float Gravity

4
OpenSim/Region/Physics/POSPlugin/POSScene.cs
View File

@ -41,11 +41,11 @@ namespace OpenSim.Region.Physics.POSPlugin
private float[] _heightMap; private float[] _heightMap;
private const float gravity = -9.8f; private const float gravity = -9.8f;
string sceneIdentifier; //protected internal string sceneIdentifier;
public POSScene(String _sceneIdentifier) public POSScene(String _sceneIdentifier)
{ {
sceneIdentifier = _sceneIdentifier; //sceneIdentifier = _sceneIdentifier;
} }
public override void Initialise(IMesher meshmerizer, IConfigSource config) public override void Initialise(IMesher meshmerizer, IConfigSource config)

4
OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
View File

@ -78,10 +78,10 @@ namespace OpenSim.Region.Physics.PhysXPlugin
private NxPhysicsSDK mySdk; private NxPhysicsSDK mySdk;
private NxScene scene; private NxScene scene;
string sceneIdentifier; // protected internal string sceneIdentifier;
public PhysXScene(string _sceneIdentifier) public PhysXScene(string _sceneIdentifier)
{ {
sceneIdentifier = _sceneIdentifier; //sceneIdentifier = _sceneIdentifier;
mySdk = NxPhysicsSDK.CreateSDK(); mySdk = NxPhysicsSDK.CreateSDK();
Console.WriteLine("Sdk created - now creating scene"); Console.WriteLine("Sdk created - now creating scene");