Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+1 |
|\ | |||||
| * | * Added CHANGED_TELEPORT event trigger upon inter-sim teleports. | Diva Canto | 2010-06-12 | 1 | -1/+1 |
| | | | | | | | | * Cleaned up NewUserConnection. | ||||
| * | Make local teleports send CHANGED_TELEPORT | Melanie Thielker | 2010-06-12 | 1 | -0/+3 |
| | | |||||
* | | Make local teleports send CHANGED_TELEPORT | Melanie Thielker | 2010-06-12 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 6 | -91/+81 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-06-11 | 8 | -66/+16 |
| |\ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-11 | 2 | -36/+48 |
| | |\ | |||||
| | | * | Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 7 | -39/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | GetFolder(InventoryFolderBase folder)" This reverts commit 3525195bc9b5fdfd9799411edd452981ef1f4ebd. | ||||
| | * | | Remove the lastmap stuff from the map module, also remove a bunch of comments | Melanie | 2010-06-11 | 1 | -27/+1 |
| | | | | | | | | | | | | | | | | that no longer reflect actual conditions | ||||
| * | | | * Added a new method to IMapImageGenerator for getting the map tile before ↵ | John Hurliman | 2010-06-11 | 3 | -28/+32 |
| | |/ | |/| | | | | | | | | | | | | | | | | it is JPEG2000 compressed * Aesthetically improved map tile water * SimianGrid connector now uploads a PNG tile to the AddMapTile API | ||||
| * | | Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 7 | -15/+39 |
| | | | | | | | | | | | | | | | | | | | | | 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-09 | 2 | -3/+4 |
|\ \ | |/ | |||||
| * | Refactor SendCoarseLocations for better performance. Instead of computing ↵ | Dan Lake | 2010-06-08 | 1 | -3/+0 |
| | | | | | | | | list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations. | ||||
| * | * Changed CreatorIDs consistently to varchar(128) | Diva Canto | 2010-06-08 | 1 | -0/+4 |
| | | | | | | | | | | * Deleted redundant migration for assets in SQLite * Rewrote XInventory migrations in SQLite in the new style | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-07 | 5 | -113/+194 |
|\ \ | |/ | |||||
| * | * Bug fix in TP home: typo in unpacking of GridUserInfo. | Diva Canto | 2010-06-05 | 1 | -0/+11 |
| | | | | | | | | * Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions. | ||||
| * | 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 | 6 | -283/+271 |
|\ \ | |/ | |||||
| * | 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 | 2 | -2/+2 |
| | | | | | | | | easily configured for test purposes | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-06-04 | 3 | -29/+44 |
| |\ | |||||
| | * | Fixed a couple of buglets in Friendship offers / acceptance / decline when ↵ | Diva Canto | 2010-06-04 | 3 | -29/+44 |
| | | | | | | | | | | | | 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 | ||||
| * | Continuing refactor. Refactor DeRezObject to deal with multiple objects | Melanie Thielker | 2010-06-01 | 2 | -2/+29 |
| | | |||||
* | | Continuing refactor. Refactor DeRezObject to deal with multiple objects | Melanie Thielker | 2010-06-01 | 2 | -2/+29 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-05-29 | 7 | -230/+220 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-28 | 7 | -230/+220 |
| |\ \ | | |/ | |||||
| | * | 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 | ||||
| | * | fission UserAccountService.HandleCreateUser() into two methods, one which ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -52/+50 |
| | | | | | | | | | | | | handles user command parsing and another which actually does the work | ||||
| | * | Add ability to load IARs directly from URIs | Justin Clark-Casey (justincc) | 2010-05-28 | 2 | -6/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | So, something like load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar Will load my IAR directly from the web. | ||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -1/+1 |
| | | |