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

minor: remove a couple of compiler warnings

slimupdates
Justin Clark-Casey (justincc) 2010-03-03 23:03:41 +00:00
parent a0b22a9adc
commit 60fde0c83a
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/RegionCommsListener.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Framework
private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent; private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate; private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; // private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
private LogOffUser handlerLogOffUser = null; private LogOffUser handlerLogOffUser = null;
private GetLandData handlerGetLandData = null; private GetLandData handlerGetLandData = null;

18
OpenSim/Framework/RegionInfo.cs
View File

@ -351,7 +351,7 @@ namespace OpenSim.Framework
private void ReadNiniConfig(IConfigSource source, string name) private void ReadNiniConfig(IConfigSource source, string name)
{ {
bool creatingNew = false; // bool creatingNew = false;
if (source.Configs.Count == 0) if (source.Configs.Count == 0)
{ {
@ -368,7 +368,7 @@ namespace OpenSim.Framework
source.AddConfig(name); source.AddConfig(name);
creatingNew = true; // creatingNew = true;
} }
if (name == String.Empty) if (name == String.Empty)
@ -378,7 +378,7 @@ namespace OpenSim.Framework
{ {
source.AddConfig(name); source.AddConfig(name);
creatingNew = true; // creatingNew = true;
} }
IConfig config = source.Configs[name]; IConfig config = source.Configs[name];
@ -397,15 +397,8 @@ namespace OpenSim.Framework
RegionID = new UUID(regionUUID); RegionID = new UUID(regionUUID);
originRegionID = RegionID; // What IS this?! originRegionID = RegionID; // What IS this?!
// Region name
//
RegionName = name; RegionName = name;
// Region location
//
string location = config.GetString("Location", String.Empty); string location = config.GetString("Location", String.Empty);
if (location == String.Empty) if (location == String.Empty)
@ -421,12 +414,9 @@ namespace OpenSim.Framework
// Datastore (is this implemented? Omitted from example!) // Datastore (is this implemented? Omitted from example!)
//
DataStore = config.GetString("Datastore", String.Empty); DataStore = config.GetString("Datastore", String.Empty);
// Internal IP // Internal IP
//
IPAddress address; IPAddress address;
if (config.Contains("InternalAddress")) if (config.Contains("InternalAddress"))