| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -58/+92 |
|\ |
|
| * | Refix the fixed fix! | Melanie | 2012-03-21 | 1 | -2037/+2037 |
| * | Fixed borkness with previous merge. | Diva Canto | 2012-03-20 | 1 | -16/+1 |
| * | Line endings | Diva Canto | 2012-03-20 | 1 | -89/+89 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -61/+89 |
| |\ |
|
| * | | HG Friends: allow the establishment of HG friendships without requiring co-pr... | Diva Canto | 2012-03-20 | 1 | -1954/+1988 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -2/+15 |
|\ \ \
| | |/
| |/| |
|
| * | | Move frame loop entirely within Scene.Update() for better future performance ... | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -2/+15 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 1 | -3/+60 |
|\ \
| |/ |
|
| * | Improve threadpool reporting to "show threads" console command (also gets pri... | Justin Clark-Casey (justincc) | 2012-03-16 | 1 | -1/+55 |
| * | Add process working memory to "show stats" memory statistics. | Justin Clark-Casey (justincc) | 2012-03-16 | 1 | -2/+5 |
* | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -0/+30 |
|\ \
| |/ |
|
| * | Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+30 |
* | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -1/+37 |
|\ \
| |/ |
|
| * | On Windows automatically load the correct native ODE library depending on whe... | Justin Clark-Casey (justincc) | 2012-02-18 | 1 | -1/+37 |
* | | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 1 | -2/+3 |
|\ \
| |/ |
|
| * | Add line numbers to Util.PrintCallStack() | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -2/+3 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 1 | -16/+29 |
|\ \
| |/ |
|
| * | Reactivate BasicCircuitTests.TestAddClient() | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -16/+29 |
* | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+4 |
|\ \
| |/ |
|
| * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -3/+4 |
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -2/+40 |
|\ \
| |/ |
|
| * | In an object return message, send a null-terminated empty string in binary bu... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -2/+40 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -6/+34 |
|\ \
| |/ |
|
| * | If a FireAndForget thread terminates with an exception, then catch and log ra... | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -1/+15 |
| * | Add new FireAndForgetMethod.None. | Justin Clark-Casey (justincc) | 2011-08-16 | 1 | -1/+10 |
| * | For all Util.FireAndForget invocations, set thread to en_US before continuing... | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -5/+10 |
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-09 | 1 | -8/+33 |
|\ \
| |/ |
|
| * | When loading library asset set, only store an asset if it's different from an... | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -3/+13 |
| * | Fix interpretation of physics mesh proxies from mesh data | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -2/+17 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -0/+63 |
|\ \
| |/ |
|
| * | More on HG Friends. Added Delete(string, string) across the board. Added secu... | Diva Canto | 2011-05-22 | 1 | -2/+4 |
| * | HG Friends working to some extent: friendships offered and accepted correctly... | Diva Canto | 2011-05-19 | 1 | -0/+61 |
* | | Merge branch 'queuetest' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -0/+17 |
|\ \
| |/ |
|
| * | Requeue unacknowledged entity updates rather than resend then "as is". | Dan Lake | 2011-04-19 | 1 | -0/+17 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-24 | 1 | -3/+10 |
|\ \
| |/ |
|
| * | Parameterizes the view distance used to compute and manage | Mic Bowman | 2011-02-22 | 1 | -3/+10 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -0/+10 |
|\ \
| |/ |
|
| * | Put something in the ImprovedInstantMessage.BinaryBucket for llInstantMessage... | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -0/+10 |
* | | Revert my previous SHA1 commit in favour of a better implementation | Tom | 2011-01-26 | 1 | -3/+9 |
* | | Provide an SL compatible llMD5String function across all platforms | Tom | 2011-01-26 | 1 | -4/+10 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-13 | 1 | -3/+24 |
|\ \
| |/ |
|
| * | Make FireAndForgetWrapper a singleton class | BlueWall | 2011-01-13 | 1 | -3/+24 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 1 | -0/+81 |
|\ \
| |/ |
|
| * | Preservation of creator information now also working in IARs. Cleaned up usag... | Diva Canto | 2010-11-29 | 1 | -0/+20 |
| * | Changed the parser for InventoryItem deserialization. Moved some utility func... | Diva Canto | 2010-11-27 | 1 | -0/+61 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-18 | 1 | -0/+8 |
|\ \
| |/ |
|
| * | minor: add some method comments | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -0/+8 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -0/+11 |
|\ \
| |/ |
|
| * | Port ExecutingDirectory from omfOS Util class. | Melanie | 2010-10-03 | 1 | -0/+11 |