diff options
| author | Diva Canto | 2012-09-15 19:35:33 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-15 19:35:33 -0700 |
| commit | daa4745fb785d30de256f04c763bfd6478ea2238 (patch) | |
| tree | a68b49adb21eb5902f0e3a9687878e6c6db5e014 /OpenSim/Region/ClientStack | |
| parent | More on HG2.0: added the possibility of controlling the appearance that avies... (diff) | |
| parent | BulletSim: update DLLs and SOs and remove some debugging code. (diff) | |
| download | opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.zip opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.tar.gz opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.tar.bz2 opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -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 4672f8a..853b72d 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 = new SceneManager(); | 79 | SceneManager = SceneManager.Instance; |
| 80 | m_clientStackManager = CreateClientStackManager(); | 80 | m_clientStackManager = CreateClientStackManager(); |
| 81 | 81 | ||
| 82 | Initialize(); | 82 | Initialize(); |