Commit Graph

23165 Commits (4cb8967f0adc8f15b0fc2ef887ef0dc440855297)

Author SHA1 Message Date
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
teravus 69fbcdf14c * Add a Max Payload size property to the Websocket Server Handler. If you would like to restrict the maximum packet size, (and therefore protect against Memory DOSing) then you should set this. I defaulted it to 40MB. This means that in theory, a malicious user could connect and send a packet that claims that the payload is up to 40 mb (even if it doesn't actually turn out to be 40mb. More testing needs to be done on it where the packets are maliciously malformed. 2013-03-05 00:04:09 -05:00
teravus 7556b42d7a * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9
* Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter..    which adds up the Length property all of the blocks.
2013-03-04 21:26:26 -05:00
Justin Clark-Casey (justincc) fa9f4ef1ba Fix issue in the mesh upload flag module where the ID of the last agent to request the capability was always used instead of the original requesting agent for each cap.
Should address http://opensimulator.org/mantis/view.php?id=6556
2013-03-04 23:20:00 +00:00
Diva Canto aadf7d32d1 GridUserService was missing from [Gatekeeper] 2013-03-04 12:52:28 -08:00
root 82ac1763fb Add support for void return type 2013-03-03 22:50:20 +01:00
Melanie 1ef50fef44 Experimental - add void return support to modSendCommand 2013-03-03 20:30:59 +01:00
BlueWall 66d74e76b1 Add method to remove JsonRpc Handlers from the server 2013-03-03 09:40:44 -05:00
Melanie f39e4abf0e Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
2013-03-03 13:24:37 +00:00
Melanie 34bb2fd015 Make Keyframe motion cross regions again 2013-03-03 12:48:56 +01:00
Melanie 2ad72db0ec Make a viewer sent XML error prettier 2013-03-03 11:40:46 +01:00
Diva Canto e70c71a175 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-02 17:54:19 -08:00
Diva Canto b0985f7019 Fixed typos in TempAttachmentsModule. No changes. 2013-03-02 17:53:57 -08:00
Robert Adams b47ffb5dc4 Added existance and default value for [XEngine]MinTimerInterval to OpenSimDefaults.ini 2013-03-02 13:02:02 -08:00
Justin Clark-Casey (justincc) 1bc8692a99 Move AllowedClients and BannedClients section to new [AccessControl] section in OpenSim.ini from [Startup]
This change also corrects the setting names - they were actually wrong (though the text in {} was correct).
If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
2013-03-02 01:43:54 +00:00
Justin Clark-Casey (justincc) 4999d7920a Revert "Removed more vars from [Startup]. I think these were already moved elsewhere, because I can't find any reference to them in the code."
This reverts commit efa7227865.
2013-03-02 01:23:01 +00:00
Justin Clark-Casey (justincc) 1a98ce5f64 minor: Quieten down the parts of the WebSocketEcho module logging for now where it tells us it is added/loaded/removed from regions 2013-03-02 01:06:08 +00:00
Justin Clark-Casey (justincc) c91753c065 minor: Log number of region modules loaded from each plugin 2013-03-02 00:56:53 +00:00
Melanie a675f7d4c3 Merge branch 'master' into careminster 2013-03-01 23:54:00 +00:00
Diva Canto 20530ee667 Moved permissions config vars out of [Startup] into [Permissions]. Backwards compatible ([Startup] still being looked up), but please update your configs sometime soon. 2013-03-01 15:24:22 -08:00