aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-290-0/+0
|\
| * Committing the Avination calling card moduleMelanie2012-03-291-0/+286
| * Adding the Avination calling card interfaceMelanie2012-03-291-0/+13
| * Pushing the Avination Calling card hooks. Module to follow.Melanie2012-03-291-4/+17
* | Committing the Avination calling card moduleMelanie2012-03-281-0/+286
* | Merge branch 'master' into careminsterMelanie2012-03-2920-85/+471
|\ \ | |/
| * Add comment about setting client.SceneAgent in AddNewClient()Justin Clark-Casey (justincc)2012-03-291-0/+3
| * Simplify friends caching by only doing this for root agents - no functions re...Justin Clark-Casey (justincc)2012-03-289-55/+31
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-287-4/+4
| |\
| | * BulletSim: update 64 bit libraries and change Linux configuration to use the ...Robert Adams2012-03-287-4/+4
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-283-23/+430
| |\ \ | | |/
| | * HG 2.0 Suitcase inventory: proof of concept now working properly with the hea...Diva Canto2012-03-281-10/+11
| | * HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac...Diva Canto2012-03-283-23/+429
| * | Enable voice by default on parcels to weaken effects of viewer 2/3 ParcelVoic...Justin Clark-Casey (justincc)2012-03-281-1/+1
| |/
* | 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' 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