aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-137-40/+185
|\
| * minor: save some commented out log lines which will be useful again in future...Justin Clark-Casey (justincc)2013-03-131-0/+5
| * minor: Remove mono compiler warning in LLClientViewJustin Clark-Casey (justincc)2013-03-131-1/+1
| * Make C# scripts return correct error line and column numbers instead of faili...Justin Clark-Casey (justincc)2013-03-131-3/+8
| * Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section...Justin Clark-Casey (justincc)2013-03-121-1/+20
| * Improve teleport cancellation in some circumstances, though cancelling telepo...Justin Clark-Casey (justincc)2013-03-122-34/+149
| * minor: remove mono compiler warning in SceneObjectUndoRedoTestsJustin Clark-Casey (justincc)2013-03-111-2/+2
| * minor: Remove mono compiler warnings from LSL_ApiHttpTestsJustin Clark-Casey (justincc)2013-03-111-1/+0
| * minor: Remove mono compiler warnings in EventQueueTestsJustin Clark-Casey (justincc)2013-03-111-1/+3
* | Merge branch 'master' into careminsterMelanie2013-03-115-23/+134
|\ \ | |/
| * BulletSim: remove the ability for avatars to fly off the edge ofRobert Adams2013-03-094-23/+117
| * * Apparently, sometimes texture entries come in from the wire with no default...teravus2013-03-081-0/+17
* | Merge branch 'master' into careminsterMelanie2013-03-0817-165/+524
|\ \ | |/
| * * Just another one of those new packet blocks causing a null ref. Defaultin...teravus2013-03-071-1/+1
| * minor: remove some completely unused string local vars added recently in comm...Justin Clark-Casey (justincc)2013-03-061-2/+0
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-066-35/+147
| |\
| | * Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-055-35/+143
| | * Convert doubles passed back through the MOD interface into LSL_FloatsMic Bowman2013-03-051-0/+4
| * | Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-064-8/+211
| * | Add regression test for presence crossing between regions on the same simulator.Justin Clark-Casey (justincc)2013-03-065-123/+170
| |/
| * Fix bug in osGetPrimitiveParams() so that it works for prims with the same ow...Justin Clark-Casey (justincc)2013-03-061-1/+1
* | * Separate two if trees that got merged into one if tree with borked logic.teravus2013-03-061-2/+25
* | Merge branch 'avination' into careminsterMelanie2013-03-0610-42/+68
|\ \
| * | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| * | Multiattach, part 2Melanie2013-03-051-3/+9
| * | Multiattach, part 1Melanie2013-03-058-38/+34
| * | Add support for void return typeroot2013-03-031-1/+5
| * | Experimental - add void return support to modSendCommandMelanie2013-03-031-0/+2
* | | Merge branch 'master' into careminsterMelanie2013-03-0511-164/+239
|\ \ \ | | |/ | |/|
| * | minor: Fix mono compiler warning in MonitorModuleJustin Clark-Casey (justincc)2013-03-051-2/+0
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-054-3/+28
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-03-0527-121/+559
| | |\ \
| | | * | * Add a Max Payload size property to the Websocket Server Handler. If you ...teravus2013-03-051-1/+16
| | | * | * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9teravus2013-03-041-2/+4
| | * | | Add method to remove JsonRpc Handlers from the serverBlueWall2013-03-032-0/+8
| * | | | Get attachment script state before taking sp.AttachmentsSyncLock() to avoid r...Justin Clark-Casey (justincc)2013-03-051-140/+161
| | |/ / | |/| |
| * | | Fix issue in the mesh upload flag module where the ID of the last agent to re...Justin Clark-Casey (justincc)2013-03-041-6/+6
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-03-023-9/+40
| |\ \ \
| | * | | Move AllowedClients and BannedClients section to new [AccessControl] section ...Justin Clark-Casey (justincc)2013-03-021-2/+10
| | * | | minor: Quieten down the parts of the WebSocketEcho module logging for now whe...Justin Clark-Casey (justincc)2013-03-021-6/+7
| | * | | minor: Log number of region modules loaded from each pluginJustin Clark-Casey (justincc)2013-03-021-1/+23
| * | | | Fixed typos in TempAttachmentsModule. No changes.Diva Canto2013-03-021-1/+1
| |/ / /
* | | | Merge branch 'avination' into careminsterMelanie2013-03-0315-59/+122
|\ \ \ \ | | |_|/ | |/| |
| * | | Make Keyframe motion cross regions againMelanie2013-03-032-2/+4
| * | | Make a viewer sent XML error prettierMelanie2013-03-031-0/+4
| * | | Reinstate uploading temporary texturesMelanie2013-02-271-4/+4
| * | | Try to update inventory items when there is a valid asset - may fix temp text...Melanie2013-02-271-0/+5
| * | | Remove osParseJSONNew because it's "object" return type is not useful for LSLroot2013-02-253-7/+1
| * | | Make banking no longer break sit rotations. Fix spinning avatars.Melanie2013-02-251-3/+6
| * | | Revert "Output some additional data on Vivox connection errors", this logs pa...Melanie2013-02-241-1/+1
generated by cgit v1.1 at 2024-10-23 03:26:52 +0000