diff options
author | SignpostMarv | 2012-10-05 15:16:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-29 23:38:58 +0000 |
commit | a68e2fe1692a7611c58f774ac5b94c4298343433 (patch) | |
tree | a26fdba2a74fc1579a9dab1eed79773a4d7567b7 /OpenSim/Region/Framework/Scenes | |
parent | transposing stop sound into sound module (diff) | |
download | opensim-SC-a68e2fe1692a7611c58f774ac5b94c4298343433.zip opensim-SC-a68e2fe1692a7611c58f774ac5b94c4298343433.tar.gz opensim-SC-a68e2fe1692a7611c58f774ac5b94c4298343433.tar.bz2 opensim-SC-a68e2fe1692a7611c58f774ac5b94c4298343433.tar.xz |
transposing preload sound onto sound module
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b333a1a..48615de 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2287,37 +2287,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2287 | ScheduleTerseUpdate(); | 2287 | ScheduleTerseUpdate(); |
2288 | } | 2288 | } |
2289 | 2289 | ||
2290 | public void PreloadSound(string sound) | ||
2291 | { | ||
2292 | // UUID ownerID = OwnerID; | ||
2293 | UUID objectID = ParentGroup.RootPart.UUID; | ||
2294 | UUID soundID = UUID.Zero; | ||
2295 | |||
2296 | if (!UUID.TryParse(sound, out soundID)) | ||
2297 | { | ||
2298 | //Trys to fetch sound id from prim's inventory. | ||
2299 | //Prim's inventory doesn't support non script items yet | ||
2300 | |||
2301 | lock (TaskInventory) | ||
2302 | { | ||
2303 | foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) | ||
2304 | { | ||
2305 | if (item.Value.Name == sound) | ||
2306 | { | ||
2307 | soundID = item.Value.ItemID; | ||
2308 | break; | ||
2309 | } | ||
2310 | } | ||
2311 | } | ||
2312 | } | ||
2313 | |||
2314 | ParentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp) | ||
2315 | { | ||
2316 | if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100)) | ||
2317 | sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID); | ||
2318 | }); | ||
2319 | } | ||
2320 | |||
2321 | public void RemFlag(PrimFlags flag) | 2290 | public void RemFlag(PrimFlags flag) |
2322 | { | 2291 | { |
2323 | // PrimFlags prevflag = Flags; | 2292 | // PrimFlags prevflag = Flags; |