aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | Groups V2 -- fix mantis #6666Diva Canto2013-06-081-0/+3
| * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Database persistence for keyframes. Contains a Migration.Melanie2013-06-062-4/+32
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-0611-0/+229
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Committing Avination's Keyframe module. This is not hooked up yet and will do...Melanie2013-06-061-0/+766
| | * | | | | | | | | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-06-054-63/+343
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-054-37/+84
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-051-14/+16
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Avoid a deadlock where a script can attempt to take a ScriptInstance.m_Script...Justin Clark-Casey (justincc)2013-06-051-11/+21
| | | * | | | | | | | | | | | Port Avination's inventory send throttlingMelanie2013-06-053-52/+322
| * | | | | | | | | | | | | | Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminsterMelanie2013-06-064-31/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Prevent processing for NpcBlueWall2013-06-051-1/+3
| | * | | | | | | | | | | | | CleanupBlueWall2013-06-051-5/+0
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Remove a couple of orphaned linesBlueWall2013-06-051-3/+0
| | * | | | | | | | | | | | Make locking more uniformBlueWall2013-06-051-14/+19
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | BulletSim: default PhysicsTimeStep to same as the simulator'sRobert Adams2013-06-051-1/+1
| | * | | | | | | | | | | BulletSim: fix corner case when rebuilding a compound linkset whileRobert Adams2013-06-051-11/+46
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-0434-262/+4565
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | New HttpServer_OpenSim.dll with increased limits on number of connections, re...Diva Canto2013-06-041-0/+0
| | * | | | | | | | | | BulletSim: experimental movement of physics execution off of heartbeatRobert Adams2013-06-013-73/+209
| | * | | | | | | | | | Adding standard OpenSim header to source filesBlueWall2013-05-318-0/+216
| | * | | | | | | | | | Adding back the BasicProfileModuleBlueWall2013-05-313-75/+193
| | * | | | | | | | | | Remove unnecessary m_scenes and m_scene from AsyncCommandManager.Justin Clark-Casey (justincc)2013-05-311-6/+1
| | * | | | | | | | | | Lock areas of AsyncCommandManager where multiple threads could try to access/...Justin Clark-Casey (justincc)2013-05-311-111/+177
| | * | | | | | | | | | refactor: Remove unused AsyncCommandManager.PleaseShutdownJustin Clark-Casey (justincc)2013-05-311-19/+1
| | * | | | | | | | | | Fill in fields with default values on profile creationBlueWall2013-05-311-2/+48
| | * | | | | | | | | | Trigger Jenkins buildBlueWall2013-05-301-0/+1
| | * | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-3020-178/+3727
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'work' contains UserProfiles with Robust service and updates reg...BlueWall2013-05-3020-178/+3727
| | | |\ \ \ \ \ \ \ \ \ \