diff options
| author | Melanie | 2011-05-08 20:20:40 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-08 20:20:40 +0100 |
| commit | 1be67914fab348115faa1fc9e9ecffbf7c303093 (patch) | |
| tree | 7ad4917efae6aebeefa51fe03b1d1aac3e95efcb /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Enable compressed (gzip) fatpack transfers. (diff) | |
| parent | Mantis #5472 (diff) | |
| download | opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.zip opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.gz opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.bz2 opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
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 b537381..49fbe33 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -775,6 +775,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 775 | m_regInfo = regInfo; | 775 | m_regInfo = regInfo; |
| 776 | m_eventManager = new EventManager(); | 776 | m_eventManager = new EventManager(); |
| 777 | 777 | ||
| 778 | m_permissions = new ScenePermissions(this); | ||
| 779 | |||
| 778 | m_lastUpdate = Util.EnvironmentTickCount(); | 780 | m_lastUpdate = Util.EnvironmentTickCount(); |
| 779 | } | 781 | } |
| 780 | 782 | ||