Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 1 | -0/+7 |
|\ | |||||
| * | One more bug fix in FriendsModule: GrantRights. One of the caches was not ↵ | Diva Canto | 2010-06-28 | 1 | -0/+7 |
| | | | | | | | | being updated. | ||||
| * | Security fix: Allow only textures to be fetched using HTTP texture cap | Melanie Thielker | 2010-06-22 | 1 | -0/+12 |
| | | |||||
* | | Force IM timestamps to current server time to prevent "Saved on" headers | Melanie Thielker | 2010-06-28 | 1 | -0/+4 |
| | | | | | | | | while the sender is online | ||||
* | | Add the object owner UUID into the binary bucket of object to user IM | Melanie Thielker | 2010-06-24 | 1 | -0/+2 |
| | | |||||
* | | Replace the imSessionID, which is useless out of context, with the scope id | Melanie Thielker | 2010-06-24 | 1 | -0/+7 |
| | | | | | | | | in saved IMs | ||||
* | | New viewers don't set the "save offline IM" flag anymore. Set it serverside | Melanie Thielker | 2010-06-24 | 1 | -0/+6 |
| | | | | | | | | so messages get saved | ||||
* | | Security fix: Allow only textures to be fetched using HTTP texture cap | Melanie Thielker | 2010-06-22 | 1 | -0/+12 |
| | | |||||
* | | Set the offline flag in inventory offers | Melanie Thielker | 2010-06-20 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-19 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | Bug fix: wrong name of requester in local friendship offer. | Diva Canto | 2010-06-19 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-18 | 4 | -78/+123 |
|\ \ | |/ | |||||
| * | Fix problem where iar load would duplicate huge number of folders | Justin Clark-Casey (justincc) | 2010-06-18 | 2 | -29/+52 |
| | | | | | | | | | | This was http://opensimulator.org/mantis/view.php?id=4770 Extend unit tests to check for this scenario too | ||||
| * | change TestPartExistingIarPath() to check appropriate folder creation | Justin Clark-Casey (justincc) | 2010-06-18 | 2 | -32/+45 |
| | | | | | | | | change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable | ||||
| * | in IAR utils, return all folders that match a particular path rather than ↵ | Justin Clark-Casey (justincc) | 2010-06-18 | 4 | -27/+36 |
| | | | | | | | | just the first one | ||||
* | | Add "alert dialog" for sending dialogs to users from the console | Tom Grimshaw | 2010-06-14 | 1 | -0/+13 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-14 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵ | Diva Canto | 2010-06-13 | 2 | -2/+2 |
| | | | | | | | | neighbours. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 2 | -36/+48 |
|\ \ | |/ | |||||
| * | Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | GetFolder(InventoryFolderBase folder)" This reverts commit 3525195bc9b5fdfd9799411edd452981ef1f4ebd. | ||||
| * | Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | GetFolder(InventoryFolderBase folder) This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood. This is in line with other methods that alraedy allow requests via uuid | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-06-11 | 2 | -99/+35 |
| |\ | |||||
| * | | create inactive test for iar folders/items merged with existing paths | Justin Clark-Casey (justincc) | 2010-06-11 | 2 | -36/+48 |
| | | | | | | | | | | | | add various helper functions for simplifying test readability | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-11 | 1 | -3/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | Reinstated the check on im.binaryBucket.Length, this time on the local ↵ | Diva Canto | 2010-06-11 | 1 | -3/+4 |
| | | | | | | | | | | | | handler for inventory offers. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-11 | 2 | -98/+33 |
|\ \ \ | |/ / | |||||
| * | | Inventory offers and subsequent notifications of acceptance/decline now ↵ | Diva Canto | 2010-06-11 | 2 | -98/+33 |
| |/ | | | | | | | working across the board. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-11 | 1 | -52/+32 |
|\ \ | |/ | |||||
| * | Better friends notification: get rid of OnLogout and use OnClientClose for ↵ | Diva Canto | 2010-06-11 | 1 | -23/+14 |
| | | | | | | | | sending notifications. This takes care of crashed sessions. Also, made the notifications themselves asynchronous. | ||||
| * | Bug fix on friends notifications. OnClientClose and OnLogout ordering are ↵ | Diva Canto | 2010-06-10 | 1 | -8/+33 |
| | | | | | | | | unpredictable; when OnClientClosed happened first, it was removing the friends list, which would prevent OnLogout notifications to go out. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-09 | 1 | -20/+28 |
|\ \ | |/ | |||||
| * | Bug fix on attachments: attach->drop->attach works now. | Diva Canto | 2010-06-09 | 1 | -21/+29 |
| | | |||||
| * | Reverting that last permissions check upon drop. Looks like all dropped ↵ | Diva Canto | 2010-06-09 | 1 | -10/+5 |
| | | | | | | | | attachments are deleted from inventory. | ||||
| * | Bug fix on attachments: don't delete the item from inventory when it's ↵ | Diva Canto | 2010-06-09 | 1 | -4/+9 |
| | | | | | | | | dropped on the ground. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-07 | 4 | -113/+183 |
|\ \ | |/ | |||||
| * | Bug fix: update the list of friends upon MakeRoot, because child agents ↵ | Diva Canto | 2010-06-05 | 1 | -1/+1 |
| | | | | | | | | don't get notified of new friendships. | ||||
| * | various refactorings on methods to replicate IAR paths to user inventory in ↵ | Justin Clark-Casey (justincc) | 2010-06-05 | 2 | -82/+128 |
| | | | | | | | | order to improve readability | ||||
| * | refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory() | Justin Clark-Casey (justincc) | 2010-06-04 | 2 | -11/+8 |
| | | |||||
| * | add ability for load iar/save iar to take in arbitrary options | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -20/+47 |
| | | | | | | | | not used for anything yet | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-04 | 4 | -279/+269 |
|\ \ | |/ | |||||
| * | bring TestLoadIarV0_1AbsentUsers() back online | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -63/+56 |
| | | |||||
| * | bring TestIarV0_1WithEscapedChars() back online | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -89/+72 |
| | | |||||
| * | bring test TestLoadIarV0_1ExistingUsers() back online | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -81/+76 |
| | | |||||
| * | remove pointless mock user account service since the real one can now be ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -1/+1 |
| | | | | | | | | easily configured for test purposes | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-06-04 | 2 | -26/+43 |
| |\ | |||||
| | * | Fixed a couple of buglets in Friendship offers / acceptance / decline when ↵ | Diva Canto | 2010-06-04 | 2 | -26/+43 |
| | | | | | | | | | | | | avies are in different sims. | ||||
| * | | get TestSaveIarV0_1() working again by setting up an ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 2 | -3/+5 |
| |/ | | | | | | | | | | | OpenSim.Data.Null.UserAuthenticationData plugin additional tweaks to get this working properly | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-28 | 4 | -166/+154 |
|\ \ | |/ | |||||
| * | get TestSaveIarV0_1() uncommented but not running as a test yet since I ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -106/+99 |
| | | | | | | | | didn't get the authentication server to work and my brain is about to fizzle out my ears | ||||
| * | restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -51/+37 |
| | | | | | | | | work with the new UserAccountService/InventoryService |