aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Commented out instrumentation in ODEPrim.csKittoFlora2009-10-221-0/+8
* 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-22150-9910/+3402
| | |\
| | * \ Merge branch 'master' into vehiclesMelanie2009-10-1923-76/+212
| | |\ \
| | * \ \ Merge branch 'master' into vehiclesMelanie2009-10-156-22/+27
| | |\ \ \
| | * \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-1556-1815/+1989
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-128-86/+849
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-1213-51/+657
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-0855-4900/+3424
| | |\ \ \ \ \ \ \
| | * | | | | | | | Correct a build break caused by an optimization in trunkMelanie2009-10-071-1/+1
| | * | | | | | | | Merge branch 'master' into vehiclesMelanie2009-10-0620-133/+249
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 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 befo...Michael Cortez2009-10-051-1/+1
| | * | | | | | | | | 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-0560-1804/+1769
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-0227-1402/+814
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-0233-450/+647
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of...Melanie2009-10-026-46/+27
| | * | | | | | | | | | | | | Fix a merge conflictMelanie2009-10-011-1/+1
| | * | | | | | | | | | | | | Merge branch 'master' into vehiclesMelanie2009-10-01294-5286/+2849
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ...Melanie2009-09-3012-751/+1468
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '0.6.7-post-fixes' into vehiclesKitto Flora2009-09-3086-658/+4314
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | 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
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix loading modules with alternate configurations and ports into ROBUST.Melanie2009-09-2914-55/+75
| | * | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | Add copyright header. Formatting cleanup.Jeff Ames2009-10-222-1/+28
* | | | | | | | | | | | | | | | | A synchronous call to the messaging server was blocking the process of promot...John Hurliman2009-10-221-1/+7
* | | | | | | | | | | | | | | | | * Allow SmartThreadPool to be initialized without setting max stack size (lik...John Hurliman2009-10-222-6/+13
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Remove the "mel_t" from version stringMelanie2009-10-221-1/+1
* | | | | | | | | | | | | | | | Merge branch 'melanie_test' into prioritizationMelanie2009-10-224-60/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Make the LSL scripting delays take full effect. To tune, tweat theMelanie2009-10-221-56/+49
| * | | | | | | | | | | | | | | | Reduce the default pool threads to 15 (from 30) and the minimum from 5 to 2Melanie2009-10-222-2/+2
| * | | | | | | | | | | | | | | | Add MaxPoolThreads in startup to limit the size of the thread pool usedMelanie2009-10-222-12/+24
| * | | | | | | | | | | | | | | | Mark new versionMelanie2009-10-221-1/+1