aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-03 23:03:41 +0000
committerJustin Clark-Casey (justincc)2010-03-03 23:03:41 +0000
commit60fde0c83a90211fffb0732ecffe9100424dee33 (patch)
treedc20c0432b89173d65879dbee9b053665e62153a /OpenSim
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-60fde0c83a90211fffb0732ecffe9100424dee33.zip
opensim-SC_OLD-60fde0c83a90211fffb0732ecffe9100424dee33.tar.gz
opensim-SC_OLD-60fde0c83a90211fffb0732ecffe9100424dee33.tar.bz2
opensim-SC_OLD-60fde0c83a90211fffb0732ecffe9100424dee33.tar.xz
minor: remove a couple of compiler warnings
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs18
2 files changed, 5 insertions, 15 deletions
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 718a556..3e0955d 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework
45 private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent; 45 private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
46 private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser 46 private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
47 private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate; 47 private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
48 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; 48// private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
49 private LogOffUser handlerLogOffUser = null; 49 private LogOffUser handlerLogOffUser = null;
50 private GetLandData handlerGetLandData = null; 50 private GetLandData handlerGetLandData = null;
51 51
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ac38ac2..5d63da7 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -351,7 +351,7 @@ namespace OpenSim.Framework
351 351
352 private void ReadNiniConfig(IConfigSource source, string name) 352 private void ReadNiniConfig(IConfigSource source, string name)
353 { 353 {
354 bool creatingNew = false; 354// bool creatingNew = false;
355 355
356 if (source.Configs.Count == 0) 356 if (source.Configs.Count == 0)
357 { 357 {
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
368 368
369 source.AddConfig(name); 369 source.AddConfig(name);
370 370
371 creatingNew = true; 371// creatingNew = true;
372 } 372 }
373 373
374 if (name == String.Empty) 374 if (name == String.Empty)
@@ -378,7 +378,7 @@ namespace OpenSim.Framework
378 { 378 {
379 source.AddConfig(name); 379 source.AddConfig(name);
380 380
381 creatingNew = true; 381// creatingNew = true;
382 } 382 }
383 383
384 IConfig config = source.Configs[name]; 384 IConfig config = source.Configs[name];
@@ -397,15 +397,8 @@ namespace OpenSim.Framework
397 397
398 RegionID = new UUID(regionUUID); 398 RegionID = new UUID(regionUUID);
399 originRegionID = RegionID; // What IS this?! 399 originRegionID = RegionID; // What IS this?!
400 400
401
402 // Region name
403 //
404 RegionName = name; 401 RegionName = name;
405
406
407 // Region location
408 //
409 string location = config.GetString("Location", String.Empty); 402 string location = config.GetString("Location", String.Empty);
410 403
411 if (location == String.Empty) 404 if (location == String.Empty)
@@ -421,12 +414,9 @@ namespace OpenSim.Framework
421 414
422 415
423 // Datastore (is this implemented? Omitted from example!) 416 // Datastore (is this implemented? Omitted from example!)
424 //
425 DataStore = config.GetString("Datastore", String.Empty); 417 DataStore = config.GetString("Datastore", String.Empty);
426 418
427
428 // Internal IP 419 // Internal IP
429 //
430 IPAddress address; 420 IPAddress address;
431 421
432 if (config.Contains("InternalAddress")) 422 if (config.Contains("InternalAddress"))