Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 2 | -25/+82 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-12-07 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 3 | -8/+9 | |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 3 | -0/+6 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-23 | 2 | -0/+111 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | stop sending duplicated parcelProprieties at login | UbitUmarov | 2012-09-07 | 1 | -18/+39 | |
| * | | | | | | | | | | | | try to reduce potencial recursive locking | UbitUmarov | 2012-09-01 | 1 | -26/+51 | |
| * | | | | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-07-06 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Remove spammy debug | Melanie | 2012-06-29 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-06-07 | 2 | -2/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Make timed bans / timed passes work as expected. Prevent transmission of media | Melanie | 2012-06-07 | 2 | -2/+34 | |
| * | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-05-05 | 2 | -15/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Adapt some TeleportWithMomentum calls | Melanie | 2012-04-25 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-17 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-11 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 1 | -5/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Remove some unneeded parens | Melanie | 2012-04-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | Adjust Snoopy's contribution for AVN | Melanie | 2012-04-05 | 1 | -56/+14 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-04 | 1 | -1/+57 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 1 | -17/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-05 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 2 | -27/+57 | |
| * | | | | | | | | | | | | | | | | | | | | | | Streamline banning code using existing methods. | Melanie | 2012-02-02 | 1 | -183/+29 | |
| * | | | | | | | | | | | | | | | | | | | | | | Rehook the eject and freeze events that had gotten unhooked in the merge | Melanie | 2012-02-02 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | Fix calculating land prim count type width issue | Melanie | 2012-01-28 | 1 | -8/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 1 | -1/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Fix prim calculations so that > 32767 prims are supported | Melanie | 2012-01-17 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 1 | -4/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 3 | -36/+68 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix parcel prim count and max reporting. Viewer already multiplies. | Melanie | 2011-07-06 | 1 | -5/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "If a user has the rights to edit a parcel's properties, then also all... | root | 2011-07-05 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some flags to control content in search better | Melanie | 2011-06-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-22 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-14 | 2 | -17/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bans so the region owner and estate managers can't be banned by renters | Melanie | 2011-05-09 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-08 | 4 | -35/+130 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the new display name related functions in LSL. This does not | Melanie | 2011-04-08 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 4 | -124/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-03 | 2 | -17/+129 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 4 | -21/+205 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 4 | -24/+217 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |