aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-062-3/+31
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-061-0/+5
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-0513-4/+261
| | |\
| | * | Strengthen some assumptions.Diva Canto2013-06-051-0/+5
| * | | Fix keyframe motion copyrightMelanie2013-06-061-3/+26
| | |/ | |/|
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-0629-52/+559
|\ \ \
| * | | Update HTTP serverMelanie2013-06-041-0/+0
| * | | Fix llTeleportAgentGlobalCoordsMelanie2013-06-021-11/+16
| * | | Unsit seated avatars when an object is deletedMelanie2013-06-021-0/+8
| * | | Implement PERMISSION_TELEPORT and the needed checks to make it work.Melanie2013-06-022-7/+19
| * | | Fix multi-wear of alpha and tattoo layers.Melanie2013-05-313-6/+6
| * | | Stop sending velocity to avoid snap-backMelanie2013-05-311-1/+1
| * | | Allow Linden trees to preserve their type when taken into inventory and rezze...Melanie2013-05-263-4/+20
| * | | Update the money framework to allow sending the new style linden "serverside ...Melanie2013-05-259-44/+32
| * | | Reset "Show in search" on parcels cut off other parcels that are in searchMelanie2013-05-241-0/+2
| * | | Port fix from justicc - decouple pay prices on drag-copied primsMelanie2013-05-241-0/+1
| * | | Let the event queue do lees work - expire every 40s as per Teravus instead of...Melanie2013-05-221-1/+1
| * | | * This fixes the avatar stuck in objects on login and teleport by gently appl...teravus2013-05-141-0/+12
| * | | * Tweaks the hard cut to apply to collisions of Greater then Normal Z 0.95. ...teravus2013-05-141-1/+27
| * | | Explicitly zero avatar velocity on sitMelanie2013-05-131-0/+4
| * | | Small adjustments to the floater moduleMelanie2013-05-132-2/+5
| * | | Guard against trying to access terrain heights out of bounds. Clamp to sim.Melanie2013-05-111-1/+9
| * | | Refactor to get closer to coreMelanie2013-05-112-3/+3
| * | | Remove dumb "Region found!" message from map searchMelanie2013-05-061-2/+2
| * | | Implement llSetContentType using the new OpenID auth support for authenticationMelanie2013-05-055-1/+71
| * | | Add RegionManager level and the ability to use literal XML to the dynamic flo...Melanie2013-05-044-5/+17
| * | | Add llGetPhysicsMaterialMelanie2013-05-043-0/+18
| * | | Fix the long standing bug of items being delivered to lost and found or trash...Melanie2013-05-011-2/+3
| * | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...Melanie2013-04-301-2/+8
| |\ \ \
| | * | | Fix bug where an agent that declined an inventory offer and subsequently empt...Justin Clark-Casey (justincc)2013-04-301-2/+8
| * | | | Fix CAPS to work like they should - do not send caps to the viewer if they're...Melanie2013-04-303-4/+18
| |/ / /
| * | | Merge branch 'ubitwork' into avination-currentMelanie2013-04-280-0/+0
| |\ \ \
| | * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-04-28557-21756/+45174
| | |\ \ \
| | * \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-04-2841-502/+1200
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...Melanie2013-04-28567-22204/+46320
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Controller module for dynamic floaters (WIP)Melanie2013-04-272-0/+279
| | * | | | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th...Melanie2013-04-253-13/+8
| | * | | | Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-251-2/+1
| | * | | | Adding the dynamic menu module which allows registering new menu options in c...Melanie2013-04-252-0/+339
| | * | | | Send 503 when throttling texturesMelanie2013-04-252-2/+34
| | * | | | Gods module cleanupMelanie2013-04-251-10/+0
| | * | | | Add the enter uuid dialogMelanie2013-04-221-0/+7
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-261-36/+40
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-2620-397/+413
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-171-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-171-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-162-1/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-161-3/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-161-3/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-164-26/+37
| |\ \ \ \ \ \ \ \ \ \ \ \