aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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-0517-164/+268
|\ \
| * | 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-057-3/+28
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-03-0534-215/+664
| | |\ \
| | | * | * Add a Max Payload size property to the Websocket Server Handler. If you ...teravus2013-03-051-1/+16
| | | * | * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9teravus2013-03-044-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
| * | | GridUserService was missing from [Gatekeeper]Diva Canto2013-03-041-0/+1
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-03-025-9/+68
| |\ \ \
| | * | | Added existance and default value for [XEngine]MinTimerInterval to OpenSimDef...Robert Adams2013-03-021-0/+4
| | * | | Move AllowedClients and BannedClients section to new [AccessControl] section ...Justin Clark-Casey (justincc)2013-03-022-4/+16
| | * | | Revert "Removed more vars from [Startup]. I think these were already moved el...Justin Clark-Casey (justincc)2013-03-021-0/+20
| | * | | 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
| * | | Output some additional data on Vivox connection errorsMelanie2013-02-241-1/+1
| * | | The viewer tries to parse the error message body to LLSD - give it some.Melanie2013-02-241-2/+2
| * | | Revert "Allow TeleportCancel packets to reset the transfer state machine"Melanie2013-02-241-6/+0
| * | | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-185-34/+81
| * | | Correctly remove https:// URLs from the http server.Melanie2013-02-171-1/+7
| * | | Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
* | | | Merge branch 'master' into careminsterMelanie2013-03-0114-171/+220
|\ \ \ \ | | |/ / | |/| |
| * | | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ...Diva Canto2013-03-014-115/+129
| * | | Removed more vars from [Startup]. I think these were already moved elsewhere,...Diva Canto2013-03-011-20/+0
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-014-15/+63
| |\ \ \
| | * | | BulletSim: more things into the TODO list.Robert Adams2013-03-011-1/+6
| | * | | BulletSim: add parameters, code cleanup around checking and enforcingRobert Adams2013-03-013-14/+57
| * | | | Add the Mono AddinDependency attribute to the example region modules.Justin Clark-Casey (justincc)2013-03-012-2/+4
| |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-012-19/+16
| |\ \ \
| | * | | Add missing prebuild.xml dependency for System.Action2<t1,t2> in recent addit...Robert Adams2013-02-281-0/+1
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-289-43/+366
| | |\ \ \
| | * | | | Bug fix in DataSnapshot, where a var was being used before being initialized.Diva Canto2013-02-281-19/+15
| | | |_|/ | | |/| |
| * | | | minor: Log location in which simulator/robust was started.Justin Clark-Casey (justincc)2013-02-282-0/+8
| | |/ / | |/| |
* | | | Merge branch 'master' into careminsterMelanie2013-02-2836-127/+538
|\ \ \ \ | |/ / /