Commit Graph

23234 Commits (c6b0942f97d57bf4272e5224f4a452114cd1477b)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 1774c631cb Fix minor race condition in llGetOmega() where a call whilst a prim was changing angular velocity could return inconsistent results 2013-03-14 22:04:11 +00:00
Justin Clark-Casey (justincc) 04e806036f refactor: Use LSL_Vector(Vector3) constructor in llGetVel() 2013-03-14 22:02:43 +00:00
Justin Clark-Casey (justincc) ffbbe29229 refactor: Use LSL_Vector(Vector3) constructor in llGetTorque() 2013-03-14 22:01:24 +00:00
Justin Clark-Casey (justincc) c3e081a5ca Fix minor race condition in llGetLocalRot() where inconsistent results could be returned if the prim was rotating during the call 2013-03-14 22:00:04 +00:00
Justin Clark-Casey (justincc) f840728273 refactor: use cleaner LSL_Rotation quaternion constructor in LSL_Api.GetPartRot() 2013-03-14 21:57:43 +00:00
Justin Clark-Casey (justincc) ad9bd3fe93 Fix sensors, llGetRootRotation(), llGet*Param() and other functions to use the world rotation if the avatar to which they are attached is sitting 2013-03-14 21:46:29 +00:00
Justin Clark-Casey (justincc) e9c394fb4e Make llGetObjectDetails() return the correct world rotation for a sitting avatar
This addresses http://opensimulator.org/mantis/view.php?id=6567
This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation()
SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting.
2013-03-14 21:23:48 +00:00
teravus 9fad90a914 Merge branch 'master' of ssh://opensim/var/git/opensim 2013-03-14 00:58:00 -04:00
teravus 42c533c589 * Updates HttpServer again to re-add the code that closes the stream and connection when It's done sending. Be on the lookout for an old linux/mono bug where the client doesn't get the last bit of the stream before it is disconnected!. Code on opensim-libs. All tests pass.. HttpServer's internal tests pass.. but just a bad feeling. More people should test :) 2013-03-14 00:57:42 -04:00
Justin Clark-Casey (justincc) 43220afda2 Improve DAExampleModule to show current necessary locking to avoid race conditions with a serialization thread. 2013-03-13 23:42:14 +00:00
Justin Clark-Casey (justincc) 48d41ef307 Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this is being done lazily 2013-03-13 23:25:56 +00:00
Justin Clark-Casey (justincc) 39a0928052 minor: Remove some mono compiler warnings in OpenSim.Framework.dll 2013-03-13 23:17:27 +00:00
Justin Clark-Casey (justincc) 5c53660a7f Add prototype dynamic objects map for scene object parts
This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes.
This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes.
This commit adds a DOExampleModule to demonstrate/evolve this code.
Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap.
DOExampleModule in this commit only attaches a fresh dynamic object.  Actually constructing this from stored dynamic attributes and handling persistence is left for later.
These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
2013-03-13 22:59:06 +00:00
Melanie 0e426c5cd0 Merge branch 'avination' into careminster 2013-03-13 02:03:46 +00:00
Melanie 710381e838 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
2013-03-13 02:02:46 +00:00
Justin Clark-Casey (justincc) b7216f4daf minor: save some commented out log lines which will be useful again in future debugging of VectorRenderModule 2013-03-13 00:46:17 +00:00
Justin Clark-Casey (justincc) f8a4d95bdd minor: Remove mono compiler warning in LLClientView 2013-03-13 00:22:07 +00:00
Justin Clark-Casey (justincc) 0d25be3f81 Make C# scripts return correct error line and column numbers instead of failing because they have no linemap.
Adapted fix from http://opensimulator.org/mantis/view.php?id=6571
Thanks Nickel Briand
2013-03-13 00:19:37 +00:00
Justin Clark-Casey (justincc) fb1211ad5e Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section of OpenSim.ini. False by default.
This option allows the simulator to specify that the cancel button on inter-region teleports should never appear.
This exists because sometimes cancellation will result in a stuck avatar requiring relog.
It may be hard to prevent this due to the protocol design (the LL grid has the same issue)
In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
2013-03-12 23:01:27 +00:00
Justin Clark-Casey (justincc) c43d4b5572 Improve teleport cancellation in some circumstances, though cancelling teleports is still not recommended.
Previously, hitting the cancel button on a teleport would cancel on the client side but the request was ignored on the server side.
Cancel would still work if the teleport failed in the early stages (e.g. because the destination never replied to early CreateAgent and UpdateAgent messages).
But if the teleport still completed after a delay here or later on, the viewer would become confused (usual symptom appears to be avatar being unable to move/reteleport).
This commit makes OpenSimulator obey cancellations which are received before it sends the TeleportFinish event queue message and does proper cleanup.
But cancellations received after this (which can happen even though the cancel button is removed as this messages comes on a different thread) can still result in a frozen avatar.
This looks extremely difficult and impossible to fix.
I can replicate the same problem on the Linden Lab grid by hitting cancel immediately after a teleport starts (a teleport which would otherwise quickly succeed).
2013-03-12 22:16:09 +00:00
Melanie 5b37063178 Spot fix the interpenetration issue. Thanks, Ter. 2013-03-12 03:47:27 +01:00
Justin Clark-Casey (justincc) 0c6268fe56 minor: remove mono compiler warning in SceneObjectUndoRedoTests 2013-03-11 23:15:13 +00:00
Justin Clark-Casey (justincc) be686f80a3 minor: Remove mono compiler warnings from LSL_ApiHttpTests 2013-03-11 23:01:07 +00:00
Justin Clark-Casey (justincc) e898a5fec5 minor: Remove mono compiler warnings in EventQueueTests 2013-03-11 22:42:27 +00:00
Melanie 1e7c7fb779 Merge branch 'master' into careminster 2013-03-11 19:09:49 +00:00
Robert Adams 13f3bcae94 Update comment about setting physics=BulletSimN as the C# Bullet
version has been wrapped into one BulletSim and the physics engine
selection is now done as specified in OpenSimDefaults.ini.
2013-03-10 22:24:34 -07:00
Robert Adams 1120bcf123 BulletSim: remove the ability for avatars to fly off the edge of
regions when there are no region neighbors.
Add some terrain location processing routines to support above.
2013-03-09 14:15:14 -08:00
teravus 5097437e11 * Apparently, sometimes texture entries come in from the wire with no default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception. 2013-03-08 19:32:47 -05:00
Melanie 70f0587558 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-08 01:07:05 +00:00
teravus 33dab49d22 * Just another one of those new packet blocks causing a null ref. Defaulting to zero length array..... 2013-03-07 19:19:36 -05:00
Diva Canto 2f1aa87eb5 One more comment inconsistency fixed. 2013-03-07 08:02:48 -08:00
Diva Canto fdebee25db Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-07 06:41:03 -08:00
Diva Canto 2b0056eaca Fixed inconsistency in comments. Thanks Ai Austin. 2013-03-07 06:40:39 -08:00
Justin Clark-Casey (justincc) 6706e189d5 minor: remove some completely unused string local vars added recently in commit 984faf2 2013-03-06 23:11:32 +00:00
Justin Clark-Casey (justincc) 2fe938d11d Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-06 23:07:04 +00:00
Justin Clark-Casey (justincc) 5751ecde52 Add code for testing event queue messages recevied on region cross.
This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
2013-03-06 23:06:00 +00:00
teravus f954c53ddb * Separate two if trees that got merged into one if tree with borked logic. 2013-03-06 17:02:53 -05:00
Justin Clark-Casey (justincc) 8960418e7d Add regression test for presence crossing between regions on the same simulator.
Unlike a much earlier commented out version of this test, this is done in synchronous mode.
2013-03-06 21:37:53 +00:00
Mic Bowman 9875e840f7 Per discussions with justincc... split the JsonStore type
functions into one for node type and one for value type.
Define and export constants for both nodes and values.
2013-03-05 20:33:17 -08:00
Mic Bowman 30e06b0742 Convert doubles passed back through the MOD interface into LSL_Floats 2013-03-05 20:32:06 -08:00
Justin Clark-Casey (justincc) a9f380d124 Fix bug in osGetPrimitiveParams() so that it works for prims with the same owner as the script and not ones with different owners.
Addresses http://opensimulator.org/mantis/view.php?id=6560
2013-03-06 00:22:58 +00:00
Melanie 339d8ef2a6 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-06 00:15:54 +00:00
Justin Clark-Casey (justincc) b272b91317 minor: Fix mono compiler warning in MonitorModule 2013-03-05 23:59:39 +00:00
Melanie 81552f41c6 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-05 23:57:53 +00:00
Justin Clark-Casey (justincc) 5cd38d680a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-05 23:52:52 +00:00
Justin Clark-Casey (justincc) ccd6f443e1 Get attachment script state before taking sp.AttachmentsSyncLock() to avoid race conditions between closing agents and scripts that may be doing attachment manipulation.
This is in an effort to resolve http://opensimulator.org/mantis/view.php?id=6557
2013-03-05 23:47:36 +00:00
BlueWall f676408e2a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-05 15:30:54 -05:00
Melanie 9ffa08ea6b Limit each attachment point to 5 items as per spec 2013-03-05 15:11:30 +01:00
Melanie 51de85b503 Multiattach, part 2 2013-03-05 13:14:06 +01:00
Melanie 797bfbfcfa Multiattach, part 1 2013-03-05 12:02:22 +01:00