Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-19 | 1 | -6/+16 |
|\ | |||||
| * | fix faulty profile cut parameter checking in llSetPrimitiveParams() - see ↵ | dahlia | 2010-06-19 | 1 | -6/+16 |
| | | | | | | | | Mantis #4510 | ||||
* | | Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql" | Melanie | 2010-06-19 | 1 | -7/+0 |
|/ | | | | | | Didn't do what it said on the package! This reverts commit 8643db3ef0c4dca709d85fc37240a18fd9049520. | ||||
* | This is a HACK! Downright nasty. For some reason, the devs of the mysql | Melanie | 2010-06-19 | 1 | -0/+7 |
| | | | | | connector have decided that their vision of timeouts is the only valid one. This uses reflection to show them the finger. Please test. | ||||
* | Bug fix: wrong name of requester in local friendship offer. | Diva Canto | 2010-06-19 | 1 | -1/+4 |
| | |||||
* | Hunting for the problem in #4777 | Diva Canto | 2010-06-19 | 2 | -0/+5 |
| | |||||
* | Reverting my last two commits, putting back Melanie's exception handler. ↵ | Diva Canto | 2010-06-19 | 1 | -1/+10 |
| | | | | Doesn't solve #4777. | ||||
* | Reinstated the behavior of AddPrimShape *exactly* as it was as of December. ↵ | Diva Canto | 2010-06-19 | 1 | -10/+1 |
| | | | | Trying to fix mantis #4777 | ||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-18 | 5 | -84/+129 |
|\ | |||||
| * | Fix problem where iar load would duplicate huge number of folders | Justin Clark-Casey (justincc) | 2010-06-18 | 3 | -35/+58 |
| | | | | | | | | | | 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 | ||||
* | | Remove an error in meshing error reporting. Now doesn't double-bomb | Melanie | 2010-06-18 | 1 | -1/+1 |
|/ | | | | anymore on a bad sculpt | ||||
* | Revert "Set command timeout to infinity on migrations" | Melanie | 2010-06-17 | 1 | -1/+0 |
| | | | | This reverts commit 51d30fd34a950e0cd71d61ce0666a6d1e90bf233. | ||||
* | Set command timeout to infinity on migrations | Melanie | 2010-06-17 | 1 | -0/+1 |
| | |||||
* | Force newly connecting remote consoles to display a prompt | Melanie | 2010-06-17 | 1 | -0/+7 |
| | |||||
* | * 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 |
| | |||||
* | 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 |
|\ \ | |/ | |||||
| * | 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. | ||||
* | | Merge branch 'master' into 0.7-post-fixes | Melanie | 2010-06-13 | 6 | -78/+139 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-06-12 | 1 | -2/+2 |
| |\ | |||||
| | * | Change name of method to better reflect what it does | Melanie | 2010-06-12 | 1 | -2/+2 |
| | | | |||||
| * | | Added checks for failed UpdateAgent calls. | Diva Canto | 2010-06-12 | 2 | -17/+31 |
| |/ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-06-12 | 1 | -1/+12 |
| |\ | |||||
| | * | Log and eat sculpt meshing exceptions caused by bad jp2 data. | Melanie | 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. | ||||
| * | 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 |
| | | |||||
| * | Resume scripts that have been rezzed from a prim | Melanie | 2010-06-12 | 1 | -0/+2 |
| | | |||||
| * | Change trunk versio to 0.7.1 Dev | Melanie | 2010-06-12 | 1 | -2/+2 |
| | | |||||
* | | Change flavor to 0.7-RC1 | Melanie | 2010-06-12 | 1 | -2/+2 |
|/ | |||||
* | * Tweak the StopFlying() method in LLClientView to fabricate a suitable ↵ | Teravus Ovares (Dan Olivares) | 2010-06-11 | 1 | -21/+36 |
| | | | | landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f | ||||
* | Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet | Melanie | 2010-06-12 | 10 | -19/+71 |
| | | | | we used to send before slimupdates and explicitly send it | ||||
* | Some people don't use Simian. Make the connector respect that it's disabled | Melanie | 2010-06-12 | 1 | -1/+1 |
| | | | | and not try to send a map tile in that case. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-06-11 | 15 | -111/+23 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-11 | 4 | -48/+100 |
| |\ | |||||
| | * | Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 14 | -84/+22 |
| | | | | | | | | | | | | | | | | | | 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 | 5 | -31/+114 |
| |/ |/| | | | | | | | | | | | 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 | 14 | -22/+84 |
| | | | | | | | | | | | | | | 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 | 3 | -100/+36 |
|\ \ | |/ |