diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index 718a5563e9..3e0955d073 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs @@ -45,7 +45,7 @@ namespace OpenSim.Framework private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent; private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate; - private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; +// private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; private LogOffUser handlerLogOffUser = null; private GetLandData handlerGetLandData = null; diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index ac38ac2971..5d63da7b14 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -351,7 +351,7 @@ namespace OpenSim.Framework private void ReadNiniConfig(IConfigSource source, string name) { - bool creatingNew = false; +// bool creatingNew = false; if (source.Configs.Count == 0) { @@ -368,7 +368,7 @@ namespace OpenSim.Framework source.AddConfig(name); - creatingNew = true; +// creatingNew = true; } if (name == String.Empty) @@ -378,7 +378,7 @@ namespace OpenSim.Framework { source.AddConfig(name); - creatingNew = true; +// creatingNew = true; } IConfig config = source.Configs[name]; @@ -397,15 +397,8 @@ namespace OpenSim.Framework RegionID = new UUID(regionUUID); originRegionID = RegionID; // What IS this?! - - - // Region name - // + RegionName = name; - - - // Region location - // string location = config.GetString("Location", String.Empty); if (location == String.Empty) @@ -421,12 +414,9 @@ namespace OpenSim.Framework // Datastore (is this implemented? Omitted from example!) - // DataStore = config.GetString("Datastore", String.Empty); - // Internal IP - // IPAddress address; if (config.Contains("InternalAddress"))