diff options
author | Jeff Ames | 2008-08-19 02:59:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-19 02:59:27 +0000 |
commit | bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca (patch) | |
tree | 6350036021802eadb2540d14461eb545afd7dea6 /OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |
parent | Attachment persistence!!! Patch #9169 (Mantis #1171) (diff) | |
download | opensim-SC_OLD-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.zip opensim-SC_OLD-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.gz opensim-SC_OLD-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.bz2 opensim-SC_OLD-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 44c12a2..535a5ea 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -49,8 +49,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
49 | public string Version { get { return m_version; } } | 49 | public string Version { get { return m_version; } } |
50 | public string Name { get { return m_name; } } | 50 | public string Name { get { return m_name; } } |
51 | 51 | ||
52 | public void Initialise() | 52 | public void Initialise() |
53 | { | 53 | { |
54 | m_log.Info("[LOADREGIONS]: " + Name + " cannot be default-initialized!"); | 54 | m_log.Info("[LOADREGIONS]: " + Name + " cannot be default-initialized!"); |
55 | throw new PluginNotInitialisedException (Name); | 55 | throw new PluginNotInitialisedException (Name); |
56 | } | 56 | } |
@@ -75,7 +75,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
75 | RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); | 75 | RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); |
76 | 76 | ||
77 | openSim.ModuleLoader.LoadDefaultSharedModules(); | 77 | openSim.ModuleLoader.LoadDefaultSharedModules(); |
78 | 78 | ||
79 | if (!CheckRegionsForSanity(regionsToLoad)) | 79 | if (!CheckRegionsForSanity(regionsToLoad)) |
80 | { | 80 | { |
81 | m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); | 81 | m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); |
@@ -95,10 +95,10 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
95 | 95 | ||
96 | public void Dispose() | 96 | public void Dispose() |
97 | { | 97 | { |
98 | } | 98 | } |
99 | 99 | ||
100 | #endregion | 100 | #endregion |
101 | 101 | ||
102 | /// <summary> | 102 | /// <summary> |
103 | /// Check that region configuration information makes sense. | 103 | /// Check that region configuration information makes sense. |
104 | /// </summary> | 104 | /// </summary> |
@@ -108,43 +108,43 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
108 | { | 108 | { |
109 | if (regions.Length <= 0) | 109 | if (regions.Length <= 0) |
110 | return true; | 110 | return true; |
111 | 111 | ||
112 | List<RegionInfo> checkedRegions = new List<RegionInfo>(); | 112 | List<RegionInfo> checkedRegions = new List<RegionInfo>(); |
113 | checkedRegions.Add(regions[0]); | 113 | checkedRegions.Add(regions[0]); |
114 | 114 | ||
115 | for (int i = 1; i < regions.Length; i++) | 115 | for (int i = 1; i < regions.Length; i++) |
116 | { | 116 | { |
117 | RegionInfo region = regions[i]; | 117 | RegionInfo region = regions[i]; |
118 | 118 | ||
119 | foreach (RegionInfo checkedRegion in checkedRegions) | 119 | foreach (RegionInfo checkedRegion in checkedRegions) |
120 | { | 120 | { |
121 | if (region.RegionID == checkedRegion.RegionID) | 121 | if (region.RegionID == checkedRegion.RegionID) |
122 | { | 122 | { |
123 | m_log.ErrorFormat( | 123 | m_log.ErrorFormat( |
124 | "[LOADREGIONS]: Regions {0} and {1} have the same UUID {2}", | 124 | "[LOADREGIONS]: Regions {0} and {1} have the same UUID {2}", |
125 | region.RegionName, checkedRegion.RegionName, region.RegionID); | 125 | region.RegionName, checkedRegion.RegionName, region.RegionID); |
126 | return false; | 126 | return false; |
127 | } | 127 | } |
128 | else if (region.RegionLocX == checkedRegion.RegionLocX && region.RegionLocY == checkedRegion.RegionLocY) | 128 | else if (region.RegionLocX == checkedRegion.RegionLocX && region.RegionLocY == checkedRegion.RegionLocY) |
129 | { | 129 | { |
130 | m_log.ErrorFormat( | 130 | m_log.ErrorFormat( |
131 | "[LOADREGIONS]: Regions {0} and {1} have the same location {2} {3}", | 131 | "[LOADREGIONS]: Regions {0} and {1} have the same location {2} {3}", |
132 | region.RegionName, checkedRegion.RegionName, region.RegionLocX, region.RegionLocY); | 132 | region.RegionName, checkedRegion.RegionName, region.RegionLocX, region.RegionLocY); |
133 | return false; | 133 | return false; |
134 | } | 134 | } |
135 | else if (region.InternalEndPoint.Port == checkedRegion.InternalEndPoint.Port) | 135 | else if (region.InternalEndPoint.Port == checkedRegion.InternalEndPoint.Port) |
136 | { | 136 | { |
137 | m_log.ErrorFormat( | 137 | m_log.ErrorFormat( |
138 | "[LOADREGIONS]: Regions {0} and {1} have the same internal IP port {2}", | 138 | "[LOADREGIONS]: Regions {0} and {1} have the same internal IP port {2}", |
139 | region.RegionName, checkedRegion.RegionName, region.InternalEndPoint.Port); | 139 | region.RegionName, checkedRegion.RegionName, region.InternalEndPoint.Port); |
140 | return false; | 140 | return false; |
141 | } | 141 | } |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | return true; | 145 | return true; |
146 | } | 146 | } |
147 | 147 | ||
148 | public void LoadRegionFromConfig(OpenSimBase openSim, ulong regionhandle) | 148 | public void LoadRegionFromConfig(OpenSimBase openSim, ulong regionhandle) |
149 | { | 149 | { |
150 | m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); | 150 | m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); |