aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-0815-165/+342
|\ \ | |/
| * * 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-063-8/+33
| * | Add regression test for presence crossing between regions on the same simulator.Justin Clark-Casey (justincc)2013-03-064-123/+166
| |/
| * 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-068-35/+49
|\ \
| * | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| * | Multiattach, part 1Melanie2013-03-056-34/+24
| * | 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-057-162/+192
|\ \ \ | | |/ | |/|
| * | 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-051-2/+4
| |\ \
| | * | * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9teravus2013-03-041-2/+4
| * | | 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-022-8/+17
| |\ \
| | * | 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
| * | | Fixed typos in TempAttachmentsModule. No changes.Diva Canto2013-03-021-1/+1
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2013-03-0314-59/+109
|\ \ \ | | |/ | |/|
| * | 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-184-34/+68
| * | 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-0110-59/+122
|\ \ \ | | |/ | |/|
| * | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ...Diva Canto2013-03-012-23/+36
| * | 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-011-19/+15
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-285-24/+299
| | |\ \