aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-09-1645-1320/+2857
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-1531-1233/+2321
| |\
| | * BulletSim: update DLLs and SOs and remove some debugging code.Robert Adams2012-09-151-1/+1
| | * BulletSim: some debugging prints in BSPrim for tracking changes in linkset ch...Robert Adams2012-09-151-1/+3
| | * BulletSim: add the debugging routine DumpRigidBody2() to API2.Robert Adams2012-09-151-3/+6
| | * BulletSim: another attempt at computing physics FPS correctly.Robert Adams2012-09-151-23/+6
| | * BulletSim: remove timeStep parameter from calls for vehicle parameter setting...Robert Adams2012-09-152-9/+6
| | * BulletSim: Remove calculation and passing of unused collied object type.Robert Adams2012-09-154-28/+36
| | * BulletSim: set all linkset objects center of mass to the whole linkset's cent...Robert Adams2012-09-151-2/+15
| | * BulletSim: Add calls to linkset class when object going static or dynamic.Robert Adams2012-09-152-8/+32
| | * BulletSim: remove unused NeedsMeshing() code from BSScene.Robert Adams2012-09-151-116/+0
| | * BulletSim: Add 'IsNativeShape2' callRobert Adams2012-09-151-4/+7
| | * BulletSim: Way too many changes in one commit.Robert Adams2012-09-159-286/+351
| | * Add basic asset connector tests to check behaviour for normal, local and temp...Justin Clark-Casey (justincc)2012-09-153-4/+143
| | * For FlotsamAssetCache, always update access times of cached scene assets befo...Justin Clark-Casey (justincc)2012-09-151-20/+17
| | * Added unit tests for multi-region OARsOren Hurvitz2012-09-143-60/+332
| | * Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the ...Justin Clark-Casey (justincc)2012-09-143-9/+9
| | * Support multi-region OAR filesOren Hurvitz2012-09-1414-400/+1080
| | * Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID (present...Justin Clark-Casey (justincc)2012-09-141-0/+18
| * | More on HG2.0: added the possibility of controlling the appearance that avies...Diva Canto2012-09-153-2/+172
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-134-3/+47
| |\
| | * Documentation of parcel-related eventsSignpostMarv2012-09-131-0/+44
| | * correcting a typo that causes c# express to complain about xml comment contai...SignpostMarv2012-09-131-1/+1
| | * Fix usage statement on "debug http" console command since max level is now 5 ...Justin Clark-Casey (justincc)2012-09-121-1/+1
| | * Fix bug in logging sample input at debug http level 4.Justin Clark-Casey (justincc)2012-09-121-1/+1
| * | Restarting to work on HGSuitcaseInventoryService: added the ability for the o...Diva Canto2012-09-132-4/+58
| |/
| * minor: Comment out friends notification log spam for now.Justin Clark-Casey (justincc)2012-09-121-3/+3
| * Fix indentation and issues where tabs were used instead of spaces in commit 7...Justin Clark-Casey (justincc)2012-09-121-7/+8
| * mathematically & hypothetically speaking we want to avoid negative values bei...SignpostMarv2012-09-121-7/+7
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-123-9/+9
| |\
| | * Allow an incoming identifier to be specified for a JsonStore.Mic Bowman2012-09-113-9/+9
| * | Documentation of economy-related EventManager eventsSignpostMarv2012-09-121-0/+21
| |/
| * Make "show http-handlers" command available for ROBUST instances as well as t...Justin Clark-Casey (justincc)2012-09-122-31/+51
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-128-7/+118
| |\
| | * documentation (OnSceneObjectPartCopy)SignpostMarv2012-09-111-0/+3
| | * documentation (OnRemovePresence)SignpostMarv2012-09-111-0/+7
| | * documentation (OnNewPresence)SignpostMarv2012-09-111-0/+7
| | * documentation (OnClientConnect)SignpostMarv2012-09-111-0/+9
| | * documentation (OnBackup)SignpostMarv2012-09-111-0/+7
| | * documentation (OnTerrainTick)SignpostMarv2012-09-111-0/+7
| | * documentation (OnTerrainTainted)SignpostMarv2012-09-111-0/+7
| | * documentation (OnClientMovement)SignpostMarv2012-09-111-0/+7
| | * Documenting some of the events on OpenSim.Region.Framework.Scenes.EventManage...SignpostMarv2012-09-111-0/+8
| * | Add levels 4 and 5 to "debug http" console command that will log a sample of ...Justin Clark-Casey (justincc)2012-09-113-12/+90
* | | Merge branch 'avination' into careminsterMelanie2012-09-1020-236/+394
|\ \ \
| * | | Remove commented codeMelanie2012-09-101-11/+0
| * | | Merge branch 'ubitwork' into avinationMelanie2012-09-102-12/+34
| |\ \ \
| | * | | add a extra httppool thread to compensate for webfetchinventoryUbitUmarov2012-09-101-1/+2
| | * | | webFetchInventory: change control event to simple flag, adjust lockingUbitUmarov2012-09-101-11/+32
| * | | | Reduce max concurrent endpoint connections from 50 to 6 (was 2 before)Melanie2012-09-091-1/+1