aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-082-1/+30
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-072-1/+30
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-075-8/+14
| | |\
| | | * minor: Comment out debug logging (at warn level) about number of objects forc...Justin Clark-Casey (justincc)2013-06-071-1/+1
| | * | Put the configuration back in FetchInventoryDesc2 cap.Diva Canto2013-06-071-0/+29
* | | | Merge commit '75631e0267dbf58253dfcf6327b4d65f35bbaa6d' into careminsterMelanie2013-06-080-0/+0
|\ \ \ \ | |/ / /
| * | | Supply proper type information for the various types of requestsMelanie2013-06-073-9/+8
| * | | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-079-236/+220
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-06-075-8/+10
|\ \ \ | |/ /
| * | minor: add dr0berts to contributors listJustin Clark-Casey (justincc)2013-06-071-2/+3
| * | Fix regression where multiple close agents could be sent to the wrong neighbo...Justin Clark-Casey (justincc)2013-06-071-1/+6
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-072-4/+27
| |\ \ | | |/
| | * Mantis #6620 (removed debug message)Diva Canto2013-06-071-1/+1
| * | In LocalFriendshipTerminated, send the original client's agentId to the frien...Donnie Roberts2013-06-072-4/+4
* | | 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