diff options
author | Diva Canto | 2010-06-14 11:50:42 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-14 11:50:42 -0700 |
commit | 9c9ce9e8dd19c887ba91ff9b70f1b0e4f6a3f8df (patch) | |
tree | 25d394b855be84ed9440d5f90fd7f099da3f5656 /OpenSim | |
parent | osGetAvatarList: Use AbsolutePosition instead of the position of the physics ... (diff) | |
download | opensim-SC-9c9ce9e8dd19c887ba91ff9b70f1b0e4f6a3f8df.zip opensim-SC-9c9ce9e8dd19c887ba91ff9b70f1b0e4f6a3f8df.tar.gz opensim-SC-9c9ce9e8dd19c887ba91ff9b70f1b0e4f6a3f8df.tar.bz2 opensim-SC-9c9ce9e8dd19c887ba91ff9b70f1b0e4f6a3f8df.tar.xz |
* Deleted duplicated migration that was failing anyway.
* Added an error message in initial estate owner creation that makes it clear what needs to happen.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
2 files changed, 2 insertions, 2 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 | ||
790 | ALTER TABLE estate_settings AUTO_INCREMENT = 100; | ||
791 | COMMIT; | ||
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 | { |