| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -1/+1 |
|\ |
|
| * | Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size | Mic Bowman | 2011-11-02 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Revert "fix CopyTo call that was breaking under mono 2.10" | Melanie | 2011-11-03 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | fix CopyTo call that was breaking under mono 2.10 | Mic Bowman | 2011-11-02 | 1 | -1/+1 |
* | | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+10 |
|\ \
| |/ |
|
| * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -0/+10 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -3/+3 |
|\ \
| |/ |
|
| * | comment out some of the currently less useful debug log messages | Justin Clark-Casey (justincc) | 2011-08-11 | 1 | -1/+1 |
| * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -4/+21 |
|\ \
| |/ |
|
| * | More on HG Friends. Added Delete(string, string) across the board. Added secu... | Diva Canto | 2011-05-22 | 1 | -1/+6 |
| * | Fixed permissions bug related to friends in PermissionsModule. Added FriendsD... | Diva Canto | 2011-05-21 | 1 | -3/+15 |
| * | HG Friends working to some extent: friendships offered and accepted correctly... | Diva Canto | 2011-05-19 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -0/+262 |
|\ \
| |/ |
|
| * | Convert SimianMaptile refresh time from ms to seconds. Too many 0's | Mic Bowman | 2011-02-04 | 1 | -11/+12 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 4 | -23/+22 |
|\ \
| |/ |
|
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 1 | -2/+2 |
| * | Reduce amount of debug lopgging put out by some simiangrid connectors. Pleas... | Justin Clark-Casey (justincc) | 2011-01-18 | 4 | -21/+20 |
| * | Moved the map tile processing used by the Simian Grid | Mic Bowman | 2011-01-08 | 2 | -86/+261 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 2 | -4/+2 |
|\ \
| |/ |
|
| * | comment out a couple simian debug messages | Mic Bowman | 2011-01-05 | 2 | -4/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-30 | 1 | -68/+50 |
|\ \
| |/ |
|
| * | Update SimianGridServicesConnector to work more like | Mic Bowman | 2010-12-27 | 1 | -68/+50 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -3/+1 |
|\ \
| |/ |
|
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -0/+2 |
| |\ |
|
| * \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -3/+3 |
| |\ \ |
|
| * \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -26/+27 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -1/+81 |
| |\ \ \ \ |
|
* | | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 1 | -0/+5 |
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 1 | -0/+2 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ... | Diva Canto | 2010-11-21 | 1 | -0/+2 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 1 | -3/+3 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Formatting cleanup. | Jeff Ames | 2010-11-08 | 1 | -3/+3 |
| | |_|/
| |/| | |
|
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -26/+27 |
|\ \ \ \
| |/ / / |
|
| * | | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -26/+27 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -1/+81 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 1 | -1/+81 |
| |\ \ \ |
|
| | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 1 | -1/+81 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 1 | -1/+81 |
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -1/+3 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+3 |
| | |_|/
| |/| | |
|
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -3/+3 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 |
| |\ \ \ |
|
| * | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -3/+1 |
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -3/+1 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -3/+1 |
| | |_|/
| |/| | |
|
| * | | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 1 | -3/+3 |
| | |/
| |/| |
|
* | | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 1 | -3/+3 |