diff options
| author | Melanie | 2009-11-21 16:00:18 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-21 16:00:18 +0000 |
| commit | 0844e5951cac40120aa0e4407b79c0f8b171b0ec (patch) | |
| tree | dbf0d59676a46a32d8c9992421c245b3f27e5af2 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'careminster' into tests (diff) | |
| parent | * Hack to get avatar to land on prim. This is a big nasty hack that tricks ... (diff) | |
| download | opensim-SC_OLD-0844e5951cac40120aa0e4407b79c0f8b171b0ec.zip opensim-SC_OLD-0844e5951cac40120aa0e4407b79c0f8b171b0ec.tar.gz opensim-SC_OLD-0844e5951cac40120aa0e4407b79c0f8b171b0ec.tar.bz2 opensim-SC_OLD-0844e5951cac40120aa0e4407b79c0f8b171b0ec.tar.xz | |
Merge branch 'master' into careminster
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 2e15b86..a430b1e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1266,7 +1266,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1266 | // allocations, and there is no more work to be done until someone logs in | 1266 | // allocations, and there is no more work to be done until someone logs in |
| 1267 | GC.Collect(); | 1267 | GC.Collect(); |
| 1268 | 1268 | ||
| 1269 | m_log.DebugFormat("[REGION]: Enabling Logins for {0}", RegionInfo.RegionName); | 1269 | m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); |
| 1270 | loginsdisabled = false; | 1270 | loginsdisabled = false; |
| 1271 | } | 1271 | } |
| 1272 | } | 1272 | } |