diff options
| author | Melanie | 2013-02-06 02:38:30 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-06 02:38:30 +0000 |
| commit | d8c27de39596e1ec18c2e239d552dcc6787f4477 (patch) | |
| tree | 800b96b1146a920faf0b258012942ad9a0341d21 /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.example (diff) | |
| download | opensim-SC_OLD-d8c27de39596e1ec18c2e239d552dcc6787f4477.zip opensim-SC_OLD-d8c27de39596e1ec18c2e239d552dcc6787f4477.tar.gz opensim-SC_OLD-d8c27de39596e1ec18c2e239d552dcc6787f4477.tar.bz2 opensim-SC_OLD-d8c27de39596e1ec18c2e239d552dcc6787f4477.tar.xz | |
Merge branch 'master' into careminster
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 3f7a773..3f63534 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -798,7 +798,7 @@ namespace OpenSim | |||
| 798 | 798 | ||
| 799 | return new Scene( | 799 | return new Scene( |
| 800 | regionInfo, circuitManager, sceneGridService, | 800 | regionInfo, circuitManager, sceneGridService, |
| 801 | simDataService, estateDataService, false, | 801 | simDataService, estateDataService, |
| 802 | Config, m_version); | 802 | Config, m_version); |
| 803 | } | 803 | } |
| 804 | 804 | ||