diff options
author | Diva Canto | 2010-06-14 11:54:40 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-14 11:54:40 -0700 |
commit | 462a0f24e914ebb2ee83c361bc2d8ee1b64066a2 (patch) | |
tree | 53224deec076bc9186c508ed583bb80783cfa0ed /OpenSim/Region/Framework | |
parent | Merge branch 'master' into 0.7-post-fixes (diff) | |
parent | * Deleted duplicated migration that was failing anyway. (diff) | |
download | opensim-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 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
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 | { |