* Added NPCModule and NPCAvatar classes for NPCs. Primitive, but we can grow them out.

* Fix for Scene.Inventory.cs - It assumes every entity at startup is a SceneObjectGroup. (Actually, this shouldn't have compiled[!] without a warning.)
* Fix for LandManager at startup - it assumes there's a land channel when perhaps there isnt. (Bug that needs another refactor to fix. [Mike - I've assigned a ticket to you about this])

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 2e1116b..e8a6c45 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1524,7 +1524,15 @@ namespace OpenSim.Region.Environment.Scenes
 
                 CreateAndAddScenePresence(client, child);
 
-                LandChannel.SendParcelOverlay(client);
+                try
+                {
+                    LandChannel.SendParcelOverlay(client);
+                } //BUG: Mike - please fix this.
+                catch (KeyNotFoundException)
+                {
+                    m_log.Warn("[LAND]: Bug #2 triggered with NPC. LandModule needs a refactor to fix this.");
+                }
+
                 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
             }
         }