aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-2718-53/+347
|\
| * Reverse a conditional in XInventory that made updating system folder evrsion ...Melanie2012-03-271-1/+1
| * Let grided simulators retrieve the user's inventory skeletonDiva Canto2012-03-271-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-2716-49/+348
| |\
| | * Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(user...Snoopy Pfeffer2012-03-275-23/+183
| | * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-03-271-1/+1
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-03-27198-2302/+6721
| | | |\
| | | * | When loading objects from DB, first add to scene, then call TriggerOnSceneObj...Dan Lake2012-03-271-1/+1
| | * | | User level based restrictions for HyperGrid teleports, asset uploads, group c...Snoopy Pfeffer2012-03-2711-25/+164
| | | |/ | | |/|
| * | | Amend to previous commit regarding the config name. Bugs bite.Diva Canto2012-03-271-2/+0
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-03-273-3/+37
|\ \ \ | |/ /
| * | HG: beginning of a more restrictive inventory access procedure (optional). Ex...Diva Canto2012-03-273-3/+37
* | | Merge branch 'master' into careminsterMelanie2012-03-2717-58/+91
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-2710-12/+51
| |\ \
| | * | Add Garmin Kawaguichi to CONTRIBUTORS.txtJustin Clark-Casey (justincc)2012-03-271-0/+1
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-2715-138/+531
| | |\ \
| | | * | BulletSim: make avatar animations update properly.Robert Adams2012-03-263-9/+48
| | | * | BulletSim: update BulletSim binaries and configuration fixing a crash which h...Robert Adams2012-03-265-1/+2
| | * | | In TerrainModule.cs, the command terrain save-tile is modified to remove an u...Garmin Kawaguichi2012-03-271-2/+0
| * | | | Send the config section name up to the service classes themselves (XInventory...Diva Canto2012-03-277-46/+40
| | |/ / | |/| |
* | | | Replace HG linker with core versionMelanie2012-03-271-13/+49
* | | | Merge branch 'master' into careminsterMelanie2012-03-2612-45/+162
|\ \ \ \ | |/ / /
| * | | Add some more overloads to allow registering overloaded methods and listsMelanie2012-03-262-4/+16
| * | | BulletSim: fix typo introducted by previous checkins (git merge sometimes mak...Robert Adams2012-03-261-3/+0
| * | | Merge branch 'bulletsim1'Robert Adams2012-03-2610-41/+149
| |\ \ \
| | * | | BulletSim: update BulletSim.dll and libBulletSim.so with latest versionsRobert Adams2012-03-264-0/+0
| | * | | Merge branch 'bulletsim1' of ssh://island.sciencesim.com/home/sceneapi/radams...Robert Adams2012-03-231-1/+6
| | |\ \ \
| | | * | | BulletSim: remove confusion between angularVelocity and rotationalVelocity (t...Robert Adams2012-03-223-15/+11
| | | * | | BulletSim: add updated (but not working) BulletSim dllsRobert Adams2012-03-214-0/+0
| | | * | | BulletSim: update TODO list. Rearrange code for readability. Add per object f...Robert Adams2012-03-212-17/+17
| | | * | | BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyanc...Robert Adams2012-03-213-4/+11
| | | * | | BulletSim: set buoyancy in only one placeRobert Adams2012-03-211-5/+3
| | | * | | BulletSim: add some new runtime setable parameters to match the dll.Robert Adams2012-03-213-8/+17
| | | * | | BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to the...Robert Adams2012-03-214-0/+0
| | | * | | BulletSim: Update list of TODO tasksRobert Adams2012-03-211-0/+13
| | * | | | BulletSim: change default of shouldDisableContactPoolDynamicAllocation from F...Robert Adams2012-03-232-3/+3
| | * | | | BulletSim: Add new configuration parameters to get and set console commandsRobert Adams2012-03-231-4/+32
| | * | | | BulletSim: add a bunch of internal Bullet configuration parameters to OpenSim...Robert Adams2012-03-233-0/+52
| | * | | | BulletSim: remove confusion between angularVelocity and rotationalVelocity (t...Robert Adams2012-03-233-15/+11
| | * | | | BulletSim: add updated (but not working) BulletSim dllsRobert Adams2012-03-234-0/+0
| | * | | | BulletSim: update TODO list. Rearrange code for readability. Add per object f...Robert Adams2012-03-232-17/+17
| | * | | | BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyanc...Robert Adams2012-03-233-4/+11
| | * | | | BulletSim: set buoyancy in only one placeRobert Adams2012-03-231-5/+3
| | * | | | BulletSim: add some new runtime setable parameters to match the dll.Robert Adams2012-03-233-8/+17
| | * | | | BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to the...Robert Adams2012-03-234-0/+0
| | * | | | BulletSim: Update list of TODO tasksRobert Adams2012-03-231-0/+13
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-265-9/+35
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-261-1/+11
| |\ \ \ \ \
| | * | | | | Fix compile error in ScriptModuelComms and add some debugging into the modInvokeMic Bowman2012-03-251-2/+12
| * | | | | | Add a hust UUID to the script invocationsMelanie2012-03-265-9/+25
| |/ / / / /