aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorSean Dague2008-04-21 12:42:56 +0000
committerSean Dague2008-04-21 12:42:56 +0000
commitbf1580fba45df7624180b07599c8170074500c99 (patch)
tree696a69c94554f0789b123c82fb34c658e9a0b6af /OpenSim/Framework
parent* Various refactorings. (diff)
downloadopensim-SC_OLD-bf1580fba45df7624180b07599c8170074500c99.zip
opensim-SC_OLD-bf1580fba45df7624180b07599c8170074500c99.tar.gz
opensim-SC_OLD-bf1580fba45df7624180b07599c8170074500c99.tar.bz2
opensim-SC_OLD-bf1580fba45df7624180b07599c8170074500c99.tar.xz
From: Dr Scofield <hud@zurich.ibm.com>
the attached patch set is centered around RemoteAdminPlugin and focuses mainly on making it more robust (i.e. more parameter checking and better error reporting) but also we've re-implemented the LoadTerrain stuff that got disabled during the terrain code reworking: * missing PostInitialize() calls on region modules that were loaded for regions created via RemoteAdmin's CreateRegion XmlRpc call * re-implements RemoteAdmin's LoadTerrain XmlRpc call (probably lost during the TerrainModule rework) * adds lots more parameter checking and error reporting to RemoteAdmin * adds a read-only property to RegionApplicationBase so that we can access the CommsManager * adds Exceptions to TerrainModule so that we get better error case feedback (and can report more meaningful errors in turn) * adds a CheckForTerrainUpdate() call to TerrainModule.LoadFromFile() to make terrain changes effective * adds TryGetCurrentScene(LLUUID) to SceneManager so that we can retrieve Scenes not only by name but also by LLUUID cheers, dr scofield
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs4
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs2
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index 3e3ae16..f101131 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -44,6 +44,10 @@ namespace OpenSim.Region.Capabilities
44 private uint m_httpListenerPort; 44 private uint m_httpListenerPort;
45 45
46 /// <summary></summary> 46 /// <summary></summary>
47 /// CapsHandlers is a cap handler container but also takes
48 /// care of adding and removing cap handlers to and from the
49 /// supplied BaseHttpServer.
50 /// </summary>
47 /// <param name="httpListener">base HTTP server</param> 51 /// <param name="httpListener">base HTTP server</param>
48 /// <param name="httpListenerHostname">host name of the HTTP 52 /// <param name="httpListenerHostname">host name of the HTTP
49 /// server</param> 53 /// server</param>
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index cfaaf02..0c01c5a 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
63 63
64 if (configFiles.Length == 0) 64 if (configFiles.Length == 0)
65 { 65 {
66 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"),false); 66 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"), false);
67 configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); 67 configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
68 } 68 }
69 69