aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2828-123/+730
|\
| * Merge branch 'master' into careminsterMelanie2012-03-282-15/+18
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-273-1/+51
| | |\
| | | * Typo fixMelanie2012-03-281-1/+1
| | * | More on switching the root folder from under the viewer. More experiments.Diva Canto2012-03-272-15/+18
| * | | Typo fixMelanie2012-03-281-1/+1
| * | | Merge branch 'master' into careminsterMelanie2012-03-281-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Fix typosMelanie2012-03-281-2/+2
| * | | Merge branch 'master' into careminsterMelanie2012-03-288-17/+226
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-285-16/+175
| | |\ \ | | | |/
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-273-2/+120
| | | |\
| | | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-282-1/+116
| | | | |\
| | | | * | Add "friends show cache <first-name> <last-name>" command for debugging purpo...Justin Clark-Casey (justincc)2012-03-283-2/+120
| | | * | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarde...Diva Canto2012-03-272-14/+55
| | | | |/ | | | |/|
| | * | | Start on Bulk inventory update via CAPS. Not functional yet. HG v2Melanie2012-03-283-1/+51
| | |/ /
| * | | Merge branch 'master' into careminsterMelanie2012-03-284-48/+73
| |\ \ \ | | |/ /
| | * | Add a corresponding method for items. HG v2Melanie2012-03-282-0/+39
| | * | Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-282-1/+77
| | |/
| | * minor: Add some documentation to OnNewClient and OnClientClosed eventsJustin Clark-Casey (justincc)2012-03-281-2/+10
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-283-4/+2
| | |\
| | * | minor: clean up some code formatting in VivoxVoiceModule.csJustin Clark-Casey (justincc)2012-03-271-54/+25
| * | | Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-282-1/+77
| * | | 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' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2720-61/+128
|\ \ \ \ | |/ / /
| * | | 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
| | | |/ / | | |/| |
* | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-271-13/+49
|\ \ \ \ \ | |/ / / /
| * | | | Replace HG linker with core versionMelanie2012-03-271-13/+49
* | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2629-295/+794
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | |\ \ \