SignpostMarv
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
SignpostMarv
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
SignpostMarv
e75596524a
Formatting SoundModuleNonShared.LoopSound, consistent indentation
2012-10-29 23:38:59 +00:00
SignpostMarv
9df510157e
deduplicating code into a single LoopSound method
2012-10-29 23:38:59 +00:00
SignpostMarv
22693304fb
removing superfluous lines from SceneObjectPart.SendSound
2012-10-29 23:38:59 +00:00
SignpostMarv
3d8f59aac3
refactoring StopSound into a private static method to skip repeating m_scene.TryGetSceneObjectPart
2012-10-29 23:38:59 +00:00
SignpostMarv
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
SignpostMarv
d7ffcace8f
adjusting parameter order of PreloadSound to be more logical
2012-10-29 23:38:59 +00:00
SignpostMarv
29a8ae48b5
transposing LoopSoundMaster to Sound Module
2012-10-29 23:38:59 +00:00
SignpostMarv
a68e2fe169
transposing preload sound onto sound module
2012-10-29 23:38:58 +00:00
SignpostMarv
8763a637b5
transposing stop sound into sound module
2012-10-29 23:38:58 +00:00
SignpostMarv
206a694c6b
moving comment for llStopSound inside the method block prior to transposition to sound module
2012-10-29 23:38:58 +00:00
SignpostMarv
b9e0f1cd2b
documenting ISoundModule methods & fields
2012-10-29 23:38:58 +00:00
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
UbitUmarov
db7f4074b5
revert last change
2012-10-28 14:39:04 +00:00
UbitUmarov
fbe4ec8ee0
fix ode timing
2012-10-28 14:32:55 +00:00
UbitUmarov
dd0323d89e
minor change
2012-10-28 14:04:39 +00:00
UbitUmarov
8bb2905416
test limit ode exec time by time not number of loops done
2012-10-28 11:55:11 +00:00
UbitUmarov
ad7f273d95
more debug
2012-10-28 10:25:58 +00:00
UbitUmarov
e297e90bda
remove pre physics build testing
2012-10-28 09:57:41 +00: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
SignpostMarv
01972cc9e8
system ints can end up in LSL lists, which can cause counter-intuitive unknown list element type errors in ConvertFromLSL (via modInvoke)
2012-10-26 01:43:53 +01:00
Justin Clark-Casey (justincc)
2fb89b5aac
Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations since the call itself does nothing and the return value is ignored by all callers.
...
This is a very old method (+4 years) so is probably confusing code cruft.
2012-10-26 01:15:16 +01:00
Oren Hurvitz
85c909c0b5
Fixed saving non-square multi-region OARs
2012-10-26 00:06:44 +01:00
Justin Clark-Casey (justincc)
dc17cee044
minor: if a scene is already shutting down on Scene.Close(), warn and exit instead of attempting to run another shutdown concurrently.
...
Thanks to Oren Hurvitz for this change.
2012-10-25 23:47:55 +01:00
Oren Hurvitz
b4923da334
Changed "course" to "coarse" in several places
2012-10-25 23:32:37 +01:00
Justin Clark-Casey (justincc)
0482758e96
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-25 23:17:07 +01:00
Justin Clark-Casey (justincc)
22e216fd12
In Scene.Close(), dispose of the physics scene after base.Close() since script events can still access Physics scene until the script engine shuts down (triggered off base.Close())
...
XEngine listeners to EventManager.OnShutdown which is triggered from base.Close().
Possibly it could listen for the earlier OnSceneShuttingDown instead, but the easier solution right now is to relocate disposal of the physics scene.
This bug has existed since c150320
(Thu Jul 26 15:27:18 2012) and was in 0.7.4
2012-10-25 22:55:29 +01:00
nebadon
fa484c3494
Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is
...
loaded. Thank you tglion
2012-10-25 11:31:25 -07:00
Justin Clark-Casey (justincc)
c13a99dc5c
Fix script error messages not showing up in viewer 3 and associated viewers.
...
Viewer 3 will discard such a message if the chat message owner does not match the avatar.
We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages.
This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages.
This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
2012-10-25 03:26:12 +01:00
Justin Clark-Casey (justincc)
8af8319b95
Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if appearance notecard does not exist, rather than returning UUID.Zero or silently failing.
2012-10-25 03:02:00 +01:00
Justin Clark-Casey (justincc)
d9aaf51561
When scripts generate expected exceptions (e.g. due to checked bad parameter) throw ScriptException instead of just a plain old exception.
...
This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests.
No functional changes.
2012-10-25 02:52:20 +01:00
Justin Clark-Casey (justincc)
ae662b54ea
Make osNpcCreate() return UUID.Zero instead of throwing an exception if notecard name is invalid. Make osNpcLoadAppearance() fail silently in same circumstance rather than throwing exception.
2012-10-25 01:07:06 +01:00
Justin Clark-Casey (justincc)
5d4ac5a90f
Add TestOsNpcLoadAppearance()
2012-10-25 00:59:27 +01:00
Justin Clark-Casey (justincc)
1743fe5d62
Move npc creation tests involving appearance from OSSL_ApiAppearanceTest to OSSL_ApiNpcTests
...
This is a more intuitive location.
2012-10-25 00:29:50 +01:00
Justin Clark-Casey (justincc)
81aeecc907
Allow "show object", "show part", "dump object" and "delete object" to accept a local ID as well as a UUID.
...
This means that the sub-commands are now id rather than uuid, e.g. show object id
2012-10-24 04:10:22 +01:00
Justin Clark-Casey (justincc)
f76dceb90b
Get "save oar" and "save iar" to tell you in a more friendly manner if the filename to save already exists, rather than exception throwing.
...
Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
2012-10-24 03:08:58 +01:00
Justin Clark-Casey (justincc)
73db057fa1
Add "dump object uuid" console command. This allows any object in the scene to be serialized and dumped to XML for debug purposes.
2012-10-24 02:05:28 +01:00
Justin Clark-Casey (justincc)
326f1507fa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-24 02:04:26 +01:00
Justin Clark-Casey (justincc)
938fa96b9f
minor: Move co-ordinate related help to object commands to common ConsoleUtil.CoordHelp
2012-10-24 01:33:21 +01:00
Robert Adams
b6fc5bad00
BulletSim: fix problem with avatars sinking into the ground.
...
Change terrain activation state to DISABLE_SIMULATION for better performance.
2012-10-23 17:30:43 -07:00
Melanie
484eca323b
Merge branch 'master' into careminster
2012-10-23 17:25:40 +01:00
Melanie
13cef0b16a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/LandData.cs
2012-10-23 17:23:36 +01:00
Robert Adams
b49f8a377b
BulletSim: minor change to insure avatar body recreation when shape changes.
2012-10-23 08:02:26 -07:00
Robert Adams
36bfd3667c
BulletSim: remove chatty debug message.
2012-10-22 22:25:06 -07:00
Robert Adams
14eeb8b31b
BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh assets weren't already in the cache. Comment cleanups.
2012-10-22 22:24:59 -07:00
Robert Adams
7272a4cae8
BulletSim: fix problem of not rebuilding shape by clearing last rebuild failed flag in BSPrim.ForceBodyShapeRebuild()
2012-10-22 22:24:51 -07:00
Robert Adams
65c131c4a3
BulletSim: remove trailing spaces to make git happy.
2012-10-22 22:24:44 -07:00
Robert Adams
c245178eee
BulletSim: encorporate UBit's suggestion to save a copy of mesh raw data.
2012-10-22 22:24:37 -07:00
Robert Adams
a61f20ac74
BulletSim: Create LinkSet abstract class and sparate constraint based linksets into own subclass. Will eventually add manual movement linkset subclass.
2012-10-22 22:24:30 -07:00
Justin Clark-Casey (justincc)
319ebaca06
Make it possible to turn the base UDP object packet pools on and off whilst running via the "debug lludp pool <on|off>" console command. For debug purposes.
...
This does not currently apply to the higher LLUDP packetpool.
2012-10-23 02:44:15 +01:00
Justin Clark-Casey (justincc)
4578ff74fe
Add object count stats for new IncomingPacket and UDPPacketBuffer pools if they are enabled. Add count stats for existing LLUDP pool.
...
This introduces a pull stat type in addition to the push stat type.
A pull stat takes a method on construction which knows how to update the stat on request.
In this way, special interfaces for pull stat collection are not necessary.
2012-10-23 01:52:10 +01:00
Justin Clark-Casey (justincc)
2206132ab9
minor: Get content type handler logger to log "unset" for the content type instead of blank if no content type was set.
2012-10-23 00:44:47 +01:00
Justin Clark-Casey (justincc)
542d075376
minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data where this wasn't already used.
...
This allows log level 5 (log sample or large part of incoming post data) to operate and removes copy/paste.
2012-10-23 00:39:59 +01:00
Melanie
efae7c6fc2
Refactor: Move Dwell reply to a module that can be disabled. The prior,
...
hardcoded approach disabled the use of non-core dwell tracking modules.
2012-10-21 21:12:34 +01:00
PixelTomsen
20eac8d6d0
SQLite DB: some values of land data will be not saved / loaded
...
http://opensimulator.org/mantis/view.php?id=6370
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-10-21 10:41:23 -04:00
UbitUmarov
3b51cae958
bug fix
2012-10-20 17:53:33 +01:00
PixelTomsen
d7fa4cacb3
Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (implementation of dwell-value in LandData + eventhandler, return always 0); source-formatting of LandData
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-10-20 05:06:46 -04:00
BlueWall
af9cd7d30c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-20 04:32:45 -04:00
BlueWall
2aac113ac1
Add CLICK_ACTION_ZOOM
...
Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction
2012-10-20 04:32:04 -04:00
Justin Clark-Casey (justincc)
5bc07a15f5
minor: remove unnecessary bit of method doc from OdePrim.BadMeshAssetCollideBits that monodevelop inserted automatically
2012-10-20 02:52:38 +01:00
Justin Clark-Casey (justincc)
d2b19f00da
Fix minor issues from commit 28483150
...
Fix spelling of collide, change to more self-documenting property BadMeshAssetCollideBits, add method doc, change to private to reduce code analysis complexity
2012-10-20 02:49:16 +01:00
Justin Clark-Casey (justincc)
d55f72f3df
minor: Rename assetCache constructor param in UUIDGatherer to assetService which is what it is.
2012-10-20 02:35:39 +01:00
Melanie
6ad8d3c43f
Merge branch 'master' into careminster
2012-10-20 02:33:24 +01:00
Justin Clark-Casey (justincc)
ac037dfe21
Add method doc for IPresenceService
2012-10-20 02:26:08 +01:00