Commit Graph

22085 Commits (65e3bd93e9018d6709ce9406bbe25d1d84017d12)

Author SHA1 Message Date
SignpostMarv d4034271eb formatting ISoundModule prior to documentation 2012-10-29 23:38:58 +00:00
SignpostMarv 1c618843b8 formatting changes to SceneObjectPart.SendSound; consistent indentation 2012-10-29 23:38:58 +00:00
SignpostMarv 32db725dd7 SceneObjectPart.SendSound can exit early if a sound module was not found. 2012-10-29 23:38:58 +00:00
SignpostMarv 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
SignpostMarv b42cfe49a2 Replacing double-if block in SceneObjectPart.SendSound with Util.Clip 2012-10-29 23:38:57 +00:00
SignpostMarv 6440892788 TryGetScenePresence in TriggerSound is probably meant to be using the ownerID, not the objectID 2012-10-29 23:38:57 +00:00
SignpostMarv 516ee244b4 swapping GetSceneObjectPart for TryGetSceneObjectPart in PlayAttachedSound to imply why we're doing an early return. 2012-10-29 23:38:57 +00:00
SignpostMarv 1d47bcb6b6 stripping whitespace from ISoundModule, formatting SoundModuleNonShared.cs 2012-10-29 23:38:57 +00:00
SignpostMarv 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
SignpostMarv 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
SignpostMarv 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
SignpostMarv ed162a10be Converting the ISoundModule implementation from an IRegionModule to an INonSharedRegionModule 2012-10-29 23:38:57 +00:00
SignpostMarv 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
Justin Clark-Casey (justincc) 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) 5681e812a5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-29 23:19:06 +00:00
Justin Clark-Casey (justincc) c97890ca69 Add "force gc" region console command which manually invokes garbage collection.
For debugging purposes.
2012-10-29 22:53:06 +00:00
Melanie 5b0fc60296 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
2012-10-28 18:58:43 +00:00
Melanie 502efdb894 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-28 18:43:28 +00:00
Melanie 5a96ef52cb Deep copy the collection of at_target objects so it can't be modified while
it's being iterated
2012-10-28 18:41:47 +00:00
Melanie dc2c198e5d Set the script state to new rez when a scriptis saved, rather than region start.
Prevents CHANGED_REGION_RESTART being sent to scripts when saving.
2012-10-28 19:09:14 +01:00
Melanie 1a34f42426 Add a property to determine if a link set is stored in the database. Also, fix
a bug where "Force object permissive" god action would fail to reset child prim
permissions.
2012-10-28 18:34:57 +01:00
Melanie 0d00b97aec Deep copy the collection of at_target objects so it can't be modified while
it's being iterated
2012-10-28 18:45:16 +00:00
ubit 707fa2bdb9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 15:42:51 +01:00
UbitUmarov db7f4074b5 revert last change 2012-10-28 14:39:04 +00:00
ubit 1bcecdaf30 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 15:34:54 +01:00
UbitUmarov fbe4ec8ee0 fix ode timing 2012-10-28 14:32:55 +00:00
ubit c513a3db59 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 15:05:39 +01:00
UbitUmarov dd0323d89e minor change 2012-10-28 14:04:39 +00:00
ubit 42479590f0 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 12:56:09 +01:00
UbitUmarov 8bb2905416 test limit ode exec time by time not number of loops done 2012-10-28 11:55:11 +00:00
ubit e0510203f9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 11:26:31 +01:00
UbitUmarov ad7f273d95 more debug 2012-10-28 10:25:58 +00:00
ubit 3aff65e9a6 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 10:58:58 +01:00
UbitUmarov e297e90bda remove pre physics build testing 2012-10-28 09:57:41 +00:00
ubit 3ac8461d3f Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 10:54:40 +01:00
UbitUmarov aa97014ee4 Add some extra debug on scene close 2012-10-28 09:51:27 +00:00
Melanie 42cd27c46a Merge branch 'master' into careminster 2012-10-28 00:30:55 +01:00
Justin Clark-Casey (justincc) 3531f29a6a minor: Fix verbose IAR save message to make it a bit clearer that item data is being saved at that point, not asset data. 2012-10-27 00:24:25 +01:00
Justin Clark-Casey (justincc) cc204497e0 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-26 23:10:52 +01:00
Justin Clark-Casey (justincc) 67432fcbf2 Fix "save iar" hanging permanently if the asset request phase times out.
Unlike "save oar", this was happening on the same thread as the original request.
The timeout happens on another so the original thread is never aborted.
On "save oar" this leaves the thread hanging (still bad) but on "save iar" it left the console thread hanging.
Temporary fix is to make "save iar" do asset request on a separate thread, like "save oar".
Longer term fix will be to restructure asset save to use a ManualResetEvent rather than a separate timeout timer.
2012-10-26 23:08:59 +01:00
Melanie f3f794a122 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-26 21:47:41 +01:00
Melanie 1c5f6e48b8 Separate LSL's notion of the default anim from the actually playing anims. 2012-10-26 21:23:20 +01:00
Melanie de6f147d3c Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is"
This reverts commit fa484c3494.
2012-10-26 21:16:27 +01:00
Melanie 26cc57b6ca Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
Justin Clark-Casey (justincc) 16809bd0ea minor: Make the error thrown logged when a simulator in grid mode is trying to set estate owner to a user that doesn't exist a little more obvious. 2012-10-26 02:36:58 +01:00
SignpostMarv 80dcc13af2 refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field with a private setter 2012-10-26 02:08:00 +01:00
SignpostMarv e977761071 adding ability for listeners to be filtered by regular expressions and a general-purpose function to see if a given string matches a given regex 2012-10-26 02:08:00 +01:00
SignpostMarv 18b1ee6f37 Formatting and casing correction in WorldCommModule, trailing new line in OSSL to get git diff to not complain 2012-10-26 02:08:00 +01:00
Justin Clark-Casey (justincc) 1b3b7a61ac minor: Add comment as to why we are pulcking plain old ints out of the LSL_List when converting values from LSL for modInvoke() 2012-10-26 01:50:46 +01:00
SignpostMarv ecdb88679e Removing the apparently superfluous explicit namespace reference so that the if-else-if-else block in ConvertFromLSL can have a consistent appearance 2012-10-26 01:43:54 +01:00