diff options
| author | Melanie | 2010-06-04 21:11:15 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-04 21:11:15 +0100 |
| commit | c5878b6610d4a729752fddf15ad6c99c302375a3 (patch) | |
| tree | 12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Region/Framework/Scenes | |
| parent | Change the admin kick message to something more generic, "OpenSim Manager" is... (diff) | |
| parent | bring TestLoadIarV0_1AbsentUsers() back online (diff) | |
| download | opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.zip opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2 opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index ee17fbf..f8591ba 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
| @@ -267,7 +267,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 267 | } | 267 | } |
| 268 | catch (Exception e) | 268 | catch (Exception e) |
| 269 | { | 269 | { |
| 270 | m_log.Error("[SCENE]: SceneBase.cs: Close() - Failed with exception " + e.ToString()); | 270 | m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception ", e)); |
| 271 | } | 271 | } |
| 272 | } | 272 | } |
| 273 | 273 | ||
| @@ -376,7 +376,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 376 | /// <param name="mod"></param> | 376 | /// <param name="mod"></param> |
| 377 | public void RegisterModuleInterface<M>(M mod) | 377 | public void RegisterModuleInterface<M>(M mod) |
| 378 | { | 378 | { |
| 379 | m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M)); | 379 | // m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M)); |
| 380 | 380 | ||
| 381 | List<Object> l = null; | 381 | List<Object> l = null; |
| 382 | if (!ModuleInterfaces.TryGetValue(typeof(M), out l)) | 382 | if (!ModuleInterfaces.TryGetValue(typeof(M), out l)) |