aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2010-06-04 11:00:29 -0700
committerDiva Canto2010-06-04 11:00:29 -0700
commit281eb0c626a840ff2dcf375684dccb72f1a24721 (patch)
treea3498b7460598527d5ea5cc8e5cfab459dd04d8d /OpenSim/Region/Framework/Scenes
parentFixed a couple of buglets in Friendship offers / acceptance / decline when av... (diff)
parentremove estate stuff in sqlite region migrations since this also exists in est... (diff)
downloadopensim-SC_OLD-281eb0c626a840ff2dcf375684dccb72f1a24721.zip
opensim-SC_OLD-281eb0c626a840ff2dcf375684dccb72f1a24721.tar.gz
opensim-SC_OLD-281eb0c626a840ff2dcf375684dccb72f1a24721.tar.bz2
opensim-SC_OLD-281eb0c626a840ff2dcf375684dccb72f1a24721.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs4
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))