aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2010-06-16 04:10:55 +0100
committerMelanie2010-06-16 04:10:55 +0100
commit0b75f759b49d11beb49f456c04fa52ee367797a6 (patch)
tree54b7ec0551afd65c9eaf04a3ec5b5e7802c6826e /OpenSim/Region/Framework/Scenes/Scene.cs
parentAdd "alert dialog" for sending dialogs to users from the console (diff)
parent* Support salted and unsalted password hashes in SimianAuthenticationServiceC... (diff)
downloadopensim-SC_OLD-0b75f759b49d11beb49f456c04fa52ee367797a6.zip
opensim-SC_OLD-0b75f759b49d11beb49f456c04fa52ee367797a6.tar.gz
opensim-SC_OLD-0b75f759b49d11beb49f456c04fa52ee367797a6.tar.bz2
opensim-SC_OLD-0b75f759b49d11beb49f456c04fa52ee367797a6.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 82d4759..ef662f3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1362,6 +1362,8 @@ namespace OpenSim.Region.Framework.Scenes
1362 m_regInfo.EstateSettings.EstateOwner = account.PrincipalID; 1362 m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
1363 m_regInfo.EstateSettings.Save(); 1363 m_regInfo.EstateSettings.Save();
1364 } 1364 }
1365 else
1366 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.");
1365 } 1367 }
1366 else 1368 else
1367 { 1369 {