diff options
| author | Melanie | 2010-08-10 19:49:35 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-10 19:49:35 +0100 |
| commit | c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928 (patch) | |
| tree | f78ebe5ce10d6b5efa0700e381e751296277b7e6 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Remove 4000+ DOS line endings. Grrr! (diff) | |
| parent | Changing prim color generates event CHANGED_COLOR. (diff) | |
| download | opensim-SC-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.zip opensim-SC-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.tar.gz opensim-SC-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.tar.bz2 opensim-SC-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.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.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 05036f1..7e83634 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1363,7 +1363,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1363 | m_regInfo.EstateSettings.Save(); | 1363 | m_regInfo.EstateSettings.Save(); |
| 1364 | } | 1364 | } |
| 1365 | else | 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."); | 1366 | m_log.ErrorFormat("[SCENE]: Unable to store account. If this simulator is connected to a grid, you must create the estate owner account first."); |
| 1367 | } | 1367 | } |
| 1368 | else | 1368 | else |
| 1369 | { | 1369 | { |