Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-16 | 5 | -14/+55 |
|\ | |||||
| * | * Support salted and unsalted password hashes in ↵ | John Hurliman | 2010-06-15 | 1 | -7/+46 |
| | | | | | | | | SimianAuthenticationServiceConnector | ||||
| * | Fixes creation date issue on user accounts. | Diva Canto | 2010-06-15 | 1 | -1/+3 |
| | | |||||
| * | Typo corrected in Robust.HG.ini.example | Diva Canto | 2010-06-14 | 1 | -4/+4 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-15 | 0 | -0/+0 |
| |\ | |||||
| | * | Readusr master version and flavor | Melanie | 2010-06-15 | 1 | -2/+2 |
| | | | |||||
| * | | Readjust master version and flavor | Melanie | 2010-06-15 | 1 | -2/+2 |
| |/ | |||||
| * | Merge branch 'master' into 0.7-post-fixes | Diva Canto | 2010-06-14 | 3 | -8/+5 |
| |\ | |||||
| | * | * Deleted duplicated migration that was failing anyway. | Diva Canto | 2010-06-14 | 2 | -2/+2 |
| | | | | | | | | | | | | * Added an error message in initial estate owner creation that makes it clear what needs to happen. | ||||
| | * | osGetAvatarList: Use AbsolutePosition instead of the position of the physics ↵ | Tom Grimshaw | 2010-06-14 | 1 | -6/+3 |
| | | | | | | | | | | | | actor, or the avatar disappears when they sit down. | ||||
| * | | Merge branch 'master' into 0.7-post-fixes | Melanie | 2010-06-14 | 17 | -428/+678 |
| |\ \ | | |/ | |||||
| * | | Merge branch 'master' into 0.7-post-fixes | Melanie | 2010-06-13 | 10 | -82/+143 |
| |\ \ | |||||
| * | | | Change flavor to 0.7-RC1 | Melanie | 2010-06-12 | 1 | -2/+2 |
| | | | | |||||
* | | | | Add "alert dialog" for sending dialogs to users from the console | Tom Grimshaw | 2010-06-14 | 1 | -0/+13 |
| | | | | |||||
* | | | | osGetAvatarList: Use AbsolutePosition instead of the position of the physics ↵ | Tom Grimshaw | 2010-06-14 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | actor, or the avatar disappears when they sit down. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-14 | 21 | -449/+713 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fixes attachments coming back upon being detached in neighbouring regions ↵ | Diva Canto | 2010-06-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | and crossing. | ||||
| * | | | Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵ | Diva Canto | 2010-06-13 | 13 | -79/+55 |
| | | | | | | | | | | | | | | | | neighbours. | ||||
| * | | | Fox my changes to radmin | Melanie | 2010-06-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following | Melanie | 2010-06-13 | 3 | -351/+624 |
| | |/ | |/| | | | | | | | | | | | | | | | | changes: - Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it - Adjusted comments to remove misleading or no longer true comments. Default is neuter, according to the code, not male, as the comment stated. | ||||
| * | | Added Old Guids=true to all MySql connection strings. | Diva Canto | 2010-06-12 | 4 | -4/+4 |
| | | | |||||
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-06-12 | 1 | -2/+2 |
| |\ \ | |||||
| * | | | Added checks for failed UpdateAgent calls. | Diva Canto | 2010-06-12 | 2 | -17/+31 |
| | | | | |||||
* | | | | D.U.H. #2. Inverted test. Again. Argh! | Melanie Thielker | 2010-06-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Guard against a potential nullref | Melanie Thielker | 2010-06-14 | 1 | -1/+2 |
| | | | | |||||
* | | | | Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat ↵ | Melanie Thielker | 2010-06-14 | 2 | -23/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | position if" This reverts commit f59e272643a92b20e7f7eb97f54a30c8b045725d. | ||||
* | | | | Revert "D.U.H." | Melanie Thielker | 2010-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 305876180690e5c236d6bda60a6173a16ad5edc8. | ||||
* | | | | Revert "Try it witht he root prim" | Melanie Thielker | 2010-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This reverts commit d520360cb83bb3f7733228ff74cf083b0855b261. | ||||
* | | | | Report current position instead of position at the time we sat down | Melanie Thielker | 2010-06-14 | 2 | -1/+8 |
| | | | | |||||
* | | | | Try it witht he root prim | Melanie Thielker | 2010-06-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | D.U.H. | Melanie Thielker | 2010-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | un-reverse a reversed condition | ||||
* | | | | Try to make prims stop moving. Reset velocity, etc, unconditionally. Although | Melanie Thielker | 2010-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | the phys actor may be new, the prim fields could still be set and the slimupdates system would continue sending that data out. | ||||
* | | | | Actually update the SP. EXPERIMENTAL | Melanie Thielker | 2010-06-13 | 1 | -0/+6 |
| | | | | |||||
* | | | | Introduce SOP.UpdateSitters() to update sitting avatars' chat position if | Melanie Thielker | 2010-06-13 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | | needed | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 2 | -61/+80 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Change name of method to better reflect what it does | Melanie | 2010-06-12 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-06-12 | 1 | -1/+12 |
| |\ \ | |||||
| * | | | * Added CHANGED_TELEPORT event trigger upon inter-sim teleports. | Diva Canto | 2010-06-12 | 2 | -59/+81 |
| | | | | | | | | | | | | | | | | * Cleaned up NewUserConnection. | ||||
* | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-06-12 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ \ \ | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-06-12 | 27 | -133/+322 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | | | Get rid of spamming SOG debug message | Tom Grimshaw | 2010-06-12 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+12 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Log and eat sculpt meshing exceptions caused by bad jp2 data. | Melanie | 2010-06-12 | 1 | -1/+12 |
| | |/ / | |/| | | |||||
| * | | | Preserving the link numbers is a serializer's highest duty. | Melanie Thielker | 2010-06-12 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | Prevent region crossings from screwing up complex attachments by preserving link numbers. | ||||
| * | | | Make local teleports send CHANGED_TELEPORT | Melanie Thielker | 2010-06-12 | 1 | -0/+3 |
| | | | | |||||
| * | | | Don't filre CHANGED_INVENTORY if a prim comes in from storage | Melanie | 2010-06-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Preserving the link numbers is a serializer's highest duty. | Melanie Thielker | 2010-06-12 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | Prevent region crossings from screwing up complex attachments by preserving link numbers. | ||||
* | | | | Make local teleports send CHANGED_TELEPORT | Melanie Thielker | 2010-06-12 | 2 | -1/+4 |
| | | | | |||||
* | | | | Don't filre CHANGED_INVENTORY if a prim comes in from storage | Melanie | 2010-06-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -0/+2 |
|\ \ \ \ | |/ / / |