Merge branch 'master' into 0.7-post-fixes
commit
462a0f24e9
|
@ -787,8 +787,6 @@ CREATE TABLE `regionwindlight` (
|
|||
PRIMARY KEY (`region_id`)
|
||||
);
|
||||
|
||||
ALTER TABLE estate_settings AUTO_INCREMENT = 100;
|
||||
COMMIT;
|
||||
|
||||
:VERSION 33 #---------------------
|
||||
|
||||
|
|
|
@ -1334,6 +1334,8 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
|
||||
m_regInfo.EstateSettings.Save();
|
||||
}
|
||||
else
|
||||
m_log.ErrorFormat("[SCENE]: Unable to store account. If this simulator is connected to a grid,\n you must create the estate owner account first.");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -2217,15 +2217,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
if (avatar != null && avatar.UUID != m_host.OwnerID)
|
||||
{
|
||||
if (avatar.IsChildAgent == false)
|
||||
{
|
||||
if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null)
|
||||
{
|
||||
result.Add(avatar.UUID);
|
||||
result.Add(avatar.PhysicsActor.Position);
|
||||
result.Add(avatar.AbsolutePosition);
|
||||
result.Add(avatar.Name);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue