aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-103-8/+57
|\
| * Fix code to check for no spawn points. Possibly a merge artefact?Melanie2013-02-101-2/+4
| * Additional ThreadPool worker and IOCP thread startup logicAllen Kerensky2013-02-101-6/+39
| * Fix teleport/telehub issue:BlueWall2013-02-102-3/+17
* | Merge branch 'master' into careminsterMelanie2013-02-1016-283/+707
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-0814-260/+619
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0915-259/+712
| | |\
| | | * BulletSim: add parameter to set global contact breaking threshold. Update DLL...Robert Adams2013-02-082-0/+7
| | | * BulletSim: Change BSCharacter to use new base Density and FrictionRobert Adams2013-02-082-16/+12
| | | * BulletSim: fix avatar bobbing or jiggling while stationary flying.Robert Adams2013-02-086-19/+34
| | | * BulletSim: add initial instance of the ExtendedPhysics region module which ad...Robert Adams2013-02-081-0/+163
| | | * BulletSim: include the linkage to the layered prim implementation. Separate l...Robert Adams2013-02-088-225/+109
| | | * BulletSim: reclass BSPrim into layers so linkset and physical world displacem...Robert Adams2013-02-082-0/+297
| | * | Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that ...Justin Clark-Casey (justincc)2013-02-091-5/+2
| * | | Make JsonStore path parsing more robust. Should fix theMic Bowman2013-02-082-21/+59
| | |/ | |/|
| * | Broaden the internal OSD type checks to parse JSON that hasMic Bowman2013-02-081-2/+29
* | | Merge branch 'master' into careminsterMelanie2013-02-0811-95/+348
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-081-32/+57
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-083-10/+17
| | |\
| | * | Don't allow exceptions to propogate from FlotsamAssetCache which may occur wh...Justin Clark-Casey (justincc)2013-02-081-32/+57
| * | | Adds size limits to JsonStore. Adds a separate configurationMic Bowman2013-02-082-2/+66
| | |/ | |/|
| * | Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.Mic Bowman2013-02-083-10/+17
| |/
| * If a component of a coalesced object fails to deserialization, do not add a n...Justin Clark-Casey (justincc)2013-02-081-4/+18
| * On IAR loading, if loading of a coaleseced item entirely fails, then continue...Justin Clark-Casey (justincc)2013-02-081-0/+18
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-083-35/+105
| |\
| | * BulletSim: Adapt BulletSim to the newer physical properties. ViewerRobert Adams2013-02-072-30/+28
| | * BulletSim: fix exceptions caused by setting physical properties before the pr...Robert Adams2013-02-071-5/+10
| | * BulletSim: add user setting of friction, density and restitution.Robert Adams2013-02-073-27/+94
| * | Refine TestJsonReadNotecard() and use / instead of . to separate paths.Justin Clark-Casey (justincc)2013-02-081-15/+46
| |/
| * Extend TestJsonReadNotecard() for reads to non-root locations and fake stores.Justin Clark-Casey (justincc)2013-02-081-9/+33
* | Merge branch 'master' into careminsterMelanie2013-02-081-10/+98
|\ \ | |/
| * Stop wrongly create a receiving store already populated with "Hello":"World" ...Justin Clark-Casey (justincc)2013-02-081-1/+3
| * Extend TestJsonWriteNotecard() regression test for cases with fake paths and ...Justin Clark-Casey (justincc)2013-02-081-8/+61
| * Extend TestJsonSetValue() regressio ntes tto test against a fake storeJustin Clark-Casey (justincc)2013-02-081-0/+5
| * Extend TestJsonTestPath() regression test with checks against fake values and...Justin Clark-Casey (justincc)2013-02-081-0/+8
| * Add tests for removing fake values/from fake store in TestJsonRemoveValue()Justin Clark-Casey (justincc)2013-02-071-0/+11
| * Add testing for getting non-existing values and values from a non-existing da...Justin Clark-Casey (justincc)2013-02-071-1/+10
* | Merge branch 'master' into careminsterMelanie2013-02-071-0/+20
|\ \ | |/
| * Actually plumb the new values to physics.Melanie2013-02-071-0/+20
* | Merge branch 'master' into careminsterMelanie2013-02-073-15/+29
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-073-15/+29
| |\
| | * Add TestJsonDestoreStoreNotExists()Justin Clark-Casey (justincc)2013-02-071-0/+14
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0720-68/+474
| | |\
| | * | Fix a recent regression in e17392a where JsonSetValue() stopped working (prob...Justin Clark-Casey (justincc)2013-02-073-15/+15
| * | | Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-073-40/+165
| | |/ | |/|
| * | Plumb the path from the client to the extra physics params and backMelanie2013-02-078-6/+119
| * | Send the new physics params to the viewer build dialogMelanie2013-02-071-0/+35
| * | Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-072-55/+6
| * | Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-072-6/+55
* | | Merge branch 'avination' into careminsterMelanie2013-02-076-134/+111
|\ \ \
generated by cgit v1.1 at 2024-12-16 15:31:08 +0000