diff options
| author | SignpostMarv | 2012-10-05 14:37:55 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-29 23:38:58 +0000 |
| commit | f4fe8763ad4f4cb85ff38eb65f1138baee74ece1 (patch) | |
| tree | d3a699365588680006cf6e0325f77f0925463c87 | |
| parent | Replacing double-if block in SceneObjectPart.SendSound with Util.Clip (diff) | |
| download | opensim-SC_OLD-f4fe8763ad4f4cb85ff38eb65f1138baee74ece1.zip opensim-SC_OLD-f4fe8763ad4f4cb85ff38eb65f1138baee74ece1.tar.gz opensim-SC_OLD-f4fe8763ad4f4cb85ff38eb65f1138baee74ece1.tar.bz2 opensim-SC_OLD-f4fe8763ad4f4cb85ff38eb65f1138baee74ece1.tar.xz | |
Changing the logic order in the TaskInventory iterator of ScenObjectPart.SendSound, since we can currently have non-unique object inventory names so we should check the asset type first.
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a539eff..681feea 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2701,7 +2701,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2701 | { | 2701 | { |
| 2702 | foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) | 2702 | foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) |
| 2703 | { | 2703 | { |
| 2704 | if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound) | 2704 | if (item.Value.Type == (int)AssetType.Sound && item.Value.Name == sound) |
| 2705 | { | 2705 | { |
| 2706 | soundID = item.Value.ItemID; | 2706 | soundID = item.Value.ItemID; |
| 2707 | break; | 2707 | break; |