aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+1
|\
| * Some people don't use Simian. Make the connector respect that it's disabledMelanie2010-06-121-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-1210-106/+215
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-06-1115-111/+23
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-114-48/+100
| | |\
| | | * Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFol...Justin Clark-Casey (justincc)2010-06-1114-84/+22
| | * | Remove the lastmap stuff from the map module, also remove a bunch of commentsMelanie2010-06-111-27/+1
| * | | * Added a new method to IMapImageGenerator for getting the map tile before it...John Hurliman2010-06-115-31/+114
| | |/ | |/|
| * | Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(Inve...Justin Clark-Casey (justincc)2010-06-1114-22/+84
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-06-114-100/+39
| |\ \ | | |/
| * | create inactive test for iar folders/items merged with existing pathsJustin Clark-Casey (justincc)2010-06-114-48/+100
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-111-3/+4
|\ \ \ | | |/ | |/|
| * | Reinstated the check on im.binaryBucket.Length, this time on the local handle...Diva Canto2010-06-111-3/+4
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-113-99/+34
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-06-118-34/+70
| |\ \
| * | | Inventory offers and subsequent notifications of acceptance/decline now worki...Diva Canto2010-06-113-99/+34
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-110-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Add the AllowLightShareFunctions exampleMelanie2010-06-111-0/+3
| | |/ | |/|
* | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-06-112-1/+16
|\ \ \
| * | | Revert "Remove the cm* function namespace"Melanie Thielker2010-06-112-1/+16
* | | | Remove a company name referecne from the exampleMelanie2010-06-111-2/+2
|/ / /
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-110-0/+0
|\ \ \ | |/ /
| * | Remove the cm* function namespaceMelanie Thielker2010-06-112-16/+1
* | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-06-112-16/+1
|\ \ \
| * | | Remove the cm* function namespaceMelanie Thielker2010-06-112-16/+1
| * | | Rename CM files to LSMelanie Thielker2010-06-113-26/+26
| * | | Rename cm* function set to ls* (for LightShare)Melanie Thielker2010-06-113-15/+30
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-115-96/+122
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Rename CM files to LSMelanie Thielker2010-06-113-26/+26
| * | Rename cm* function set to ls* (for LightShare)Melanie Thielker2010-06-113-15/+30
| * | Clone cmGetAvatarList into osGetAvatarList for more generic use.Melanie Thielker2010-06-113-0/+33
| |/
| * Better friends notification: get rid of OnLogout and use OnClientClose for se...Diva Canto2010-06-111-23/+14
| * Bug fix on friends notifications. OnClientClose and OnLogout ordering are unp...Diva Canto2010-06-101-8/+33
| * Added more debug messages to try to pinpoint where login is failing for nebadon.Diva Canto2010-06-101-14/+45
* | Remove cmGetAvatarList()Melanie Thielker2010-06-113-30/+0
* | Clone cmGetAvatarList into osGetAvatarList for more generic use.Melanie Thielker2010-06-113-0/+33
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-093-21/+34
|\ \ | |/
| * Bug fix on attachments: attach->drop->attach works now.Diva Canto2010-06-092-21/+30
| * Reverting that last permissions check upon drop. Looks like all dropped attac...Diva Canto2010-06-091-10/+5
| * Bug fix on attachments: don't delete the item from inventory when it's droppe...Diva Canto2010-06-091-4/+9
| * Bug fix in attachments: when attaching from inworld the item's parentFolderID...Diva Canto2010-06-091-1/+5
| * Give attachments the same priority as other avatars in BestAvatarResponsivenessMelanie2010-06-091-1/+4
* | Give attachments the same priority as other avatars in BestAvatarResponsivenessMelanie2010-06-091-1/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-0917-123/+147
|\ \ | |/
| * Add the BEGIN; I had missedMelanie2010-06-091-0/+1
| * Re-add Migration version 32, which apparently got dropped completely.Melanie2010-06-091-0/+72
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-0916-123/+128
| |\
| | * Refactor SendCoarseLocations for better performance. Instead of computing lis...Dan Lake2010-06-086-67/+59
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-06-083-22/+57
| | |\
| | * | Changed XInventoryData's CreatorID to a string.Diva Canto2010-06-082-3/+3