aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-17 08:15:43 +0000
committerMelanie Thielker2008-11-17 08:15:43 +0000
commitbb936d8a2f7fda48a6487691586f8316291e47db (patch)
tree3f4e8c35d642161f771dc2ced5a9898071557c91
parentMake object chat come from the root prim's center, rather than trying to make (diff)
downloadopensim-SC_OLD-bb936d8a2f7fda48a6487691586f8316291e47db.zip
opensim-SC_OLD-bb936d8a2f7fda48a6487691586f8316291e47db.tar.gz
opensim-SC_OLD-bb936d8a2f7fda48a6487691586f8316291e47db.tar.bz2
opensim-SC_OLD-bb936d8a2f7fda48a6487691586f8316291e47db.tar.xz
Correct prim counts for group land. Correct MessageTransferModule startup
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs21
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs5
2 files changed, 12 insertions, 14 deletions
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
53 53
54 public void Initialise(Scene scene, IConfigSource config) 54 public void Initialise(Scene scene, IConfigSource config)
55 { 55 {
56 if (config.Configs["Messaging"] != null) 56 IConfig cnf = config.Configs["Messaging"];
57 { 57 if (cnf != null && cnf.GetString(
58 IConfig cnf = config.Configs["Messaging"]; 58 "MessageTransferModule", "MessageTransferModule") !=
59 if (cnf != null && cnf.GetString( 59 "MessageTransferModule")
60 "MessageTransferModule", "MessageTransferModule") != 60 return;
61 "MessageTransferModule")
62 return;
63 61
64 cnf = config.Configs["Startup"]; 62 cnf = config.Configs["Startup"];
65 if (cnf != null) 63 if (cnf != null)
66 m_Gridmode = cnf.GetBoolean("gridmode", false); 64 m_Gridmode = cnf.GetBoolean("gridmode", false);
67 65
68 m_Enabled = true; 66 m_Enabled = true;
69 }
70 67
71 lock (m_Scenes) 68 lock (m_Scenes)
72 { 69 {
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
827 { 827 {
828 landData.OwnerPrims += prim_count; 828 landData.OwnerPrims += prim_count;
829 } 829 }
830 else if (obj.GroupID == landData.GroupID || 830 else if ((obj.GroupID == landData.GroupID ||
831 prim_owner == landData.GroupID) 831 prim_owner == landData.GroupID) &&
832 landData.GroupID != UUID.Zero)
832 { 833 {
833 landData.GroupPrims += prim_count; 834 landData.GroupPrims += prim_count;
834 } 835 }