diff options
| author | Melanie | 2011-05-08 20:23:06 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-08 20:23:06 +0100 |
| commit | b451cc1ebb9e950bb93e790ab9e83aff30a47c61 (patch) | |
| tree | c9fbe41be36cf791976f9e5afabd44f69b64e747 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Enable compressed (gzip) fatpack transfers. (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.zip opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.gz opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.bz2 opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.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, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 758a2eb..0d7894f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -802,6 +802,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 802 | m_regInfo = regInfo; | 802 | m_regInfo = regInfo; |
| 803 | m_eventManager = new EventManager(); | 803 | m_eventManager = new EventManager(); |
| 804 | 804 | ||
| 805 | m_permissions = new ScenePermissions(this); | ||
| 806 | |||
| 805 | m_lastUpdate = Util.EnvironmentTickCount(); | 807 | m_lastUpdate = Util.EnvironmentTickCount(); |
| 806 | } | 808 | } |
| 807 | 809 | ||