diff options
| author | Melanie | 2012-12-16 21:19:30 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-16 21:19:30 +0000 |
| commit | 0a876a305c32e52d7d0b437c8246119227fce51c (patch) | |
| tree | 59772311fcbaf528749b3b9661b252d99f0776ba /OpenSim/Region/CoreModules/World | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make WebStatsModule properly handle scenes added or removed after initial sta... (diff) | |
| download | opensim-SC_OLD-0a876a305c32e52d7d0b437c8246119227fce51c.zip opensim-SC_OLD-0a876a305c32e52d7d0b437c8246119227fce51c.tar.gz opensim-SC_OLD-0a876a305c32e52d7d0b437c8246119227fce51c.tar.bz2 opensim-SC_OLD-0a876a305c32e52d7d0b437c8246119227fce51c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 089fcda..883045a 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | |||
| @@ -76,7 +76,7 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
| 76 | 76 | ||
| 77 | public void RemoveRegion(Scene scene) | 77 | public void RemoveRegion(Scene scene) |
| 78 | { | 78 | { |
| 79 | m_scene.EventManager.OnClientLogin -= OnNewClient; | 79 | m_scene.EventManager.OnNewClient -= OnNewClient; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | public void RegionLoaded(Scene scene) | 82 | public void RegionLoaded(Scene scene) |
| @@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
| 85 | return; | 85 | return; |
| 86 | 86 | ||
| 87 | m_scene = scene; | 87 | m_scene = scene; |
| 88 | m_scene.EventManager.OnClientLogin += OnNewClient; | 88 | m_scene.EventManager.OnNewClient += OnNewClient; |
| 89 | 89 | ||
| 90 | m_scene.RegisterModuleInterface<ISoundModule>(this); | 90 | m_scene.RegisterModuleInterface<ISoundModule>(this); |
| 91 | } | 91 | } |