Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Fixing the patch to the patch | Snowcrash | 2009-10-22 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Fix rounding error in PRIM_SIZE portion of llSetPrimitiveParams | Snowcrash | 2009-10-22 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Terrible typo in the previous commit! | John Hurliman | 2009-10-22 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | * Added a check if Util.m_ThreadPool is null before trying to use it, and if ↵ | John Hurliman | 2009-10-22 | 1 | -13/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so initialize it to sane defaults * Simplified the InitThreadPool() function | |||||
* | | | | | | | | | | | | | | | | | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-10-22 | 2 | -1/+28 | |
| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | A synchronous call to the messaging server was blocking the process of ↵ | John Hurliman | 2009-10-22 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | promoting an agent to a root agent (logins and teleports). Changed to an async method | |||||
* | | | | | | | | | | | | | | | | | * Allow SmartThreadPool to be initialized without setting max stack size ↵ | John Hurliman | 2009-10-22 | 2 | -6/+13 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (like the original implementation) * Only initialize Util's SmartThreadPool if it is actually being used * No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads." | |||||
* | | | | | | | | | | | | | | | | Remove the "mel_t" from version string | Melanie | 2009-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'melanie_test' into prioritization | Melanie | 2009-10-22 | 4 | -60/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes SmartThreadPool configurable and also makes it the default, since the regular thread pool simply stinks. | |||||
| * | | | | | | | | | | | | | | | | Make the LSL scripting delays take full effect. To tune, tweat the | Melanie | 2009-10-22 | 1 | -56/+49 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScriptDelayFactor in config | |||||
| * | | | | | | | | | | | | | | | | Reduce the default pool threads to 15 (from 30) and the minimum from 5 to 2 | Melanie | 2009-10-22 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | |