984faf24df
Only create a new list to check if objects have reached targets if there actually are any targets.
2012-10-30 01:48:05 +00:00
ff6c69000e
Log warning if mesh/sculpt asset couldn't be found by ODEPrim.MeshAssetReceived() callback.
...
Presumably this is now more useful if the false positive from the old method of loading mesh assets have been eliminated.
2012-10-30 01:40:59 +00:00
4eaa64d863
Merge branch 'avination' into careminster
2012-10-30 01:29:51 +00:00
d15d71a7ef
Put back the collision sound shim into SOP
2012-10-30 01:28:03 +00:00
9bc4dc6c5f
Add method doc to IAssetService.Get(string, object, AssetRetrieved) outlining the situations in which AssetRetrieved may be called back with a null AssetBase.
...
These situations include asset not found and remote service not responding.
2012-10-30 01:19:32 +00:00
cccf695327
Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing exception.
...
In some cases (such as failure to receive response from asset service), it is possible for a null to be returned from IAssetService.Get(string, object, AssetRetrieved).
2012-10-30 01:14:48 +00:00
37de965233
Make MeshAssetReceived private.
...
Keep methods private unless they need to be opened up to external callers. Reduces analysis complexity.
2012-10-30 01:08:00 +00:00
aeeed29d62
correct ODEPrim.MeshAssetReveived -> MeshAssetReceived
2012-10-30 01:07:14 +00:00
48569e856a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-30 01:02:20 +00:00
a09cba6da3
refactoring to use assembly:classname style of configuration
2012-10-29 23:39:01 +00:00
a16ddbee41
Renaming module back to SoundModule as the hypothetical plan was to make another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless.
2012-10-29 23:39:01 +00:00
e308841de9
SianaGearz notes stop sound flag is 1 << 5, so using that for ISoundModule.StopSound rather than setting gain to zero
2012-10-29 23:39:01 +00:00
e0b5a3cd90
tweaking configuration logic so that the INonSharedRegionModule will load by default
2012-10-29 23:39:01 +00:00
2bb0419251
documenting some params on ISoundModule methods
2012-10-29 23:39:01 +00:00
dcac2a7f71
refactoring llCollisionSound to use new KeyOrName method
2012-10-29 23:39:01 +00:00
a9999a9676
Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint
2012-10-29 23:39:01 +00:00
56965dd959
fixing poorly-formatted xml doc string for Util.IsInsideBox
2012-10-29 23:39:00 +00:00
ef15711089
refactoring llTriggerSoundLimited to not use the LSL methods, since that will cause unnecessary calls to m_host.AddScriptLPS(1)
2012-10-29 23:39:00 +00:00
af9dc483e9
refactoring llGetPos() to take advantage of implicit converter
2012-10-29 23:39:00 +00:00
f9923d4423
shifting from two instances of typecasting to one instance of typecasting in llTriggerSoundLimited
2012-10-29 23:39:00 +00:00
c796f7861e
80-character width terminal formatting of recent commits to llPlaySound, llPlaySoundSlave, llTriggerSound and llTriggerSoundLimited
2012-10-29 23:39:00 +00:00
c5af16aef8
shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string
2012-10-29 23:39:00 +00:00
5abcecc735
moving SendSound from SceneObjectPart to ISoundModule
2012-10-29 23:39:00 +00:00
af39af1cc4
fixing a bug in SceneObjectPart.SendSound where sounds would always come from the root prim rather than the source prim
2012-10-29 23:39:00 +00:00
57940087d1
Factoring out a superfluous local variable & repeated assignment in SceneObjectPart.SendSound as linksets are only meant to have a single owner
2012-10-29 23:38:59 +00:00
e75596524a
Formatting SoundModuleNonShared.LoopSound, consistent indentation
2012-10-29 23:38:59 +00:00
9df510157e
deduplicating code into a single LoopSound method
2012-10-29 23:38:59 +00:00
22693304fb
removing superfluous lines from SceneObjectPart.SendSound
2012-10-29 23:38:59 +00:00
3d8f59aac3
refactoring StopSound into a private static method to skip repeating m_scene.TryGetSceneObjectPart
2012-10-29 23:38:59 +00:00
e5df8cafb8
Removing a locked iteration over SceneObjectGroup.LoopSoundSlavePrims as the SL Wiki spec does not state that slaves are set to match master values
2012-10-29 23:38:59 +00:00
d7ffcace8f
adjusting parameter order of PreloadSound to be more logical
2012-10-29 23:38:59 +00:00
29a8ae48b5
transposing LoopSoundMaster to Sound Module
2012-10-29 23:38:59 +00:00
a68e2fe169
transposing preload sound onto sound module
2012-10-29 23:38:58 +00:00
8763a637b5
transposing stop sound into sound module
2012-10-29 23:38:58 +00:00
206a694c6b
moving comment for llStopSound inside the method block prior to transposition to sound module
2012-10-29 23:38:58 +00:00
b9e0f1cd2b
documenting ISoundModule methods & fields
2012-10-29 23:38:58 +00:00
d4034271eb
formatting ISoundModule prior to documentation
2012-10-29 23:38:58 +00:00
1c618843b8
formatting changes to SceneObjectPart.SendSound; consistent indentation
2012-10-29 23:38:58 +00:00
32db725dd7
SceneObjectPart.SendSound can exit early if a sound module was not found.
2012-10-29 23:38:58 +00:00
f4fe8763ad
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.
2012-10-29 23:38:58 +00:00
b42cfe49a2
Replacing double-if block in SceneObjectPart.SendSound with Util.Clip
2012-10-29 23:38:57 +00:00
6440892788
TryGetScenePresence in TriggerSound is probably meant to be using the ownerID, not the objectID
2012-10-29 23:38:57 +00:00
516ee244b4
swapping GetSceneObjectPart for TryGetSceneObjectPart in PlayAttachedSound to imply why we're doing an early return.
2012-10-29 23:38:57 +00:00
1d47bcb6b6
stripping whitespace from ISoundModule, formatting SoundModuleNonShared.cs
2012-10-29 23:38:57 +00:00
20be6a4b48
refactoring thisSpGain in PlayAttachedSound as it was previously using two typecasts in the assignment and had the assignment on a separate line to the declaration
2012-10-29 23:38:57 +00:00
6bd1f0f209
Factoring out an if-else block in PlayAttachedSound as it was using the previously hard-coded max distance value.
2012-10-29 23:38:57 +00:00
375fb66589
making the max distance for sounds to be heard from their origin a configurable option exposed via a public field on ISoundModule (with private setter in the implementation)
2012-10-29 23:38:57 +00:00
ed162a10be
Converting the ISoundModule implementation from an IRegionModule to an INonSharedRegionModule
2012-10-29 23:38:57 +00:00
7560010f34
Immediately setting gain to zero as a workaround for code not stopping sound started by llPlaySound
2012-10-29 23:38:56 +00:00
09f4e72d6a
Fix memory leak where removing an NPC did not remove its circuits.
...
This was because we were removing by circuitcode where NPCs have no code.
Now removing by agent ID instead.
This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
2012-10-29 23:22:40 +00:00
Justin Clark-Casey (justincc)