OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct prim counts for group land. Correct MessageTransferModule startup

0.6.1-post-fixes
Melanie Thielker 2008-11-17 08:15:43 +00:00
parent 598316c890
commit bb936d8a2f
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@ -52,8 +52,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
private Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>(); private Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>();
public void Initialise(Scene scene, IConfigSource config) public void Initialise(Scene scene, IConfigSource config)
{
if (config.Configs["Messaging"] != null)
{ {
IConfig cnf = config.Configs["Messaging"]; IConfig cnf = config.Configs["Messaging"];
if (cnf != null && cnf.GetString( if (cnf != null && cnf.GetString(
@ -66,7 +64,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
m_Gridmode = cnf.GetBoolean("gridmode", false); m_Gridmode = cnf.GetBoolean("gridmode", false);
m_Enabled = true; m_Enabled = true;
}
lock (m_Scenes) lock (m_Scenes)
{ {

5
OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
View File

@ -827,8 +827,9 @@ namespace OpenSim.Region.Environment.Modules.World.Land
{ {
landData.OwnerPrims += prim_count; landData.OwnerPrims += prim_count;
} }
else if (obj.GroupID == landData.GroupID || else if ((obj.GroupID == landData.GroupID ||
prim_owner == landData.GroupID) prim_owner == landData.GroupID) &&
landData.GroupID != UUID.Zero)
{ {
landData.GroupPrims += prim_count; landData.GroupPrims += prim_count;
} }