aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+1
|\
| * * Added CHANGED_TELEPORT event trigger upon inter-sim teleports.Diva Canto2010-06-121-1/+1
| * Make local teleports send CHANGED_TELEPORTMelanie Thielker2010-06-121-0/+3
* | Make local teleports send CHANGED_TELEPORTMelanie Thielker2010-06-121-0/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-126-91/+81
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-06-118-66/+16
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-112-36/+48
| | |\
| | | * Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFol...Justin Clark-Casey (justincc)2010-06-117-39/+15
| | * | 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-113-28/+32
| | |/ | |/|
| * | Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(Inve...Justin Clark-Casey (justincc)2010-06-117-15/+39
| * | 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-092-3/+4
|\ \ | |/
| * Refactor SendCoarseLocations for better performance. Instead of computing lis...Dan Lake2010-06-081-3/+0
| * * Changed CreatorIDs consistently to varchar(128)Diva Canto2010-06-081-0/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-075-113/+194
|\ \ | |/
| * * Bug fix in TP home: typo in unpacking of GridUserInfo.Diva Canto2010-06-051-0/+11
| * 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-046-283/+271
|\ \ | |/
| * 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-042-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-06-043-29/+44
| |\
| | * Fixed a couple of buglets in Friendship offers / acceptance / decline when av...Diva Canto2010-06-043-29/+44
| * | get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAu...Justin Clark-Casey (justincc)2010-06-042-3/+5
| |/
| * Continuing refactor. Refactor DeRezObject to deal with multiple objectsMelanie Thielker2010-06-012-2/+29
* | Continuing refactor. Refactor DeRezObject to deal with multiple objectsMelanie Thielker2010-06-012-2/+29
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-05-297-230/+220
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-05-287-230/+220
| |\ \ | | |/
| | * 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
| | * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-05-281-1/+1