aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | | * UserProfilesBlueWall2013-05-3020-178/+3727
| * | | Trigger OnScenePresenceUpdated when the avatar's animations change.Robert Adams2013-05-302-4/+21
| * | | Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-303-0/+156
| * | | Add region heartbeat start event to complement heartbeat end event.Robert Adams2013-05-302-0/+25
| * | | BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini andRobert Adams2013-05-301-32/+25
| |/ /
| * | If an exception occurs in the AsyncCommandManager loop, spit it out to log ra...Justin Clark-Casey (justincc)2013-05-301-8/+6
| |/
| * minor: fix warnings in GodsModule that were due to duplicate using statementsJustin Clark-Casey (justincc)2013-05-301-11/+7
| * Fix passing of voice distance attenuation to the Vivox voice server.Justin Clark-Casey (justincc)2013-05-301-1/+1
| * If on a sit request we sit the avatar on a different prim in a linkset for so...Justin Clark-Casey (justincc)2013-05-301-3/+3
* | Merge branch 'master' into careminsterMelanie2013-05-3021-64/+150
|\ \ | |/
| * Try caching the user name for a new agent earlier on in the process of establ...Justin Clark-Casey (justincc)2013-05-293-5/+11
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-292-14/+27
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-2839-334/+820
| | |\
| | * | First change in Vivox for ages! -- added a lock to serialize calls to vivox s...Diva Canto2013-05-281-14/+25
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-2019-12093/+12114
| | |\ \
| | * | | Add commentDiva Canto2013-05-201-0/+2
| * | | | Add HG regression TestCachedUserNameForNewAgent()Justin Clark-Casey (justincc)2013-05-292-0/+77
| | |_|/ | |/| |
| * | | BulletSim: don't zero motion when changing vehicle type.Robert Adams2013-05-281-1/+4
| * | | BulletSim: default using mesh asset hulls to 'true'. This means that,Robert Adams2013-05-271-2/+2
| * | | BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOsRobert Adams2013-05-265-1/+1
| * | | Update the money framework to allow sending the new style linden "serverside ...Melanie2013-05-259-44/+32
* | | | Merge branch 'master' into careminsterMelanie2013-05-254-5/+16
|\ \ \ \ | |/ / /
| * | | Meshmerizer: remember to add the copied hull verts to the list of hulls.Robert Adams2013-05-241-0/+1