diff options
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 828bbfc..05f9cf9 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -654,7 +654,7 @@ namespace OpenSim.Framework | |||
654 | 654 | ||
655 | private void ReadNiniConfig(IConfigSource source, string name) | 655 | private void ReadNiniConfig(IConfigSource source, string name) |
656 | { | 656 | { |
657 | bool creatingNew = false; | 657 | // bool creatingNew = false; |
658 | 658 | ||
659 | if (source.Configs.Count == 0) | 659 | if (source.Configs.Count == 0) |
660 | { | 660 | { |
@@ -671,7 +671,7 @@ namespace OpenSim.Framework | |||
671 | 671 | ||
672 | source.AddConfig(name); | 672 | source.AddConfig(name); |
673 | 673 | ||
674 | creatingNew = true; | 674 | // creatingNew = true; |
675 | } | 675 | } |
676 | 676 | ||
677 | if (name == String.Empty) | 677 | if (name == String.Empty) |
@@ -681,7 +681,7 @@ namespace OpenSim.Framework | |||
681 | { | 681 | { |
682 | source.AddConfig(name); | 682 | source.AddConfig(name); |
683 | 683 | ||
684 | creatingNew = true; | 684 | // creatingNew = true; |
685 | } | 685 | } |
686 | 686 | ||
687 | IConfig config = source.Configs[name]; | 687 | IConfig config = source.Configs[name]; |
@@ -700,15 +700,8 @@ namespace OpenSim.Framework | |||
700 | 700 | ||
701 | RegionID = new UUID(regionUUID); | 701 | RegionID = new UUID(regionUUID); |
702 | originRegionID = RegionID; // What IS this?! | 702 | originRegionID = RegionID; // What IS this?! |
703 | 703 | ||
704 | |||
705 | // Region name | ||
706 | // | ||
707 | RegionName = name; | 704 | RegionName = name; |
708 | |||
709 | |||
710 | // Region location | ||
711 | // | ||
712 | string location = config.GetString("Location", String.Empty); | 705 | string location = config.GetString("Location", String.Empty); |
713 | 706 | ||
714 | if (location == String.Empty) | 707 | if (location == String.Empty) |
@@ -724,12 +717,9 @@ namespace OpenSim.Framework | |||
724 | 717 | ||
725 | 718 | ||
726 | // Datastore (is this implemented? Omitted from example!) | 719 | // Datastore (is this implemented? Omitted from example!) |
727 | // | ||
728 | DataStore = config.GetString("Datastore", String.Empty); | 720 | DataStore = config.GetString("Datastore", String.Empty); |
729 | 721 | ||
730 | |||
731 | // Internal IP | 722 | // Internal IP |
732 | // | ||
733 | IPAddress address; | 723 | IPAddress address; |
734 | 724 | ||
735 | if (config.Contains("InternalAddress")) | 725 | if (config.Contains("InternalAddress")) |