aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into vehiclesMelanie2009-10-1210-28/+637
|\
| * Fix selling objectsMelanie2009-10-101-4/+3
| * * comment out the velocity test, using updates every 500 ms as set in ScenePr...Teravus Ovares (Dan Olivares)2009-10-102-2/+7
| * 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-103-3/+15
| |/
| * * 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
| * Slight variation on the locking scheme: now locking always, except the ForEac...Diva Canto2009-10-091-9/+9
| * This is to *try* to avoid the exception we are seeing repeatedly:Diva Canto2009-10-091-0/+4
| * Putting this to exactly what it was yesterday around this time, so we can do ...Diva Canto2009-10-092-182/+411
| * Apply http://opensimulator.org/mantis/view.php?id=4066Justin Clark-Casey (justincc)2009-10-091-1/+1
| * * Apply http://opensimulator.org/mantis/view.php?id=3933Justin Clark-Casey (justincc)2009-10-091-7/+13
| * Putting the lock back in TryGetValue.Diva Canto2009-10-082-349/+349
| * Fork UDPBase from libOMV into opensimMelanie2009-10-082-1/+341
| * Added guards against the exception reported:Diva Canto2009-10-081-0/+9
* | Merge branch 'master' into vehiclesMelanie2009-10-0837-4512/+3057
|\ \ | |/
| * One last attempt at tunning the locking/no locking behaviour. The previous on...Diva Canto2009-10-071-10/+16
| * Another go at the deadlock: not locking TryGetValue, and just catch/ignore ex...Diva Canto2009-10-071-15/+31
| * Changed the locking mechanism, because the existing one is causing deadlocks ...Diva Canto2009-10-071-25/+100
| * 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
| * | replace LLClientView with proper versionMelanie2009-10-071-1898/+1332
| * | Replace LLClientView on the branch with master. UNCOMPILABLE!Melanie2009-10-071-1332/+1898
| * | 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-078-174/+127
| * | Revert "Merging in diva's locking fixes"Melanie2009-10-078-174/+127
| * | Commented noisy debugging about packet splittingJohn Hurliman2009-10-061-4/+4
| * | Merging in diva's locking fixesJohn Hurliman2009-10-068-127/+174
| |\ \ | | |/
| | * Rewrote parts of the code that were double-locking different objects. This is...Diva Canto2009-10-068-127/+174
| * | Checks the number of ThreadPool and IOCP threads on startup and bumps up the ...John Hurliman2009-10-061-0/+12
| * | Applying the real fix (thank you for tracking that MSDN doc down Melanie)John Hurliman2009-10-061-5/+6
| * | Trying Melanie's fixJohn Hurliman2009-10-061-3/+4
| * | Added a debug line for nebadonJohn Hurliman2009-10-061-0/+3
| * | * Added a sanity check for Mono before trying to enumerate over an empty Sort...John Hurliman2009-10-062-4/+7
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-thr...John Hurliman2009-10-064-2/+22
| |\ \ | | |/
| | * * Removed verbose debug messageDiva Canto2009-10-062-2/+2
| | * Removing dependencies on System.Runtime.Remoting.Diva Canto2009-10-061-0/+4
| * | * Added missing references to prebuild.xml and commented out the LindenUDP te...John Hurliman2009-10-067-195/+195
| * | * Try/catch around EndInvoke() when Util.FireAndForget() returns to catch exc...John Hurliman2009-10-063-78/+112
| * | Fixing a few compile errors in the previous commitJohn Hurliman2009-10-069-11/+0
| * | * Continued work on the new LLUDP implementation. Appears to be functioning, ...John Hurliman2009-10-0613-2116/+1028
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-thr...John Hurliman2009-10-0515-112/+206
| |\ \
| * | | Beginning work on the new LLUDP implementationJohn Hurliman2009-10-0513-2329/+1816
* | | | Correct a build break caused by an optimization in trunkMelanie2009-10-071-1/+1
* | | | Merge branch 'master' into vehiclesMelanie2009-10-069-28/+70
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-061-6/+6
| |\ \ \