diff options
author | Dr Scofield | 2008-09-02 12:07:23 +0000 |
---|---|---|
committer | Dr Scofield | 2008-09-02 12:07:23 +0000 |
commit | 109aa00150aea01ba32620b4d965edd459827ff7 (patch) | |
tree | 07699c55770d6f3a3cb220e0320f1aab434f062d /OpenSim/ApplicationPlugins | |
parent | Fix regex for string->int cast to accept leading spaces and a sign (diff) | |
download | opensim-SC_OLD-109aa00150aea01ba32620b4d965edd459827ff7.zip opensim-SC_OLD-109aa00150aea01ba32620b4d965edd459827ff7.tar.gz opensim-SC_OLD-109aa00150aea01ba32620b4d965edd459827ff7.tar.bz2 opensim-SC_OLD-109aa00150aea01ba32620b4d965edd459827ff7.tar.xz |
fix: PostInitialise() not being called on script engines (nasty one that)
cleanup: warnings, readability
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 2 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 535a5ea..c043363 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
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 | } |
57 | 57 | ||
58 | public void Initialise(OpenSimBase openSim) | 58 | public void Initialise(OpenSimBase openSim) |
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 3bd80f5..6691f14 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -416,10 +416,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
416 | scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, | 416 | scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, |
417 | scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); | 417 | scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); |
418 | 418 | ||
419 | // Security risk [and apparently not used] | ||
420 | // if (requestData.ContainsKey("datastore")) | ||
421 | // region.DataStore = (string) requestData["datastore"]; | ||
422 | |||
423 | region.InternalEndPoint = | 419 | region.InternalEndPoint = |
424 | new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0); | 420 | new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0); |
425 | 421 | ||