| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into vehicles | Melanie | 2009-10-06 | 1 | -0/+16 |
|\ |
|
| * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-06 | 1 | -6/+6 |
| |\ |
|
| | * | Commenting the DEBUG code that I added yesterday, because it's causing mono t... | Diva Canto | 2009-10-06 | 1 | -6/+6 |
| * | | Lock the heartbeat against multiple invocations. May prevent deadlocks and/or | Melanie | 2009-10-06 | 1 | -0/+10 |
| |/ |
|
| * | Correction on the DEBUG code. | Diva Canto | 2009-10-05 | 1 | -4/+3 |
| * | #if DEBBUG code for monitoring the ThreadPool. | Diva Canto | 2009-10-05 | 1 | -0/+7 |
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 3 | -5/+6 |
|\ \
| |/ |
|
| * | disable physics actors for flexible prims | dahlia | 2009-10-04 | 1 | -3/+4 |
| * | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-04 | 2 | -2/+2 |
| |\ |
|
| | * | * Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF... | John Hurliman | 2009-10-02 | 2 | -2/+2 |
* | | | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 3 | -132/+34 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 3 | -51/+51 |
| |\ \ |
|
| * \ \ | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 51 | -793/+592 |
| |\ \ \
| | |_|/
| |/| | |
|
| * | | | * Change the signature of the agent set appearance callback to prevent unnece... | John Hurliman | 2009-09-30 | 1 | -7/+32 |
| * | | | Remove predecode-j2k and it's assoaciated logic | Melanie | 2009-09-30 | 1 | -122/+0 |
| * | | | Attempting to improve the robustness of texture decoding by always ignoring L... | John Hurliman | 2009-09-30 | 2 | -4/+3 |
* | | | | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 4 | -63/+70 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | - cleaning up LandData/ILandObject capitalization issues | dr scofield (aka dirk husemann) | 2009-10-02 | 3 | -51/+51 |
| | |/
| |/| |
|
| * | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-02 | 1 | -12/+19 |
| |\ \ |
|
| | * | | Added messages to assertions in the failing tests, so that we know which ones... | Diva Canto | 2009-10-01 | 1 | -12/+19 |
| * | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... | Melanie | 2009-10-02 | 3 | -36/+16 |
| |/ / |
|
* | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... | Melanie | 2009-10-02 | 3 | -36/+16 |
* | | | Merge branch 'master' into vehicles | Melanie | 2009-10-01 | 50 | -782/+531 |
|\ \ \
| |/ / |
|
| * | | Removed an innefficent List.Contains lookup from UpdateQueue | James J Greensky | 2009-09-30 | 1 | -5/+4 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-09-30 | 10 | -16/+16 |
| |\ \ |
|
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 10 | -16/+16 |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-09-30 | 48 | -870/+702 |
| |\ \ \
| | |/ / |
|
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 42 | -165/+165 |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim | dr scofield (aka dirk husemann) | 2009-09-29 | 2 | -0/+22 |
| | |\ \ |
|
| | | * | | A little hack to see if this fixes the problems with ~20% of SOG's becoming p... | Diva Canto | 2009-09-29 | 2 | -0/+22 |
| | * | | | This fix addresses the problem where phantom objects do not | Alan M Webb | 2009-09-29 | 1 | -1/+1 |
| | |/ / |
|
| | * | | I think I have fixed something that was broken in the scene setup (tests) and... | Diva Canto | 2009-09-28 | 1 | -3/+4 |
| | * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-28 | 1 | -1/+1 |
| | |\ \ |
|
| | | * | | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-09-29 | 1 | -1/+1 |
| | * | | | Improved the Local grid connector to fetch data from the DB when it doesn't f... | Diva Canto | 2009-09-28 | 1 | -3/+4 |
| | |/ / |
|
| | * | | Neighbours cache working. | Diva Canto | 2009-09-27 | 2 | -3/+5 |
| | * | | Unpacking the mess with OtherRegionUp, so we can have a real cache of the nei... | Diva Canto | 2009-09-27 | 5 | -95/+74 |
| | * | | Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.c... | Diva Canto | 2009-09-26 | 2 | -23/+29 |
| | * | | Fixed MapBlocks bug, wrong order of arguments. First version that seems compl... | Diva Canto | 2009-09-26 | 1 | -7/+1 |
| | * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-26 | 4 | -13/+23 |
| | |\ \ |
|
| | * | | | First pass at the heart surgery for grid services. Compiles and runs minimall... | Diva Canto | 2009-09-26 | 6 | -455/+181 |
| * | | | | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... | John Hurliman | 2009-09-16 | 3 | -16/+36 |
* | | | | | Merge branch '0.6.7-post-fixes' into vehicles | Kitto Flora | 2009-09-30 | 4 | -13/+30 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | * Does a full battery of tests to ensure that the object isn't an attachment ... | Teravus Ovares (Dan Olivares) | 2009-09-25 | 1 | -1/+6 |
| * | | | | * Fixes teleporting within megaregions on HG enabled regions. You can tele... | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -3/+9 |
| * | | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-09-25 | 1 | -0/+7 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | Moved the property RegionLoginsEnabled from GridComms to the Scene -- not the... | Diva Canto | 2009-09-25 | 1 | -0/+7 |
| * | | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-09-25 | 1 | -9/+8 |
| |/ / / |
|
* | | | | And another merge issue | Kitto Flora | 2009-09-30 | 1 | -0/+1 |
* | | | | And another | Kitto Flora | 2009-09-30 | 1 | -1/+1 |