Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Fix merge artefacts | Melanie | 2012-07-17 | 1 | -7/+2 | |
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 1 | -0/+4 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 1 | -3/+56 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-06-21 | 1 | -50/+62 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove two causes of recursive locking. Merge artefact cleanup. | Melanie | 2012-06-06 | 1 | -7/+5 | |
| * | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-05-27 | 1 | -10/+18 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-05 | 1 | -2/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' | Melanie | 2012-05-02 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Preserve attachment rotation on objects rezzed via a script. Makes toasters | Melanie | 2012-05-02 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-13 | 1 | -68/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-09 | 1 | -0/+50 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster | Melanie | 2012-03-22 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 1 | -8/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 1 | -9/+15 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Remove backup optimization that was causing prim contents to poof | Melanie | 2011-11-05 | 1 | -3/+8 | |
| * | | | | | | | | | | | | | | | | | | | Fix a missing locking call | Melanie | 2011-10-25 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Bring us up to date. | Tom | 2011-09-14 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -4/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2011-04-30 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Set the attachment data on scripted rez to allow toasters to work. | Melanie | 2011-04-30 | 1 | -0/+3 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | A stab at making CHANGED_OWNER work | Melanie | 2011-04-01 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-14 | 1 | -2/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix script data not being reset as it should be | Melanie | 2011-01-24 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix slam bits being lost when editing perms in prim inventory | Melanie | 2011-01-14 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix direct item give permissions | Melanie | 2011-01-12 | 1 | -6/+16 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Partial permissions fix for boxed items. | Melanie | 2011-01-10 | 1 | -10/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Preserve the script running flag when copying an object. | Melanie | 2011-01-08 | 1 | -0/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix a couple of security issues | Melanie | 2011-01-08 | 1 | -3/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix god mode perms adjustment | Melanie | 2011-01-06 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-25 | 1 | -3/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix up some locking issues in task inventory. Don't use any prior versions in... | Melanie | 2010-12-22 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore CM loking after core extract | Melanie | 2010-12-21 | 1 | -65/+64 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make prim inventories a bit more sane | Melanie | 2010-12-21 | 1 | -43/+33 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -17/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lock the iteration over the inventory items when saving script states | Melanie | 2010-09-28 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -47/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if you can't edit a prim's inventory, you don't need to see the asset ids. | Melanie | 2010-09-24 | 1 | -1/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -4/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 1 | -0/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't fart when deserializing a prim with no ParentGroup set yet | meta7 | 2010-09-15 | 1 | -1/+5 |