aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-083-10/+17
|\
| * Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.Mic Bowman2013-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
|/
* 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
* 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
* Actually plumb the new values to physics.Melanie2013-02-071-0/+20
* 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-0730-75/+1651
| |\
| * | 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-0710-7/+127
* | 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
* | Change passed PhysicsParameter value from float to the more general string valueRobert Adams2013-02-074-43/+57
* | Websocket Echo module should not be on by default.teravus2013-02-071-1/+1
* | * missing example module.. Oops.teravus2013-02-071-0/+174
* | * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows...teravus2013-02-07120-1141/+1466
|\ \
| * | Rename "Bounciness" to "Restitution"Melanie2013-02-074-9/+9
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-077-15/+120
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-066-13/+43
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-0620-429/+431
| | | |\
| | | * | WebStats will now use actual logfile as specified in OpenSim.exe.config rathe...Dan Lake2013-02-062-2/+16
| | * | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-065-13/+104
| * | | | Add TestJsonWriteReadNotecard() regression testJustin Clark-Casey (justincc)2013-02-072-2/+45
| * | | | Make json store tests operate on a single thread to ensure we don't run into ...Justin Clark-Casey (justincc)2013-02-071-0/+16
| | |_|/ | |/| |
| * | | minor: add method doc to DAMap.ValidateKey()Justin Clark-Casey (justincc)2013-02-071-0/+4
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-02-061-1/+2
| |\ \ \
| | * | | Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to m...Justin Clark-Casey (justincc)2013-02-071-1/+2
| * | | | BulletSim: set removing zero width triangles in meshes to be enabled by defau...Robert Adams2013-02-062-1/+2
| |/ / /
| * | | BulletSim: check for completely degenerate meshes (ones with allRobert Adams2013-02-061-9/+19
| |/ /
| * | BulletSim: remove an exception which occurs if a physics meshRobert Adams2013-02-061-2/+4
| * | Fix a bug I brought in by manually editing a diff file. Terrain is if cource ...Melanie2013-02-061-1/+1
| * | Partial port of Avination's support for the new physics parameters.Melanie2013-02-067-21/+264
| * | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-064-9/+3
| * | Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1
| * | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region....Justin Clark-Casey (justincc)2013-02-063-168/+0