aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into vehiclesMelanie2009-10-192-2/+25
|\
| * Formatting cleanup.Jeff Ames2009-10-191-2/+2
| * * One more tweak to inform the user that they may not be able to move until r...Teravus Ovares (Dan Olivares)2009-10-161-3/+5
| * * fix previous commitTeravus Ovares (Dan Olivares)2009-10-161-1/+1
| * * Ensure that at least 20 frames run before letting avatar in.Teravus Ovares (Dan Olivares)2009-10-161-0/+11
| * * Make sure to unregister the OutOfBounds Physics event in RemoveFromPhysical...Teravus Ovares (Dan Olivares)2009-10-161-0/+1
| * * A hacky attempt at resolving mantis #4260. I think ODE was unable to allo...Teravus Ovares (Dan Olivares)2009-10-161-0/+9
* | Merge branch 'master' into vehiclesMelanie2009-10-153-9/+11
|\ \ | |/
| * * Request from lkalif to have the Sim send a coarselocationupdate for each av...Teravus Ovares (Dan Olivares)2009-10-151-3/+4
| * * Replaced (possibly broken?) math for calculating the unix timestamp in MySQ...John Hurliman2009-10-143-6/+7
* | Merge branch 'master' into vehiclesMelanie2009-10-159-175/+264
|\ \ | |/
| * Merge branch 'master' into htb-throttleMelanie2009-10-141-0/+1
| |\
| | * Setting changeY in border crossing.Diva Canto2009-10-141-0/+1
| * | Merge branch 'master' into htb-throttleMelanie2009-10-144-75/+172
| |\ \ | | |/
| | * * Fixes some prim crossings on megaregions with regions beyond the 512m markTeravus Ovares (Dan Olivares)2009-10-131-21/+93
| | * * Fixes http://opensimulator.org/mantis/view.php?id=4225Diva Canto2009-10-123-54/+79
| * | Optimized heartbeat by calling Update() only on updated objects.Dan Lake2009-10-133-73/+52
| * | * Consolidated adding / removing ClientManager IClientAPIs to two places in S...John Hurliman2009-10-131-0/+4
| * | * Rewrote ClientManager to remove Lindenisms from OpenSim core, improve perfo...John Hurliman2009-10-132-4/+4
| * | * Unregister event handlers in LLUDPServer when a client logs out and disconn...John Hurliman2009-10-134-20/+28
| * | Merge branch 'master' into htb-throttleMelanie2009-10-121-56/+54
| |\ \ | | |/
| * | Merge branch 'master' into htb-throttleMelanie2009-10-101-4/+11
| |\ \
| * | | Change the backup thread to run on a BackgroundWorker instead of a Thread. I ...John Hurliman2009-10-091-4/+4
* | | | Merge branch 'master' into vehiclesMelanie2009-10-121-56/+54
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed tree crossing. This will alleviateDiva Canto2009-10-111-56/+54
| | |/ | |/|
* | | Merge branch 'master' into vehiclesMelanie2009-10-121-4/+11
|\ \ \ | |/ /
| * | * 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 vehiclesMelanie2009-10-083-6/+9
|\ \ | |/
| * 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
| |\ \ | | |/
| * | Fixing a few compile errors in the previous commitJohn Hurliman2009-10-061-2/+0
* | | Merge branch 'master' into vehiclesMelanie2009-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
| |/ /