Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 5 | -5/+0 |
|\ | |||||
| * | Deleted OpenSim.Framework.Communications. Moved its two remaining files to Op... | Diva Canto | 2015-09-04 | 5 | -5/+0 |
* | | bad merge? | UbitUmarov | 2015-09-01 | 1 | -0/+3 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 1 | -2/+2 |
| |\ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2013-11-23 | 1 | -2/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-09-01 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 4 | -23/+27 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-16 | 6 | -271/+435 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 1 | -0/+18 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 2 | -5/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 1 | -8/+31 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-01 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-28 | 3 | -15/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-29 | 1 | -32/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Allow load and save of IAR without a password. The password must still be | Melanie | 2012-07-24 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-28 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 3 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-14 | 2 | -82/+129 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 1 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-11 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-25 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 2 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 3 | -34/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-20 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -28/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-27 | 3 | -18/+145 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-22 | 3 | -22/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 3 | -9/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 4 | -56/+95 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-14 | 4 | -132/+269 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 5 | -602/+661 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge issues | Melanie | 2011-02-07 | 1 | -6/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WARNING: massive refactor to follow libomv's latest changes regarding invento... | Diva Canto | 2015-08-08 | 1 | -6/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor: Remove windows build warning about CompressionLevel package ambiguity. | Justin Clark-Casey (justincc) | 2015-03-11 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the IteratingUuidGatherer the only UuidGatherer. | Justin Clark-Casey (justincc) | 2015-01-08 | 1 | -8/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor: Move methods to start a monitored thread, start work in its own thr... | Justin Clark-Casey (justincc) | 2014-11-25 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor: consistently put all test classes in the OpenSim.Tests.Common packa... | Justin Clark-Casey (justincc) | 2014-11-25 | 4 | -4/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve on the last commit to InventoryArchiver: put back the original constr... | Diva Canto | 2014-09-28 | 3 | -10/+23 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifications to previous IAR commits to bring them more inline with existing... | AliciaRaven | 2014-09-23 | 2 | -7/+10 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an event callback for loading IAR files. The callback for creating them a... | AliciaRaven | 2014-09-23 | 7 | -45/+133 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change existing IAR save to use UUID for its callback reference instead of Gu... | AliciaRaven | 2014-09-23 | 5 | -17/+17 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include same content filters for IAR file exports that already exist for OAR ... | AliciaRaven | 2014-09-23 | 2 | -0/+54 |