aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-06-14 11:54:40 -0700
committerDiva Canto2010-06-14 11:54:40 -0700
commit462a0f24e914ebb2ee83c361bc2d8ee1b64066a2 (patch)
tree53224deec076bc9186c508ed583bb80783cfa0ed /OpenSim
parentMerge branch 'master' into 0.7-post-fixes (diff)
parent* Deleted duplicated migration that was failing anyway. (diff)
downloadopensim-SC-462a0f24e914ebb2ee83c361bc2d8ee1b64066a2.zip
opensim-SC-462a0f24e914ebb2ee83c361bc2d8ee1b64066a2.tar.gz
opensim-SC-462a0f24e914ebb2ee83c361bc2d8ee1b64066a2.tar.bz2
opensim-SC-462a0f24e914ebb2ee83c361bc2d8ee1b64066a2.tar.xz
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs9
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` (
787 PRIMARY KEY (`region_id`) 787 PRIMARY KEY (`region_id`)
788); 788);
789 789
790ALTER TABLE estate_settings AUTO_INCREMENT = 100;
791COMMIT;
792 790
793:VERSION 33 #--------------------- 791:VERSION 33 #---------------------
794 792
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
1334 m_regInfo.EstateSettings.EstateOwner = account.PrincipalID; 1334 m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
1335 m_regInfo.EstateSettings.Save(); 1335 m_regInfo.EstateSettings.Save();
1336 } 1336 }
1337 else
1338 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.");
1337 } 1339 }
1338 else 1340 else
1339 { 1341 {
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
2218 { 2218 {
2219 if (avatar.IsChildAgent == false) 2219 if (avatar.IsChildAgent == false)
2220 { 2220 {
2221 if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null) 2221 result.Add(avatar.UUID);
2222 { 2222 result.Add(avatar.AbsolutePosition);
2223 result.Add(avatar.UUID); 2223 result.Add(avatar.Name);
2224 result.Add(avatar.PhysicsActor.Position);
2225 result.Add(avatar.Name);
2226 }
2227 } 2224 }
2228 } 2225 }
2229 }); 2226 });