| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 1 | -1/+0 |
| |\ | |||||
| | * | Deleted OpenSim.Framework.Communications. Moved its two remaining files to Op... | Diva Canto | 2015-09-04 | 1 | -1/+0 |
| * | | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 1 | -60/+14 |
| * | | bad merge? | UbitUmarov | 2015-09-01 | 1 | -0/+75 |
| |\ \ | |/ |/| | |||||
| | * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 6 | -30/+842 |
| | |\ | |||||
| | | * | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 2 | -4/+6 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' into careminster | Melanie | 2013-11-03 | 2 | -22/+31 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' into careminster | Melanie | 2013-10-04 | 1 | -3/+3 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-08-11 | 2 | -4/+33 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 1 | -1/+1 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-08 | 2 | -9/+14 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-08 | 3 | -0/+767 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Reinstate the timed region change signal | Melanie Thielker | 2014-03-25 | 1 | -0/+4 |
| | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-01-26 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-11 | 1 | -7/+12 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 1 | -44/+63 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 1 | -8/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-06-07 | 1 | -1/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Make the "delay restart" button delay restart for 1 hour rather than aborting | Melanie | 2012-06-07 | 1 | -1/+7 |
| | * | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-06 | 1 | -1/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-11 | 1 | -2/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 1 | -1/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -18/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -2/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 1 | -72/+51 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-08 | 1 | -40/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to abort a pending restart using the viewer UI or a | Melanie | 2012-01-28 | 1 | -0/+6 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Simplify and streamline telehub editing code. Verify rotations and fix | Melanie | 2012-01-24 | 2 | -58/+30 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Reverse the spawn point distance vector | Melanie | 2012-01-24 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Correct a coordinate to make the viewer like it | Melanie | 2012-01-24 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 2 | -94/+85 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-22 | 2 | -70/+91 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 2 | -1/+194 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a debug spam | Melanie | 2011-12-27 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -5/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 1 | -6/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Bring us up to date. | Tom | 2011-09-14 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -28/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some flags to control content in search better | Melanie | 2011-06-20 | 1 | -0/+4 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix up handling of the estate dialog to prevent duplication of ban list names. | Melanie | 2011-05-15 | 1 | -1/+11 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 1 | -4/+145 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the forced landmark and home poermissions because they are now in the | Melanie | 2011-03-23 | 1 | -5/+0 |
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |