Merge branch 'master' into 0.7-post-fixes

3 files changed, 5 insertions, 8 deletions

diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index bdb3558..3f644f9 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -787,8 +787,6 @@ CREATE TABLE `regionwindlight` (
   PRIMARY KEY (`region_id`)
 );
 
-ALTER TABLE estate_settings AUTO_INCREMENT = 100;
-COMMIT;
 
 :VERSION 33                     #---------------------
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2ff611e..e2ab643 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -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
                 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index cd6d3a3..01b64eb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2218,12 +2218,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     if (avatar.IsChildAgent == false)
                     {
-                        if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null)
-                        {
-                            result.Add(avatar.UUID);
-                            result.Add(avatar.PhysicsActor.Position);
-                            result.Add(avatar.Name);
-                        }
+                        result.Add(avatar.UUID);
+                        result.Add(avatar.AbsolutePosition);
+                        result.Add(avatar.Name);
                     }
                 }
             });