| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 11 | -95/+348 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2013-02-08 | 1 | -32/+57 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-08 | 3 | -10/+17 |
| | | |\ | |||||
| | | * | | Don't allow exceptions to propogate from FlotsamAssetCache which may occur ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -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 configuration | Mic Bowman | 2013-02-08 | 2 | -2/+66 |
| | | |/ | |/| | | | | | | | variable to enable binding to dynamic attributes. | ||||
| | * | | Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue. | Mic Bowman | 2013-02-08 | 3 | -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-08 | 1 | -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-08 | 1 | -0/+18 |
| | | | | | | | | | continue with the IAR load rather than failing completely. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-08 | 3 | -35/+105 |
| | |\ | |||||
| | | * | BulletSim: Adapt BulletSim to the newer physical properties. Viewer | Robert Adams | 2013-02-07 | 2 | -30/+28 |
| | | | | | | | | | | | | | dialog setting of friction, restitution, ... working. | ||||
| | | * | BulletSim: fix exceptions caused by setting physical properties before the ↵ | Robert Adams | 2013-02-07 | 1 | -5/+10 |
| | | | | | | | | | | | | | prim body is initialized. | ||||
| | | * | BulletSim: add user setting of friction, density and restitution. | Robert Adams | 2013-02-07 | 3 | -27/+94 |
| | | | | |||||
| | * | | Refine TestJsonReadNotecard() and use / instead of . to separate paths. | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -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-08 | 1 | -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. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 1 | -10/+98 |
| |\ \ | |/ | |||||
| | * | Stop wrongly create a receiving store already populated with "Hello":"World" ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -1/+3 |
| | | | | | | | | | in TestJsonReadNotecard() | ||||
| | * | Extend TestJsonWriteNotecard() regression test for cases with fake paths and ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -8/+61 |
| | | | | | | | | | | | | | fake stores. Also separates out TestJsonWriteReadNotecard() into separate write and read tests | ||||
| | * | Extend TestJsonSetValue() regressio ntes tto test against a fake store | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -0/+5 |
| | | | |||||
| | * | Extend TestJsonTestPath() regression test with checks against fake values ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -0/+8 |
| | | | | | | | | | and fake stores | ||||
| | * | Add tests for removing fake values/from fake store in TestJsonRemoveValue() | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -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-07 | 1 | -1/+10 |
| | | | | | | | | | datastore to TestJsonGetValue() | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -0/+20 |
| |\ \ | |/ | |||||
| | * | Actually plumb the new values to physics. | Melanie | 2013-02-07 | 1 | -0/+20 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 3 | -15/+29 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-02-07 | 3 | -15/+29 |
| | |\ | |||||
| | | * | Add TestJsonDestoreStoreNotExists() | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 20 | -68/+474 |
| | | |\ | |||||
| | | * | | Fix a recent regression in e17392a where JsonSetValue() stopped working ↵ | Justin Clark-Casey (justincc) | 2013-02-07 | 3 | -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 around | Melanie | 2013-02-07 | 3 | -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 back | Melanie | 2013-02-07 | 8 | -6/+119 |
| | | | | |||||
| | * | | Send the new physics params to the viewer build dialog | Melanie | 2013-02-07 | 1 | -0/+35 |
| | | | | |||||
| | * | | Revert "Add plumbing for physics properties to get to the physics engine." | Melanie | 2013-02-07 | 2 | -55/+6 |
| | | | | | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a. | ||||
| | * | | Add plumbing for physics properties to get to the physics engine. | Robert Adams | 2013-02-07 | 2 | -6/+55 |
| | | | | | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-07 | 6 | -134/+111 |
| |\ \ \ | |||||
| | * | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 5 | -10/+10 |
| | | | | | |||||
| | * | | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 4 | -115/+79 |
| | | | | | |||||
| | * | | | Make scripts shout a error but not stop when button count is overrun on llDialog | Melanie | 2013-02-05 | 1 | -7/+9 |
| | | | | | |||||
| | * | | | Merge branch 'teravuswork' into avination | Melanie | 2013-01-31 | 1 | -12/+23 |
| | |\ \ \ | |||||
| | | * | | | * This Checks the asset of each wearable asynchronously and repairs if it's ↵ | teravus | 2013-01-29 | 1 | -12/+23 |
| | | | | | | | | | | | | | | | | | | | | | required. | ||||
| | * | | | | * This adds a bit more to the previous flying roll effect by adding ↵ | teravus | 2013-01-31 | 1 | -10/+50 |
| | | | | | | | | | | | | | | | | | | | | | additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback. | ||||
| | * | | | | * Adds a satisfying angular roll when an avatar is flying and turning. ↵ | Melanie | 2013-01-31 | 2 | -2/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff. Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 5 | -43/+231 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll | ||||
| | * | | | | Change passed PhysicsParameter value from float to the more general string value | Robert Adams | 2013-02-07 | 4 | -43/+57 |
| | | | | | | |||||
| | * | | | | Websocket Echo module should not be on by default. | teravus | 2013-02-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | * missing example module.. Oops. | teravus | 2013-02-07 | 1 | -0/+174 |
| | | | | | | |||||
| | * | | | | Rename "Bounciness" to "Restitution" | Melanie | 2013-02-07 | 3 | -7/+7 |
| | | | | | | |||||
| * | | | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 5 | -10/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -1/+60 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 5 | -14/+97 |
| | |\ \ \ \ | |||||
| | * | | | | | Add TestJsonWriteReadNotecard() regression test | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+44 |
| | | | | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |