diff options
author | lbsa71 | 2009-03-10 20:06:25 +0000 |
---|---|---|
committer | lbsa71 | 2009-03-10 20:06:25 +0000 |
commit | 63a5a0194554fa52d8e3dd135afb711b14888460 (patch) | |
tree | f93876f4df00812928e98b6e1e91c729c1116221 /OpenSim/ApplicationPlugins/LoadRegions | |
parent | * Cleanup and CCC (Code Convention Conformance) (diff) | |
download | opensim-SC_OLD-63a5a0194554fa52d8e3dd135afb711b14888460.zip opensim-SC_OLD-63a5a0194554fa52d8e3dd135afb711b14888460.tar.gz opensim-SC_OLD-63a5a0194554fa52d8e3dd135afb711b14888460.tar.bz2 opensim-SC_OLD-63a5a0194554fa52d8e3dd135afb711b14888460.tar.xz |
* Cleanup and CCC (Code Convention Conformance)
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index db89ea9..a470f04 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -38,7 +38,6 @@ using OpenSim.Region.CoreModules.Avatar.InstantMessage; | |||
38 | using OpenSim.Region.CoreModules.Scripting.DynamicTexture; | 38 | using OpenSim.Region.CoreModules.Scripting.DynamicTexture; |
39 | using OpenSim.Region.CoreModules.Scripting.LoadImageURL; | 39 | using OpenSim.Region.CoreModules.Scripting.LoadImageURL; |
40 | using OpenSim.Region.CoreModules.Scripting.XMLRPC; | 40 | using OpenSim.Region.CoreModules.Scripting.XMLRPC; |
41 | using OpenSim.Framework.Servers; | ||
42 | 41 | ||
43 | namespace OpenSim.ApplicationPlugins.LoadRegions | 42 | namespace OpenSim.ApplicationPlugins.LoadRegions |
44 | { | 43 | { |
@@ -52,11 +51,18 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
52 | #region IApplicationPlugin Members | 51 | #region IApplicationPlugin Members |
53 | 52 | ||
54 | // TODO: required by IPlugin, but likely not at all right | 53 | // TODO: required by IPlugin, but likely not at all right |
55 | string m_name = "LoadRegionsPlugin"; | 54 | private string m_name = "LoadRegionsPlugin"; |
56 | string m_version = "0.0"; | 55 | private string m_version = "0.0"; |
57 | 56 | ||
58 | public string Version { get { return m_version; } } | 57 | public string Version |
59 | public string Name { get { return m_name; } } | 58 | { |
59 | get { return m_version; } | ||
60 | } | ||
61 | |||
62 | public string Name | ||
63 | { | ||
64 | get { return m_name; } | ||
65 | } | ||
60 | 66 | ||
61 | protected OpenSimBase m_openSim; | 67 | protected OpenSimBase m_openSim; |
62 | 68 | ||
@@ -106,7 +112,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
106 | for (int i = 0; i < regionsToLoad.Length; i++) | 112 | for (int i = 0; i < regionsToLoad.Length; i++) |
107 | { | 113 | { |
108 | IScene scene; | 114 | IScene scene; |
109 | m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + Thread.CurrentThread.ManagedThreadId.ToString() + | 115 | m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + |
116 | Thread.CurrentThread.ManagedThreadId.ToString() + | ||
110 | ")"); | 117 | ")"); |
111 | m_openSim.CreateRegion(regionsToLoad[i], true, out scene); | 118 | m_openSim.CreateRegion(regionsToLoad[i], true, out scene); |
112 | if (scene != null) | 119 | if (scene != null) |
@@ -151,22 +158,23 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
151 | if (region.RegionID == checkedRegion.RegionID) | 158 | if (region.RegionID == checkedRegion.RegionID) |
152 | { | 159 | { |
153 | m_log.ErrorFormat( | 160 | m_log.ErrorFormat( |
154 | "[LOADREGIONS]: Regions {0} and {1} have the same UUID {2}", | 161 | "[LOADREGIONS]: Regions {0} and {1} have the same UUID {2}", |
155 | region.RegionName, checkedRegion.RegionName, region.RegionID); | 162 | region.RegionName, checkedRegion.RegionName, region.RegionID); |
156 | return false; | 163 | return false; |
157 | } | 164 | } |
158 | else if (region.RegionLocX == checkedRegion.RegionLocX && region.RegionLocY == checkedRegion.RegionLocY) | 165 | else if (region.RegionLocX == checkedRegion.RegionLocX && |
166 | region.RegionLocY == checkedRegion.RegionLocY) | ||
159 | { | 167 | { |
160 | m_log.ErrorFormat( | 168 | m_log.ErrorFormat( |
161 | "[LOADREGIONS]: Regions {0} and {1} have the same location {2} {3}", | 169 | "[LOADREGIONS]: Regions {0} and {1} have the same location {2} {3}", |
162 | region.RegionName, checkedRegion.RegionName, region.RegionLocX, region.RegionLocY); | 170 | region.RegionName, checkedRegion.RegionName, region.RegionLocX, region.RegionLocY); |
163 | return false; | 171 | return false; |
164 | } | 172 | } |
165 | else if (region.InternalEndPoint.Port == checkedRegion.InternalEndPoint.Port) | 173 | else if (region.InternalEndPoint.Port == checkedRegion.InternalEndPoint.Port) |
166 | { | 174 | { |
167 | m_log.ErrorFormat( | 175 | m_log.ErrorFormat( |
168 | "[LOADREGIONS]: Regions {0} and {1} have the same internal IP port {2}", | 176 | "[LOADREGIONS]: Regions {0} and {1} have the same internal IP port {2}", |
169 | region.RegionName, checkedRegion.RegionName, region.InternalEndPoint.Port); | 177 | region.RegionName, checkedRegion.RegionName, region.InternalEndPoint.Port); |
170 | return false; | 178 | return false; |
171 | } | 179 | } |
172 | } | 180 | } |
@@ -205,4 +213,4 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
205 | } | 213 | } |
206 | } | 214 | } |
207 | } | 215 | } |
208 | } | 216 | } \ No newline at end of file |