diff options
| author | Justin Clark-Casey (justincc) | 2010-03-03 23:40:32 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-03-03 23:40:32 +0000 |
| commit | 716e6f20e1393a1968778588ee1d963b42e063fd (patch) | |
| tree | 847821e5123dcecbd8efc3ea0ef67be7a75b4f7b | |
| parent | minor: remove some compiler warnings (diff) | |
| download | opensim-SC_OLD-716e6f20e1393a1968778588ee1d963b42e063fd.zip opensim-SC_OLD-716e6f20e1393a1968778588ee1d963b42e063fd.tar.gz opensim-SC_OLD-716e6f20e1393a1968778588ee1d963b42e063fd.tar.bz2 opensim-SC_OLD-716e6f20e1393a1968778588ee1d963b42e063fd.tar.xz | |
compiler warnings revealed that public PlaySoundSlavePrims properties were changing the wrong protected fields.
correcting these may resolve the sound problems seen recently on the mailing list, though not guaranteed.
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 19144a7..37b4fd6 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -417,8 +417,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 417 | private List<SceneObjectPart> m_PlaySoundSlavePrims = new List<SceneObjectPart>(); | 417 | private List<SceneObjectPart> m_PlaySoundSlavePrims = new List<SceneObjectPart>(); |
| 418 | public List<SceneObjectPart> PlaySoundSlavePrims | 418 | public List<SceneObjectPart> PlaySoundSlavePrims |
| 419 | { | 419 | { |
| 420 | get { return m_LoopSoundSlavePrims; } | 420 | get { return m_PlaySoundSlavePrims; } |
| 421 | set { m_LoopSoundSlavePrims = value; } | 421 | set { m_PlaySoundSlavePrims = value; } |
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | private SceneObjectPart m_LoopSoundMasterPrim = null; | 424 | private SceneObjectPart m_LoopSoundMasterPrim = null; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b8c8d88..10a186e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -568,8 +568,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 568 | private List<SceneObjectPart> m_PlaySoundSlavePrims = new List<SceneObjectPart>(); | 568 | private List<SceneObjectPart> m_PlaySoundSlavePrims = new List<SceneObjectPart>(); |
| 569 | public List<SceneObjectPart> PlaySoundSlavePrims | 569 | public List<SceneObjectPart> PlaySoundSlavePrims |
| 570 | { | 570 | { |
| 571 | get { return m_LoopSoundSlavePrims; } | 571 | get { return m_PlaySoundSlavePrims; } |
| 572 | set { m_LoopSoundSlavePrims = value; } | 572 | set { m_PlaySoundSlavePrims = value; } |
| 573 | } | 573 | } |
| 574 | 574 | ||
| 575 | private SceneObjectPart m_LoopSoundMasterPrim = null; | 575 | private SceneObjectPart m_LoopSoundMasterPrim = null; |