From bb936d8a2f7fda48a6487691586f8316291e47db Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 17 Nov 2008 08:15:43 +0000
Subject: Correct prim counts for group land. Correct MessageTransferModule
 startup

---
 .../Avatar/InstantMessage/MessageTransferModule.cs  | 21 +++++++++------------
 .../Environment/Modules/World/Land/LandObject.cs    |  5 +++--
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
index 67346ae..278af39 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -53,20 +53,17 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
 
         public void Initialise(Scene scene, IConfigSource config)
         {
-            if (config.Configs["Messaging"] != null)
-            {
-                IConfig cnf = config.Configs["Messaging"];
-                if (cnf != null && cnf.GetString(
-                        "MessageTransferModule", "MessageTransferModule") !=
-                        "MessageTransferModule")
-                    return;
+            IConfig cnf = config.Configs["Messaging"];
+            if (cnf != null && cnf.GetString(
+                    "MessageTransferModule", "MessageTransferModule") !=
+                    "MessageTransferModule")
+                return;
 
-                cnf = config.Configs["Startup"];
-                if (cnf != null)
-                    m_Gridmode = cnf.GetBoolean("gridmode", false);
+            cnf = config.Configs["Startup"];
+            if (cnf != null)
+                m_Gridmode = cnf.GetBoolean("gridmode", false);
 
-                m_Enabled = true;
-            }
+            m_Enabled = true;
 
             lock (m_Scenes)
             {
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 7929b91..27c7014 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -827,8 +827,9 @@ namespace OpenSim.Region.Environment.Modules.World.Land
                 {
                     landData.OwnerPrims += prim_count;
                 }
-                else if (obj.GroupID == landData.GroupID ||
-                         prim_owner  == landData.GroupID)
+                else if ((obj.GroupID == landData.GroupID ||
+                          prim_owner  == landData.GroupID) &&
+                          landData.GroupID != UUID.Zero)
                 {
                     landData.GroupPrims += prim_count;
                 }
-- 
cgit v1.1