diff options
| author | Melanie | 2012-07-19 09:47:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-19 09:47:51 +0100 |
| commit | 36d744e2a5963d8f3ed33990943aa0ab25832a8b (patch) | |
| tree | ae78b4d8a5db18ad551fbe2157e9abdb7a57ce04 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Fix llSameGroup to work according to specs (diff) | |
| parent | Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled... (diff) | |
| download | opensim-SC-36d744e2a5963d8f3ed33990943aa0ab25832a8b.zip opensim-SC-36d744e2a5963d8f3ed33990943aa0ab25832a8b.tar.gz opensim-SC-36d744e2a5963d8f3ed33990943aa0ab25832a8b.tar.bz2 opensim-SC-36d744e2a5963d8f3ed33990943aa0ab25832a8b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 6ab0027..08c7a58 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1991,7 +1991,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1991 | try | 1991 | try |
| 1992 | { | 1992 | { |
| 1993 | if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart | 1993 | if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart |
| 1994 | m_scene.LoginsDisabled || // We're starting up or doing maintenance, don't mess with things | 1994 | !m_scene.LoginsEnabled || // We're starting up or doing maintenance, don't mess with things |
| 1995 | m_scene.LoadingPrims) // Land may not be valid yet | 1995 | m_scene.LoadingPrims) // Land may not be valid yet |
| 1996 | 1996 | ||
| 1997 | { | 1997 | { |