aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-074-6/+11
| |\
| | * 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
* | | 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-078-236/+219
| |/ |/|
* | 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
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-061-0/+5
| |\
| * | Fix keyframe motion copyrightMelanie2013-06-061-3/+26
* | | In LocalFriendshipTerminated, send the original client's agentId to the frien...Donnie Roberts2013-06-072-4/+4
| |/ |/|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-0513-4/+261
|\ \ | |/
| * Database persistence for keyframes. Contains a Migration.Melanie2013-06-062-4/+32
| * Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-0611-0/+229
* | Strengthen some assumptions.Diva Canto2013-06-051-0/+5
|/
* 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-053-63/+342
|\
| * 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-052-52/+321
* | | | 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
|/
* 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-312-73/+191
* 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
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-3013-176/+3631
|\
| * Merge branch 'work' contains UserProfiles with Robust service and updates reg...BlueWall2013-05-3013-176/+3631
| |\
| | * UserProfilesBlueWall2013-05-3013-176/+3631
* | | 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
|/ /
* | 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
* 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-2834-334/+819
| |\
| * | 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-2011-81/+159
| |\ \