Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-23 | 3 | -3/+78 | |
|\ | ||||||
| * | Implemented a "FrontBack" prioritizer, using distance plus the plane ↵ | John Hurliman | 2009-10-23 | 3 | -3/+78 | |
| | | | | | | | | equation to give double weight to prims/avatars in front of you | |||||
* | | Adding the presence service skeleton | Melanie | 2009-10-23 | 3 | -0/+192 | |
|/ | ||||||
* | Uncommented the resend log line so the previous commit can be seen in action | John Hurliman | 2009-10-23 | 1 | -1/+1 | |
| | ||||||
* | * Changed the max RTO value to 60 seconds to comply with RFC 2988 | John Hurliman | 2009-10-23 | 2 | -1/+4 | |
| | | | | * Implemented section 5.5, exponential backoff of the RTO after a resend | |||||
* | Commented out noisy debugging about resent packets (normal) and agents ↵ | John Hurliman | 2009-10-23 | 2 | -3/+3 | |
| | | | | setting throttles (normal) | |||||
* | Experimental change to use an immutable array for iterating ScenePresences, ↵ | John Hurliman | 2009-10-23 | 13 | -284/+308 | |
| | | | | avoiding locking and copying the list each time it is accessed | |||||
* | * Moved Copyrights above the comments in ODEPrim and ODEDynamics so they're ↵ | Teravus Ovares (Dan Olivares) | 2009-10-22 | 2 | -26/+28 | |
| | | | | consistent with the rest (and so chi11ken's auto copyright adding script doesn't duplicate the copyright. | |||||
* | * Send out m_bodyRot everywhere instead of m_rotation. Still have no clue ↵ | John Hurliman | 2009-10-22 | 2 | -23/+23 | |
| | | | | | | which is right * Fix WorldMapModule.process() to not trip the watchdog timer | |||||
* | Forgot to hit save in the last commit | John Hurliman | 2009-10-22 | 1 | -1/+1 | |
| | ||||||
* | * Sending (position - hipoffset) instead of position | John Hurliman | 2009-10-22 | 1 | -5/+2 | |
| | | | | * Sending m_rotation instead of m_bodyRot in full updates to match terse updates (no idea which one is right!) | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-10-22 | 1 | -0/+8 | |
|\ | ||||||
| * | Commented out instrumentation in ODEPrim.cs | KittoFlora | 2009-10-22 | 1 | -0/+8 | |
| | | ||||||
* | | Implemented a Watchdog class. Do not manually create Thread objects anymore, ↵ | John Hurliman | 2009-10-22 | 17 | -120/+306 | |
|/ | | | | use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-10-22 | 12 | -743/+1462 | |
|\ | ||||||
| * | Correct version number after merge | Melanie | 2009-10-22 | 1 | -2/+2 | |
| | | ||||||
| * | Merge branch 'vehicles' | Melanie | 2009-10-22 | 13 | -741/+1456 | |
| |\ | ||||||
| | * | Merge branch 'master' into vehicles | Melanie | 2009-10-22 | 150 | -9910/+3402 | |
| | |\ | ||||||
| | * \ | Merge branch 'master' into vehicles | Melanie | 2009-10-19 | 23 | -76/+212 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'master' into vehicles | Melanie | 2009-10-15 | 6 | -22/+27 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into vehicles | Melanie | 2009-10-15 | 56 | -1815/+1989 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into vehicles | Melanie | 2009-10-12 | 8 | -86/+849 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into vehicles | Melanie | 2009-10-12 | 13 | -51/+657 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' into vehicles | Melanie | 2009-10-08 | 55 | -4900/+3424 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Correct a build break caused by an optimization in trunk | Melanie | 2009-10-07 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'master' into vehicles | Melanie | 2009-10-06 | 20 | -133/+249 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Make sure that keys exist in arrays before trying to access them. | Michael Cortez | 2009-10-05 | 1 | -3/+9 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Ensure the specified imSessionID exists in the DroppedSession collection ↵ | Michael Cortez | 2009-10-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before attempting to access it. | |||||
| | * | | | | | | | | | Adapt to renamed members in landObject | Melanie | 2009-10-05 | 1 | -10/+10 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy up | unknown | 2009-10-05 | 5 | -1456/+1776 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 4 | -69/+124 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Fix build break | Melanie | 2009-10-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 60 | -1804/+1769 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 27 | -1402/+814 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 33 | -450/+647 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 6 | -46/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | |||||
| | * | | | | | | | | | | | | | Fix a merge conflict | Melanie | 2009-10-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge branch 'master' into vehicles | Melanie | 2009-10-01 | 294 | -5286/+2849 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ↵ | Melanie | 2009-09-30 | 12 | -751/+1468 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vehicles | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '0.6.7-post-fixes' into vehicles | Kitto Flora | 2009-09-30 | 86 | -658/+4314 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | And another merge issue | Kitto Flora | 2009-09-30 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | And another | Kitto Flora | 2009-09-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Another small change to avoid later merge conflict | Kitto Flora | 2009-09-30 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Small chaneg to adapt to trunk | Kitto Flora | 2009-09-30 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Commit initial version of KittoFlora's vehicle changes | opensim | 2009-09-30 | 12 | -757/+1471 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | change 0.6.7 candidate branch down to RC1 | Justin Clark-Casey (justincc) | 2009-09-29 | 1 | -1/+1 | |
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fix loading modules with alternate configurations and ports into ROBUST. | Melanie | 2009-09-29 | 14 | -55/+75 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all current modules support the configuration name option | |||||
| | * | | | | | | | | | | | | | | | Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer. | Diva Canto | 2009-09-29 | 1 | -4/+8 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into 0.6.7-post-fixes | Melanie | 2009-09-28 | 2 | -6/+64 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs | |||||
| | * | | | | | | | | | | | | | | | | Bump version number in post-fixes | Melanie | 2009-09-28 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | |