| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 20 | -85/+471 |
|\ \
| |/ |
|
| * | Add comment about setting client.SceneAgent in AddNewClient() | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -0/+3 |
| * | Simplify friends caching by only doing this for root agents - no functions re... | Justin Clark-Casey (justincc) | 2012-03-28 | 9 | -55/+31 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 7 | -4/+4 |
| |\ |
|
| | * | BulletSim: update 64 bit libraries and change Linux configuration to use the ... | Robert Adams | 2012-03-28 | 7 | -4/+4 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 3 | -23/+430 |
| |\ \
| | |/ |
|
| | * | HG 2.0 Suitcase inventory: proof of concept now working properly with the hea... | Diva Canto | 2012-03-28 | 1 | -10/+11 |
| | * | HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac... | Diva Canto | 2012-03-28 | 3 | -23/+429 |
| * | | Enable voice by default on parcels to weaken effects of viewer 2/3 ParcelVoic... | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 2 | -15/+18 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 3 | -1/+51 |
| |\ |
|
| | * | Typo fix | Melanie | 2012-03-28 | 1 | -1/+1 |
| * | | More on switching the root folder from under the viewer. More experiments. | Diva Canto | 2012-03-27 | 2 | -15/+18 |
* | | | Typo fix | Melanie | 2012-03-28 | 1 | -1/+1 |
* | | | 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 | 8 | -17/+226 |
|\ \ \
| |/ / |
|
| * | | 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 | 2 | -1/+116 |
| | | |\ |
|
| | | * | | 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 | 3 | -1/+51 |
| |/ / |
|
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 4 | -48/+73 |
|\ \ \
| |/ / |
|
| * | | Add a corresponding method for items. HG v2 | Melanie | 2012-03-28 | 2 | -0/+39 |
| * | | Add SendRemoveInventoryFolders which allows to remove one or more | Melanie | 2012-03-28 | 2 | -1/+77 |
| |/ |
|
| * | 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 | 3 | -4/+2 |
| |\ |
|
| * | | 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 | 2 | -1/+77 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 18 | -53/+347 |
|\ \ \
| | |/
| |/| |
|
| * | | Reverse a conditional in XInventory that made updating system folder evrsion ... | Melanie | 2012-03-27 | 1 | -1/+1 |
| * | | Let grided simulators retrieve the user's inventory skeleton | Diva Canto | 2012-03-27 | 1 | -1/+1 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 16 | -49/+348 |
| |\ \
| | |/ |
|
| | * | 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 | 198 | -2302/+6721 |
| | | |\ |
|
| | | * | | 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 | 11 | -25/+164 |
| | | |/
| | |/| |
|
| * | | | Amend to previous commit regarding the config name. Bugs bite. | Diva Canto | 2012-03-27 | 1 | -2/+0 |
| |/ / |
|
* | | | 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 | 17 | -58/+91 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 10 | -12/+51 |
| |\ \ |
|
| | * | | Add Garmin Kawaguichi to CONTRIBUTORS.txt | Justin Clark-Casey (justincc) | 2012-03-27 | 1 | -0/+1 |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-27 | 15 | -138/+531 |
| | |\ \ |
|
| | | * | | BulletSim: make avatar animations update properly. | Robert Adams | 2012-03-26 | 3 | -9/+48 |
| | | * | | BulletSim: update BulletSim binaries and configuration fixing a crash which h... | Robert Adams | 2012-03-26 | 5 | -1/+2 |
| | * | | | In TerrainModule.cs, the command terrain save-tile is modified to remove an u... | Garmin Kawaguichi | 2012-03-27 | 1 | -2/+0 |
| * | | | | Send the config section name up to the service classes themselves (XInventory... | Diva Canto | 2012-03-27 | 7 | -46/+40 |
| | |/ /
| |/| | |
|