aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
diff options
context:
space:
mode:
authorAdam Frisby2009-04-09 13:03:27 +0000
committerAdam Frisby2009-04-09 13:03:27 +0000
commit03984e7304df152f5b415e38c314e39b7a551dc7 (patch)
tree14ed1fde266ea01ea1eedbce9fb46eb88befe2a3 /OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
parent* Forgot to commit IEntity in last commit. (diff)
downloadopensim-SC_OLD-03984e7304df152f5b415e38c314e39b7a551dc7.zip
opensim-SC_OLD-03984e7304df152f5b415e38c314e39b7a551dc7.tar.gz
opensim-SC_OLD-03984e7304df152f5b415e38c314e39b7a551dc7.tar.bz2
opensim-SC_OLD-03984e7304df152f5b415e38c314e39b7a551dc7.tar.xz
* Added additional debug testing info to Scene
* Corrected issue with MRMs where it would attempt to overwrite an already loaded DLL. (and thus fail with cryptic UnauthorizedAccessException.) * Made DrunkenTextAppreciationModule.cs MRM not crash with StackOverflowException * Added some temporary logging to MRM World.*
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
index e3553bf..802d984 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
@@ -26,7 +26,10 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using log4net;
29using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Client;
30using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
32 35
@@ -34,6 +37,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
34{ 37{
35 public class World : IWorld 38 public class World : IWorld
36 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41
37 private readonly Scene m_internalScene; 42 private readonly Scene m_internalScene;
38 private readonly Heightmap m_heights; 43 private readonly Heightmap m_heights;
39 44
@@ -100,7 +105,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
100 return; 105 return;
101 } 106 }
102 // Avatar? 107 // Avatar?
103 if (chat.SenderObject != null && chat.SenderObject == null) 108 if (chat.Sender != null && chat.SenderObject == null)
104 { 109 {
105 ChatEventArgs e = new ChatEventArgs(); 110 ChatEventArgs e = new ChatEventArgs();
106 e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID); 111 e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID);