diff options
| author | teravus | 2012-11-15 10:05:16 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 10:05:16 -0500 |
| commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
| tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
| parent | Merge master into teravuswork (diff) | |
| download | opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz | |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 853b72d..4672f8a 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
| @@ -76,7 +76,7 @@ namespace OpenSim.Region.ClientStack | |||
| 76 | 76 | ||
| 77 | protected override void StartupSpecific() | 77 | protected override void StartupSpecific() |
| 78 | { | 78 | { |
| 79 | SceneManager = SceneManager.Instance; | 79 | SceneManager = new SceneManager(); |
| 80 | m_clientStackManager = CreateClientStackManager(); | 80 | m_clientStackManager = CreateClientStackManager(); |
| 81 | 81 | ||
| 82 | Initialize(); | 82 | Initialize(); |