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

Merge branch 'master' into 0.7-post-fixes

0.7-release
Diva Canto 2010-06-14 11:54:40 -07:00
parent c75b94f9f9 9c9ce9e8dd
commit 462a0f24e9
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/MySQL/Resources/RegionStore.migrations
View File

@ -787,8 +787,6 @@ CREATE TABLE `regionwindlight` (
PRIMARY KEY (`region_id`) PRIMARY KEY (`region_id`)
); );
ALTER TABLE estate_settings AUTO_INCREMENT = 100;
COMMIT;
:VERSION 33 #--------------------- :VERSION 33 #---------------------

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1334,6 +1334,8 @@ namespace OpenSim.Region.Framework.Scenes
m_regInfo.EstateSettings.EstateOwner = account.PrincipalID; m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
m_regInfo.EstateSettings.Save(); 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 else
{ {

5
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -2217,15 +2217,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (avatar != null && avatar.UUID != m_host.OwnerID) if (avatar != null && avatar.UUID != m_host.OwnerID)
{ {
if (avatar.IsChildAgent == false) if (avatar.IsChildAgent == false)
{
if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null)
{ {
result.Add(avatar.UUID); result.Add(avatar.UUID);
result.Add(avatar.PhysicsActor.Position); result.Add(avatar.AbsolutePosition);
result.Add(avatar.Name); result.Add(avatar.Name);
} }
} }
}
}); });
return result; return result;
} }