| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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. | ||||
| | * | | Correctly remove https:// URLs from the http server. | Melanie | 2013-02-17 | 1 | -1/+7 |
| | | | | |||||
| | * | | Fix shape parameters sent for meshes tosupport the full number of faces | Melanie | 2013-02-16 | 1 | -0/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-03-01 | 10 | -59/+122 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵ | Diva Canto | 2013-03-01 | 2 | -23/+36 |
| | | | | | | | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-01 | 4 | -15/+63 |
| | |\ \ | |||||
| | | * | | BulletSim: more things into the TODO list. | Robert Adams | 2013-03-01 | 1 | -1/+6 |
| | | | | | |||||
| | | * | | BulletSim: add parameters, code cleanup around checking and enforcing | Robert Adams | 2013-03-01 | 3 | -14/+57 |
| | | | | | | | | | | | | | | | | | maximum velocity and angular velocity values for prims. | ||||
| | * | | | Add the Mono AddinDependency attribute to the example region modules. | Justin Clark-Casey (justincc) | 2013-03-01 | 2 | -2/+4 |
| | |/ / | | | | | | | | | | It turns out this is required to get Mono.Addins to pick up plugin DLLs | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-01 | 1 | -19/+15 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-28 | 5 | -24/+299 |
| | | |\ \ | |||||
| | | * | | | Bug fix in DataSnapshot, where a var was being used before being initialized. | Diva Canto | 2013-02-28 | 1 | -19/+15 |
| | | | | | | |||||
| | * | | | | minor: Log location in which simulator/robust was started. | Justin Clark-Casey (justincc) | 2013-02-28 | 1 | -0/+4 |
| | | |/ / | |/| | | | | | | | | | | Useful information for system debugging, especially if logging and ini files locations have been changed from defaults. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 15 | -56/+354 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |