mirror of
https://github.com/opensim/opensim.git
synced 2026-08-01 06:06:06 +08:00
Correct prim counts for group land. Correct MessageTransferModule startup
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user