aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* * comment out the velocity test, using updates every 500 ms as set in ScenePr...Teravus Ovares (Dan Olivares)2009-10-101-2/+4
* Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-10-101-1/+1
|\
| * Adjust velocity threshold for triggering flailing. Thanks to KittoFlora for r...dahlia2009-10-101-1/+1
* | * Make ODECharacter respect the scene's requested collision update timeTeravus Ovares (Dan Olivares)2009-10-101-1/+1
|/
* * Fix incorrect math on the Velocity check in PhysicsCollisionUpdate. This ...Teravus Ovares (Dan Olivares)2009-10-101-1/+1
* * Move the 'On Collision Update Movement Animation' routine to above the 'm_i...Teravus Ovares (Dan Olivares)2009-10-101-3/+8
* Merge branch 'master' into htb-throttleMelanie2009-10-071-1/+2
|\
| * A small change in FetchInventoryDescendantsCAPS.Diva Canto2009-10-061-1/+2
| * Uncommented log message on CAPs FetchInventoryDescendantsDiva Canto2009-10-061-3/+3
* | Uncommented log message on CAPs FetchInventoryDescendantsDiva Canto2009-10-071-3/+3
* | Merge branch 'master' into htb-throttleMelanie2009-10-071-0/+1
|\ \ | |/
| * * One more debug message on FetchInventoryDescendantsDiva Canto2009-10-061-0/+1
| * Revert "Rewrote parts of the code that were double-locking different objects....Melanie2009-10-072-43/+29
* | Revert "Merging in diva's locking fixes"Melanie2009-10-072-43/+29
* | Merging in diva's locking fixesJohn Hurliman2009-10-062-29/+43
|\ \ | |/
| * Rewrote parts of the code that were double-locking different objects. This is...Diva Canto2009-10-062-29/+43
* | Added a debug line for nebadonJohn Hurliman2009-10-061-0/+3
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-thr...John Hurliman2009-10-061-0/+16
|\ \ | |/
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-061-6/+6
| |\
| | * Commenting the DEBUG code that I added yesterday, because it's causing mono t...Diva Canto2009-10-061-6/+6
| * | Lock the heartbeat against multiple invocations. May prevent deadlocks and/orMelanie2009-10-061-0/+10
| |/
| * Correction on the DEBUG code.Diva Canto2009-10-051-4/+3
| * #if DEBBUG code for monitoring the ThreadPool.Diva Canto2009-10-051-0/+7
* | Fixing a few compile errors in the previous commitJohn Hurliman2009-10-061-2/+0
|/
* disable physics actors for flexible primsdahlia2009-10-041-3/+4
* Merge branch 'diva-textures-osgrid'Melanie2009-10-042-2/+2
|\
| * * Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF...John Hurliman2009-10-022-2/+2
* | Merge branch 'master' into diva-texturesMelanie2009-10-023-51/+51
|\ \
| * | - cleaning up LandData/ILandObject capitalization issuesdr scofield (aka dirk husemann)2009-10-023-51/+51
* | | Merge branch 'master' into diva-texturesMelanie2009-10-0251-793/+592
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-021-12/+19
| |\
| | * Added messages to assertions in the failing tests, so that we know which ones...Diva Canto2009-10-011-12/+19
| * | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of...Melanie2009-10-023-36/+16
| |/
| * Removed an innefficent List.Contains lookup from UpdateQueueJames J Greensky2009-09-301-5/+4
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-3010-16/+16
| |\
| | * Formatting cleanup.Jeff Ames2009-10-0110-16/+16
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-3048-870/+702
| |\ \ | | |/
| | * Formatting cleanup.Jeff Ames2009-10-0142-165/+165
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensimdr scofield (aka dirk husemann)2009-09-292-0/+22
| | |\
| | | * A little hack to see if this fixes the problems with ~20% of SOG's becoming p...Diva Canto2009-09-292-0/+22
| | * | This fix addresses the problem where phantom objects do notAlan M Webb2009-09-291-1/+1
| | |/
| | * I think I have fixed something that was broken in the scene setup (tests) and...Diva Canto2009-09-281-3/+4
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-281-1/+1
| | |\
| | | * Add copyright header. Formatting cleanup.Jeff Ames2009-09-291-1/+1
| | * | Improved the Local grid connector to fetch data from the DB when it doesn't f...Diva Canto2009-09-281-3/+4
| | |/
| | * Neighbours cache working.Diva Canto2009-09-272-3/+5
| | * Unpacking the mess with OtherRegionUp, so we can have a real cache of the nei...Diva Canto2009-09-275-95/+74
| | * Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.c...Diva Canto2009-09-262-23/+29
| | * Fixed MapBlocks bug, wrong order of arguments. First version that seems compl...Diva Canto2009-09-261-7/+1
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-264-13/+23
| | |\