aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-10-221-0/+8
|\
| * Commented out instrumentation in ODEPrim.csKittoFlora2009-10-221-0/+8
| |
* | Implemented a Watchdog class. Do not manually create Thread objects anymore, ↵John Hurliman2009-10-2217-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/opensimJohn Hurliman2009-10-2212-743/+1462
|\
| * Correct version number after mergeMelanie2009-10-221-2/+2
| |
| * Merge branch 'vehicles'Melanie2009-10-2213-741/+1456
| |\
| | * Merge branch 'master' into vehiclesMelanie2009-10-22160-10041/+3449
| | |\
| | * \ Merge branch 'master' into vehiclesMelanie2009-10-1924-76/+218
| | |\ \
| | * \ \ Merge branch 'master' into vehiclesMelanie2009-10-157-27/+32
| | |\ \ \
| | * \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-1563-1874/+2132
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-1210-86/+851
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-1214-55/+667
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-0856-4906/+3428
| | |\ \ \ \ \ \ \
| | * | | | | | | | Correct a build break caused by an optimization in trunkMelanie2009-10-071-1/+1
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into vehiclesMelanie2009-10-0622-137/+253
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Make sure that keys exist in arrays before trying to access them.Michael Cortez2009-10-051-3/+9
| | | | | | | | | | |
| | * | | | | | | | | Ensure the specified imSessionID exists in the DroppedSession collection ↵Michael Cortez2009-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before attempting to access it.
| | * | | | | | | | | Adapt to renamed members in landObjectMelanie2009-10-051-10/+10
| | | | | | | | | | |
| | * | | | | | | | | MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy upunknown2009-10-055-1456/+1776
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into vehiclesMelanie2009-10-054-69/+124
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix build breakMelanie2009-10-051-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into vehiclesMelanie2009-10-0563-1866/+1834
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-0241-2787/+822
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-0234-450/+651
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵Melanie2009-10-026-46/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
| | * | | | | | | | | | | | | Fix a merge conflictMelanie2009-10-011-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into vehiclesMelanie2009-10-01307-5621/+3279
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ↵Melanie2009-09-3012-751/+1468
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vehicles
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '0.6.7-post-fixes' into vehiclesKitto Flora2009-09-3093-730/+4397
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | And another merge issueKitto Flora2009-09-301-0/+1
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | And anotherKitto Flora2009-09-301-1/+1
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Another small change to avoid later merge conflictKitto Flora2009-09-301-2/+3
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Small chaneg to adapt to trunkKitto Flora2009-09-301-2/+3
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Commit initial version of KittoFlora's vehicle changesopensim2009-09-3012-757/+1471
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | change 0.6.7 candidate branch down to RC1Justin Clark-Casey (justincc)2009-09-291-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | small test changeJustin Clark-Casey (justincc)2009-09-291-1/+0
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix loading modules with alternate configurations and ports into ROBUST.Melanie2009-09-2914-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 Canto2009-09-291-4/+8
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'master' into 0.6.7-post-fixesMelanie2009-09-282-6/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs
| | * | | | | | | | | | | | | | | | Bump version number in post-fixesMelanie2009-09-281-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixing the patch to the patchSnowcrash2009-10-221-3/+6
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix rounding error in PRIM_SIZE portion of llSetPrimitiveParamsSnowcrash2009-10-221-3/+4
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Terrible typo in the previous commit!John Hurliman2009-10-221-1/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | * Added a check if Util.m_ThreadPool is null before trying to use it, and if ↵John Hurliman2009-10-221-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so initialize it to sane defaults * Simplified the InitThreadPool() function
* | | | | | | | | | | | | | | | | OpenSim.ini.example had the wrong names for default values in the ↵John Hurliman2009-10-221-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [InterestManagement] section. Fixed
* | | | | | | | | | | | | | | | | Add copyright header. Formatting cleanup.Jeff Ames2009-10-222-1/+28
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | A synchronous call to the messaging server was blocking the process of ↵John Hurliman2009-10-221-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 Hurliman2009-10-224-12/+27
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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 stringMelanie2009-10-221-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'melanie_test' into prioritizationMelanie2009-10-226-83/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes SmartThreadPool configurable and also makes it the default, since the regular thread pool simply stinks.