aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-122-36/+48
|\
| * Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFol...Justin Clark-Casey (justincc)2010-06-111-2/+2
| * Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(Inve...Justin Clark-Casey (justincc)2010-06-111-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-06-112-99/+35
| |\
| * | create inactive test for iar folders/items merged with existing pathsJustin Clark-Casey (justincc)2010-06-112-36/+48
* | | 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-112-98/+33
|\ \ \ | |/ /
| * | Inventory offers and subsequent notifications of acceptance/decline now worki...Diva Canto2010-06-112-98/+33
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-111-52/+32
|\ \ | |/
| * 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
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-091-20/+28
|\ \ | |/
| * Bug fix on attachments: attach->drop->attach works now.Diva Canto2010-06-091-21/+29
| * 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
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-074-113/+183
|\ \ | |/
| * Bug fix: update the list of friends upon MakeRoot, because child agents don't...Diva Canto2010-06-051-1/+1
| * various refactorings on methods to replicate IAR paths to user inventory in o...Justin Clark-Casey (justincc)2010-06-052-82/+128
| * refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()Justin Clark-Casey (justincc)2010-06-042-11/+8
| * add ability for load iar/save iar to take in arbitrary optionsJustin Clark-Casey (justincc)2010-06-041-20/+47
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-044-279/+269
|\ \ | |/
| * bring TestLoadIarV0_1AbsentUsers() back onlineJustin Clark-Casey (justincc)2010-06-041-63/+56
| * bring TestIarV0_1WithEscapedChars() back onlineJustin Clark-Casey (justincc)2010-06-041-89/+72
| * bring test TestLoadIarV0_1ExistingUsers() back onlineJustin Clark-Casey (justincc)2010-06-041-81/+76
| * remove pointless mock user account service since the real one can now be easi...Justin Clark-Casey (justincc)2010-06-041-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-06-042-26/+43
| |\
| | * Fixed a couple of buglets in Friendship offers / acceptance / decline when av...Diva Canto2010-06-042-26/+43
| * | get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAu...Justin Clark-Casey (justincc)2010-06-042-3/+5
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-284-166/+154
|\ \ | |/
| * get TestSaveIarV0_1() uncommented but not running as a test yet since I didn'...Justin Clark-Casey (justincc)2010-05-281-106/+99
| * restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to w...Justin Clark-Casey (justincc)2010-05-281-51/+37
| * fission UserAccountService.HandleCreateUser() into two methods, one which han...Justin Clark-Casey (justincc)2010-05-281-52/+50
| * Add ability to load IARs directly from URIsJustin Clark-Casey (justincc)2010-05-282-6/+18
| * refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHe...Justin Clark-Casey (justincc)2010-05-281-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-9/+7
|\ \ | |/
| * Only send dialogs and notices to root agents, not child agentsJustin Clark-Casey (justincc)2010-05-211-9/+7
* | Prevent an "index out of range" error on loginMelanie Thielker2010-05-181-2/+5
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-05-161-1/+2
|\ \
| * | Don't convert UUID -> ToString for every friend (Minor optimisation based on ...Tom Grimshaw2010-05-121-1/+2
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-162-2/+7
|\ \ \ | |/ / |/| / | |/
| * Address symptom of Mantis 4588 (though not the cause) by moving the avatar de...Justin Clark-Casey (justincc)2010-05-151-2/+3
| * Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671Justin Clark-Casey2010-05-141-0/+4
* | Correct an odd merge anomalyTom Grimshaw2010-05-101-1/+1
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-05-104-98/+91
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-05-101-0/+2
| |\ \ | | |/
| | * * Fixed spamming the assets table with map tiles. The tile image ID is now st...Diva Canto2010-05-091-0/+2
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-093-98/+89
| |\ \ | | |/
| | * More cleaning on presence. Friends online/offline works again.Diva Canto2010-05-083-98/+89
| | * Strip estate message sending out from the estate management module andMelanie Thielker2010-05-041-8/+0
generated by cgit v1.1 at 2024-09-27 21:29:48 +0000