aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Justin Clark-Casey (justincc)2013-02-081-32/+57
| | | | | | | | | | | | | | | | | | when deleting expired files or stamping the region status file. Changes various error level log lines to warn since these are not fatal to the operation of OpenSimulator
* | | Adds size limits to JsonStore. Adds a separate configurationMic Bowman2013-02-083-2/+70
| |/ |/| | | | | variable to enable binding to dynamic attributes.
* | Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.Mic Bowman2013-02-083-10/+17
|/ | | | Fix the link message status when reading a notecard.
* If a component of a coalesced object fails to deserialization, do not add a ↵Justin Clark-Casey (justincc)2013-02-081-4/+18
| | | | | | | null where the object should be. This prevents a later load IAR failure. This code is currently only used by IAR loading.
* On IAR loading, if loading of a coaleseced item entirely fails, then ↵Justin Clark-Casey (justincc)2013-02-081-0/+18
| | | | continue with the IAR load rather than failing completely.
* 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
| | | | | | | | dialog setting of friction, restitution, ... working.
| * BulletSim: fix exceptions caused by setting physical properties before the ↵Robert Adams2013-02-071-5/+10
| | | | | | | | prim body is initialized.
| * 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
|/ | | | | | | An attack of the stupid meant that I was using / as a path separator. Fixing this makes the tests behave better, though still with some questions. Also, I imagine / shouldn't really put data in the root as that's not a valid identifier. This commit also fix the / mistake in other tests those this does not affect their outcomes.
* Extend TestJsonReadNotecard() for reads to non-root locations and fake stores.Justin Clark-Casey (justincc)2013-02-081-9/+33
| | | | Assertions for loading to non-root paths are currently commented out because this doesn't seem to be working. Will be raising mantis to resolve.
* Stop wrongly create a receiving store already populated with "Hello":"World" ↵Justin Clark-Casey (justincc)2013-02-081-1/+3
| | | | in TestJsonReadNotecard()
* Extend TestJsonWriteNotecard() regression test for cases with fake paths and ↵Justin Clark-Casey (justincc)2013-02-081-8/+61
| | | | | | fake stores. Also separates out TestJsonWriteReadNotecard() into separate write and read tests
* 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 ↵Justin Clark-Casey (justincc)2013-02-081-0/+8
| | | | and fake stores
* Add tests for removing fake values/from fake store in TestJsonRemoveValue()Justin Clark-Casey (justincc)2013-02-071-0/+11
| | | | Again, need to check if returning true for removing a value that doesn't exist is most appropriate.
* Add testing for getting non-existing values and values from a non-existing ↵Justin Clark-Casey (justincc)2013-02-071-1/+10
| | | | datastore to TestJsonGetValue()
* 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
| | | | | | | | | | This still returns true even if we ask to destroy a store that does not exist. Need to check that this is more appropriate behaviour.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0734-2976/+4555
| |\
| * | Fix a recent regression in e17392a where JsonSetValue() stopped working ↵Justin Clark-Casey (justincc)2013-02-073-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | (probably other functions as well). Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten. This was actually picked up by the TestJsonSetValue() regression test failing But this isn't being run on jenkins due to the .net version issue. This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
* | | Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-073-40/+165
| |/ |/| | | | | to work with the new params. Not actually plumbed just yet.
* | 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
| | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a.
* | Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-072-6/+55
| | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart.
* | 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 ↵teravus2013-02-07128-1214/+1475
|\ \ | | | | | | | | | allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
| * | 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-0623-429/+435
| | | |\
| | | * | WebStats will now use actual logfile as specified in OpenSim.exe.config ↵Dan Lake2013-02-062-2/+16
| | | | | | | | | | | | | | | | | | | | rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types
| | * | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-065-13/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script functions. Adds JsonAttachObjectStore to associate a store identifier with an object (scripts can only access the store in their host object, this could be extended but isn't necessary for now). Note this opens a method to the DAMap OSDMap. This will be removed later, but greatly simplifies the code for now. The JsonStore and these scripts are disabled by default.
| * | | | 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
| | |_|/ | |/| | | | | | | | | | any race related test failures in the future.
| * | | 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 ↵Justin Clark-Casey (justincc)2013-02-071-1/+2
| | | | | | | | | | | | | | | | | | | | match Add(string key, OSDMap store)
| * | | | BulletSim: set removing zero width triangles in meshes to be enabled by ↵Robert Adams2013-02-062-1/+2
| |/ / / | | | | | | | | | | | | default. This should fix the invisible barrier in sculptie doorways bug.
| * | | BulletSim: check for completely degenerate meshes (ones with allRobert Adams2013-02-061-9/+19
| |/ / | | | | | | | | | | | | triangles having zero width) and output an error rather than throwing and exception.
| * | BulletSim: remove an exception which occurs if a physics meshRobert Adams2013-02-061-2/+4
| | | | | | | | | | | | asset is not found.
| * | Fix a bug I brought in by manually editing a diff file. Terrain is if cource ↵Melanie2013-02-061-1/+1
| | | | | | | | | | | | not always at 20m.
| * | Partial port of Avination's support for the new physics parameters.Melanie2013-02-067-21/+264
| | | | | | | | | | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset.
| * | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.exampleJustin Clark-Casey (justincc)2013-02-061-0/+4
| | |
generated by cgit v1.1 at 2024-12-18 20:34:05 +0000