3 files changed, 20 insertions, 17 deletions

diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
index a42f1dc..3ebbaab 100644
--- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
@@ -30,7 +30,7 @@ using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Interfaces
 {
-    public interface IAvatarFactory : IRegionModule
+    public interface IAvatarFactory 
     {
         bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance);
         void UpdateDatabase(LLUUID userID, AvatarAppearance avatAppearance);
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index ab6b791..08c0a11 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -62,6 +62,13 @@ namespace OpenSim.Region.Environment.Modules
         {
             lock (m_syncInit)
             {
+                if (!m_scenes.Contains(scene))
+                {
+                    m_scenes.Add(scene);
+                    scene.EventManager.OnNewClient += NewClient;
+                    scene.RegisterModuleInterface<ISimChat>(this);
+                }
+
                 // wrap this in a try block so that defaults will work if
                 // the config file doesn't specify otherwise.
                 try
@@ -82,13 +89,6 @@ namespace OpenSim.Region.Environment.Modules
                 {
                 }
 
-                if (!m_scenes.Contains(scene))
-                {
-                    m_scenes.Add(scene);
-                    scene.EventManager.OnNewClient += NewClient;
-                    scene.RegisterModuleInterface<ISimChat>(this);
-                }
-
                 // setup IRC Relay
                 if (m_irc == null) { m_irc = new IRCChatModule(config); }
                 if (m_irc_connector == null)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 2fa0459..7ee0478 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -986,15 +986,18 @@ namespace OpenSim.Region.Environment.Scenes
             if (terrain != null)
             {
                 byte[] data = terrain.WriteJpegImage("defaultstripe.png");
-                m_regInfo.EstateSettings.terrainImageID = LLUUID.Random();
-                AssetBase asset = new AssetBase();
-                asset.FullID = m_regInfo.EstateSettings.terrainImageID;
-                asset.Data = data;
-                asset.Name = "terrainImage";
-                asset.Description = RegionInfo.RegionName;
-                asset.Type = 0;
-                asset.Temporary = temporary;
-                AssetCache.AddAsset(asset);
+                if (data != null)
+                {
+                    m_regInfo.EstateSettings.terrainImageID = LLUUID.Random();
+                    AssetBase asset = new AssetBase();
+                    asset.FullID = m_regInfo.EstateSettings.terrainImageID;
+                    asset.Data = data;
+                    asset.Name = "terrainImage";
+                    asset.Description = RegionInfo.RegionName;
+                    asset.Type = 0;
+                    asset.Temporary = temporary;
+                    AssetCache.AddAsset(asset);
+                }
             }
             
         }