diff options
| author | Dan Lake | 2013-02-06 16:45:47 -0800 |
|---|---|---|
| committer | Dan Lake | 2013-02-06 16:45:47 -0800 |
| commit | 7590ebc934477d0c410cae1bbc40664453d57001 (patch) | |
| tree | abcb69bf2b26d23454a37af8609711376b6f1dee /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | WebStats will now use actual logfile as specified in OpenSim.exe.config rathe... (diff) | |
| parent | minor: add method doc to DAMap.ValidateKey() (diff) | |
| download | opensim-SC_OLD-7590ebc934477d0c410cae1bbc40664453d57001.zip opensim-SC_OLD-7590ebc934477d0c410cae1bbc40664453d57001.tar.gz opensim-SC_OLD-7590ebc934477d0c410cae1bbc40664453d57001.tar.bz2 opensim-SC_OLD-7590ebc934477d0c410cae1bbc40664453d57001.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f5c06df..3c8e199 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -714,7 +714,7 @@ namespace OpenSim | |||
| 714 | 714 | ||
| 715 | return new Scene( | 715 | return new Scene( |
| 716 | regionInfo, circuitManager, sceneGridService, | 716 | regionInfo, circuitManager, sceneGridService, |
| 717 | simDataService, estateDataService, false, | 717 | simDataService, estateDataService, |
| 718 | Config, m_version); | 718 | Config, m_version); |
| 719 | } | 719 | } |
| 720 | 720 | ||