| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Spot fix the interpenetration issue. Thanks, Ter. | Melanie | 2013-03-12 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-03-13 | 7 | -40/+185 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs | |||||
| | * | | minor: save some commented out log lines which will be useful again in ↵ | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -0/+5 | |
| | | | | | | | | | | | | | future debugging of VectorRenderModule | |||||
| | * | | minor: Remove mono compiler warning in LLClientView | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Make C# scripts return correct error line and column numbers instead of ↵ | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -3/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | failing because they have no linemap. Adapted fix from http://opensimulator.org/mantis/view.php?id=6571 Thanks Nickel Briand | |||||
| | * | | Add DisableInterRegionTeleportCancellation option in [EntityTransfer] ↵ | Justin Clark-Casey (justincc) | 2013-03-12 | 1 | -1/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | Improve teleport cancellation in some circumstances, though cancelling ↵ | Justin Clark-Casey (justincc) | 2013-03-12 | 2 | -34/+149 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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). | |||||
| | * | | minor: remove mono compiler warning in SceneObjectUndoRedoTests | Justin Clark-Casey (justincc) | 2013-03-11 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | minor: Remove mono compiler warnings from LSL_ApiHttpTests | Justin Clark-Casey (justincc) | 2013-03-11 | 1 | -1/+0 | |
| | | | | ||||||
| | * | | minor: Remove mono compiler warnings in EventQueueTests | Justin Clark-Casey (justincc) | 2013-03-11 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-03-11 | 5 | -23/+134 | |
| |\ \ \ | |/ / | ||||||
| | * | | BulletSim: remove the ability for avatars to fly off the edge of | Robert Adams | 2013-03-09 | 4 | -23/+117 | |
| | | | | | | | | | | | | | | | | regions when there are no region neighbors. Add some terrain location processing routines to support above. | |||||
| | * | | * Apparently, sometimes texture entries come in from the wire with no ↵ | teravus | 2013-03-08 | 1 | -0/+17 | |
| | | | | | | | | | | | | | 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. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-03-08 | 15 | -165/+342 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| | * | | * Just another one of those new packet blocks causing a null ref. ↵ | teravus | 2013-03-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | Defaulting to zero length array..... | |||||
| | * | | minor: remove some completely unused string local vars added recently in ↵ | Justin Clark-Casey (justincc) | 2013-03-06 | 1 | -2/+0 | |
| | | | | | | | | | | | | | commit 984faf2 | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-06 | 6 | -35/+147 | |
| | |\ \ | ||||||
| | | * | | Per discussions with justincc... split the JsonStore type | Mic Bowman | 2013-03-05 | 5 | -35/+143 | |
| | | | | | | | | | | | | | | | | | | | | | functions into one for node type and one for value type. Define and export constants for both nodes and values. | |||||
| | | * | | Convert doubles passed back through the MOD interface into LSL_Floats | Mic Bowman | 2013-03-05 | 1 | -0/+4 | |
| | | | | | ||||||
| | * | | | Add code for testing event queue messages recevied on region cross. | Justin Clark-Casey (justincc) | 2013-03-06 | 3 | -8/+33 | |
| | | | | | | | | | | | | | | | | | This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present. | |||||
| | * | | | Add regression test for presence crossing between regions on the same simulator. | Justin Clark-Casey (justincc) | 2013-03-06 | 4 | -123/+166 | |
| | |/ / | | | | | | | | | | Unlike a much earlier commented out version of this test, this is done in synchronous mode. | |||||
| | * | | Fix bug in osGetPrimitiveParams() so that it works for prims with the same ↵ | Justin Clark-Casey (justincc) | 2013-03-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | owner as the script and not ones with different owners. Addresses http://opensimulator.org/mantis/view.php?id=6560 | |||||
| * | | | * Separate two if trees that got merged into one if tree with borked logic. | teravus | 2013-03-06 | 1 | -2/+25 | |
| | | | | ||||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-03-06 | 8 | -35/+49 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||||
| | * | | Limit each attachment point to 5 items as per spec | Melanie | 2013-03-05 | 1 | -3/+13 | |
| | | | | ||||||
| | * | | Multiattach, part 1 | Melanie | 2013-03-05 | 6 | -34/+24 | |
| | | | | ||||||
| | * | | Add support for void return type | root | 2013-03-03 | 1 | -1/+5 | |
| | | | | ||||||
| | * | | Experimental - add void return support to modSendCommand | Melanie | 2013-03-03 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-03-05 | 7 | -162/+192 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | 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 | |||||
| | * | | minor: Fix mono compiler warning in MonitorModule | Justin Clark-Casey (justincc) | 2013-03-05 | 1 | -2/+0 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-05 | 1 | -2/+4 | |
| | |\ \ | ||||||
| | | * | | * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9 | teravus | 2013-03-04 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | * 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. | |||||
| | * | | | Get attachment script state before taking sp.AttachmentsSyncLock() to avoid ↵ | Justin Clark-Casey (justincc) | 2013-03-05 | 1 | -140/+161 | |
| | |/ / | | | | | | | | | | | | | | | | 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 | |||||
| | * | | Fix issue in the mesh upload flag module where the ID of the last agent to ↵ | Justin Clark-Casey (justincc) | 2013-03-04 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-03-02 | 2 | -8/+17 | |
| | |\ \ | ||||||
| | | * | | Move AllowedClients and BannedClients section to new [AccessControl] section ↵ | Justin Clark-Casey (justincc) | 2013-03-02 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] | |||||
| | | * | | minor: Quieten down the parts of the WebSocketEcho module logging for now ↵ | Justin Clark-Casey (justincc) | 2013-03-02 | 1 | -6/+7 | |
| | | | | | | | | | | | | | | | | | where it tells us it is added/loaded/removed from regions | |||||
| | * | | | Fixed typos in TempAttachmentsModule. No changes. | Diva Canto | 2013-03-02 | 1 | -1/+1 | |
| | |/ / | ||||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-03-03 | 14 | -59/+109 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||||
| | * | | Make Keyframe motion cross regions again | Melanie | 2013-03-03 | 2 | -2/+4 | |
| | | | | ||||||
| | * | | Make a viewer sent XML error prettier | Melanie | 2013-03-03 | 1 | -0/+4 | |
| | | | | ||||||
| | * | | Reinstate uploading temporary textures | Melanie | 2013-02-27 | 1 | -4/+4 | |
| | | | | ||||||
| | * | | Try to update inventory items when there is a valid asset - may fix temp ↵ | Melanie | 2013-02-27 | 1 | -0/+5 | |
| | | | | | | | | | | | | | textures | |||||
| | * | | Remove osParseJSONNew because it's "object" return type is not useful for LSL | root | 2013-02-25 | 3 | -7/+1 | |
| | | | | ||||||
| | * | | Make banking no longer break sit rotations. Fix spinning avatars. | Melanie | 2013-02-25 | 1 | -3/+6 | |
| | | | | ||||||
| | * | | Revert "Output some additional data on Vivox connection errors", this logs ↵ | Melanie | 2013-02-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | passwords! Bad! This reverts commit 79e477f6af09fae2d88a1bba45de6cb819e2800a. | |||||
| | * | | Output some additional data on Vivox connection errors | Melanie | 2013-02-24 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | The viewer tries to parse the error message body to LLSD - give it some. | Melanie | 2013-02-24 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Revert "Allow TeleportCancel packets to reset the transfer state machine" | Melanie | 2013-02-24 | 1 | -6/+0 | |
| | | | | | | | | | | | | | This reverts commit 0e17887e03fb6d32cdd07838caa56e34103ae8f2. | |||||
| | * | | Fix an issue where the viewer would request the seed cap before | Melanie | 2013-02-18 | 4 | -34/+68 | |
| | | | | | | | | | | | | | there was a handler for it. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |