aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-1310-156/+522
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-1310-156/+522
| |\
| | * Add more sub-tests to TestJsonSetValue for paths containing []{} without {} d...Justin Clark-Casey (justincc)2013-02-131-5/+86
| | * Extend JsonTestSetValue() with tests for escaping brackets, periods and unbal...Justin Clark-Casey (justincc)2013-02-131-2/+71
| | * Add test for array as root element in TestJsonCreateStore()Justin Clark-Casey (justincc)2013-02-131-0/+9
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-139-141/+304
| | |\
| | | * BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-127-25/+150
| | | * BulletSim: More work on center-of-mass. Remove linksetinfo and rely on simula...Robert Adams2013-02-128-124/+162
| | * | Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arraysJustin Clark-Casey (justincc)2013-02-131-13/+57
| | |/
| * | Make the sim features module register it's interface so it can be usedMelanie2013-02-131-0/+2
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-126-44/+272
|\ \ | |/
| * Extend TestJsonCreateStore() with a one key input and an input with raw numbe...Justin Clark-Casey (justincc)2013-02-121-2/+20
| * Use an integer when specifying the XWorkItem wait rather than a TimeSpan to a...Justin Clark-Casey (justincc)2013-02-123-4/+13
| * Re-enable subtest for single quoted token in TestJsonSetValueJson()Justin Clark-Casey (justincc)2013-02-121-9/+9
| * Adds the parameter for OSD serialization to encode default values. ThisMic Bowman2013-02-122-5/+8
| * Fix handling of string values in JsonSetValueJson(). There areMic Bowman2013-02-111-1/+31
| * Add regression TestJsonSetValueJson()Justin Clark-Casey (justincc)2013-02-121-0/+58
| * Add regression TestJsonGetValueJson()Justin Clark-Casey (justincc)2013-02-111-0/+33
| * Add regression TestJsonTestPathJson()Justin Clark-Casey (justincc)2013-02-111-0/+32
| * Add section to TestJsonGetValue() to test call on a sub-treeJustin Clark-Casey (justincc)2013-02-111-9/+21
| * Extend TestJsonTestPath() for non-terminating section of path (i.e. one that ...Justin Clark-Casey (justincc)2013-02-111-8/+20
| * Add section to TestJsonSetValue() to test attempted set of value where the pe...Justin Clark-Casey (justincc)2013-02-111-8/+23
| * Add test to try reading notecard into an invalid path in TestJsonReadNotecard...Justin Clark-Casey (justincc)2013-02-111-7/+13
* | 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-1024-298/+792
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-0822-279/+697
| |\
| | * Fixed ReadSculptData(): the check whether there are enough bytes to read was ...Oren Hurvitz2013-02-091-5/+6
| | * Fixed check for 0 results in GetUserAccounts()Oren Hurvitz2013-02-091-1/+1
| | * 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
| | * | Added physics parameters support to MSSQL and SQLite (not tested)Oren Hurvitz2013-02-096-13/+71
| * | | 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
generated by cgit v1.1 at 2024-08-22 15:16:55 +0000