| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -2/+2 |
|\ |
|
| * | Fix typos | Melanie | 2012-03-28 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 6 | -16/+223 |
|\ \
| |/ |
|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-03-28 | 5 | -16/+175 |
| |\ |
|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 3 | -2/+120 |
| | |\ |
|
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -1/+78 |
| | | |\ |
|
| | | * | | Add "friends show cache <first-name> <last-name>" command for debugging purpo... | Justin Clark-Casey (justincc) | 2012-03-28 | 3 | -2/+120 |
| | * | | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarde... | Diva Canto | 2012-03-27 | 2 | -14/+55 |
| | | |/
| | |/| |
|
| * | | | Start on Bulk inventory update via CAPS. Not functional yet. HG v2 | Melanie | 2012-03-28 | 1 | -0/+48 |
| |/ / |
|
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 3 | -48/+72 |
|\ \ \
| |/ / |
|
| * | | Add a corresponding method for items. HG v2 | Melanie | 2012-03-28 | 1 | -0/+38 |
| * | | Add SendRemoveInventoryFolders which allows to remove one or more | Melanie | 2012-03-28 | 1 | -1/+40 |
| |/ |
|
| * | minor: Add some documentation to OnNewClient and OnClientClosed events | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -2/+10 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -1/+1 |
| |\ |
|
| * | | minor: clean up some code formatting in VivoxVoiceModule.cs | Justin Clark-Casey (justincc) | 2012-03-27 | 1 | -54/+25 |
* | | | Add SendRemoveInventoryFolders which allows to remove one or more | Melanie | 2012-03-28 | 1 | -1/+40 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 11 | -48/+299 |
|\ \ \
| | |/
| |/| |
|
| * | | Let grided simulators retrieve the user's inventory skeleton | Diva Canto | 2012-03-27 | 1 | -1/+1 |
| |/ |
|
| * | Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(user... | Snoopy Pfeffer | 2012-03-27 | 5 | -23/+183 |
| * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-03-27 | 1 | -1/+1 |
| |\ |
|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-03-27 | 120 | -1882/+4081 |
| | |\ |
|
| | * | | When loading objects from DB, first add to scene, then call TriggerOnSceneObj... | Dan Lake | 2012-03-27 | 1 | -1/+1 |
| * | | | User level based restrictions for HyperGrid teleports, asset uploads, group c... | Snoopy Pfeffer | 2012-03-27 | 6 | -23/+117 |
| | |/
| |/| |
|
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 3 | -3/+37 |
|\ \ \
| |/ / |
|
| * | | HG: beginning of a more restrictive inventory access procedure (optional). Ex... | Diva Canto | 2012-03-27 | 3 | -3/+37 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 4 | -11/+48 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-27 | 10 | -137/+519 |
| |\ \ |
|
| | * | | BulletSim: make avatar animations update properly. | Robert Adams | 2012-03-26 | 3 | -9/+48 |
| * | | | In TerrainModule.cs, the command terrain save-tile is modified to remove an u... | Garmin Kawaguichi | 2012-03-27 | 1 | -2/+0 |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 7 | -44/+151 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Add some more overloads to allow registering overloaded methods and lists | Melanie | 2012-03-26 | 2 | -4/+16 |
| * | | | BulletSim: fix typo introducted by previous checkins (git merge sometimes mak... | Robert Adams | 2012-03-26 | 1 | -3/+0 |
| * | | | Merge branch 'bulletsim1' | Robert Adams | 2012-03-26 | 5 | -40/+138 |
| |\ \ \ |
|
| | * \ \ | Merge branch 'bulletsim1' of ssh://island.sciencesim.com/home/sceneapi/radams... | Robert Adams | 2012-03-23 | 1 | -1/+6 |
| | |\ \ \ |
|
| | | * | | | BulletSim: remove confusion between angularVelocity and rotationalVelocity (t... | Robert Adams | 2012-03-22 | 3 | -15/+11 |
| | | * | | | BulletSim: update TODO list. Rearrange code for readability. Add per object f... | Robert Adams | 2012-03-21 | 2 | -17/+17 |
| | | * | | | BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyanc... | Robert Adams | 2012-03-21 | 2 | -3/+9 |
| | | * | | | BulletSim: set buoyancy in only one place | Robert Adams | 2012-03-21 | 1 | -5/+3 |
| | | * | | | BulletSim: add some new runtime setable parameters to match the dll. | Robert Adams | 2012-03-21 | 2 | -7/+16 |
| | | * | | | BulletSim: Update list of TODO tasks | Robert Adams | 2012-03-21 | 1 | -0/+13 |
| | * | | | | BulletSim: change default of shouldDisableContactPoolDynamicAllocation from F... | Robert Adams | 2012-03-23 | 1 | -2/+2 |
| | * | | | | BulletSim: Add new configuration parameters to get and set console commands | Robert Adams | 2012-03-23 | 1 | -4/+32 |
| | * | | | | BulletSim: add a bunch of internal Bullet configuration parameters to OpenSim... | Robert Adams | 2012-03-23 | 2 | -0/+43 |
| | * | | | | BulletSim: remove confusion between angularVelocity and rotationalVelocity (t... | Robert Adams | 2012-03-23 | 3 | -15/+11 |
| | * | | | | BulletSim: update TODO list. Rearrange code for readability. Add per object f... | Robert Adams | 2012-03-23 | 2 | -17/+17 |
| | * | | | | BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyanc... | Robert Adams | 2012-03-23 | 2 | -3/+9 |
| | * | | | | BulletSim: set buoyancy in only one place | Robert Adams | 2012-03-23 | 1 | -5/+3 |
| | * | | | | BulletSim: add some new runtime setable parameters to match the dll. | Robert Adams | 2012-03-23 | 2 | -7/+16 |
| | * | | | | BulletSim: Update list of TODO tasks | Robert Adams | 2012-03-23 | 1 | -0/+13 |
* | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 5 | -9/+35 |
|\ \ \ \ \ \
| |/ / / / / |
|