aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-06-14 11:50:42 -0700
committerDiva Canto2010-06-14 11:50:42 -0700
commit9c9ce9e8dd19c887ba91ff9b70f1b0e4f6a3f8df (patch)
tree25d394b855be84ed9440d5f90fd7f099da3f5656
parentosGetAvatarList: Use AbsolutePosition instead of the position of the physics ... (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
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
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 {