Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Add regression test TestSaveNonRootFolderToIar | Justin Clark-Casey (justincc) | 2013-02-16 | 11 | -54/+277 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-02-15 | 13 | -103/+267 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2013-02-14 | 27 | -242/+983 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Enable one sub-test in TestJsonSetValue() which now works (using identifier ↵ | Justin Clark-Casey (justincc) | 2013-02-15 | 1 | -17/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | with embedded .). Need to look further at other still commented tests. Still need to check coverage against some of Mic's scripts. | |||||
| | * | | Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> ↵ | Justin Clark-Casey (justincc) | 2013-02-15 | 2 | -15/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JsonGetJson() This is because JsonGetJson() is getting json from anywhere in the structure, not just values. Equally, JsonSetJson() is setting any type of json, not just json which represents a value. Agreed with cmickeyb | |||||
| | * | | Comment out regression TestJsonTestPath and TestJsonTestPathJson as these ↵ | Justin Clark-Casey (justincc) | 2013-02-15 | 1 | -62/+62 | |
| | | | | | | | | | | | | | | | | will go away soon | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-15 | 3 | -7/+11 | |
| | |\ \ | ||||||
| | | * | | * Handle null check on configs in module startup so that the the code can be ↵ | teravus | 2013-02-14 | 2 | -7/+9 | |
| | | | | | | | | | | | | | | | | | | | | run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement... | |||||
| | | * | | * gracefully handle a Situation where a double close is called on the ↵ | teravus | 2013-02-14 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | WebSocket handler | |||||
| | * | | | Add regression TestJsonList2Path() | Justin Clark-Casey (justincc) | 2013-02-15 | 1 | -2/+27 | |
| | |/ / | ||||||
| | * | | Add regression TestGetArrayLength() | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -0/+33 | |
| | | | | ||||||
| | * | | Add regression TestJsonGetPathType() | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -0/+47 | |
| | | | | ||||||
| | * | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2013-02-14 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵ | Justin Clark-Casey (justincc) | 2013-02-14 | 3 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JsonArrayLength() -> JsonGetArrayLength() This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb | |||||
| | * | | Make new JsonStore script constants separated with underscores, to be ↵ | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | consistent with existing LSL/OSSL, etc script constants. Agreed with cmickeyb | |||||
| | * | | Add EventManager events triggered when a SOP is added or removed | Robert Adams | 2013-02-14 | 2 | -0/+57 | |
| | | | | | | | | | | | | | | | | from the physical scene. Invocations added in SceneObjectPart. | |||||
| | * | | Add an event and some logic to allow customizing Simulator Features by avatar | Melanie | 2013-02-14 | 2 | -5/+26 | |
| | | | | ||||||
| * | | | Use SortedDictionary in StatsManager instead of regular Dictionary so stats ↵ | Dan Lake | 2013-02-14 | 2 | -22/+22 | |
| | | | | | | | | | | | | | | | | will interate and print in a defined order | |||||
* | | | | Merge branch 'avination' into careminster | Melanie | 2013-02-14 | 2 | -5/+26 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Add an event and some logic to allow customizing Simulator Features by avatar | Melanie | 2013-02-14 | 2 | -5/+26 | |
| | | | | ||||||
* | | | | Merge branch 'avination' into careminster | Melanie | 2013-02-14 | 2 | -20/+77 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Small fix to sim features module | Melanie | 2013-02-14 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Revert "Make keyframes use the sim's frame timer" | Melanie | 2013-02-12 | 1 | -8/+15 | |
| | | | | | | | | | | | | | | | | This reverts commit e85a6237bfc0f00de4a183e29e515fa5baf1aa7f. | |||||
| * | | | Revert "Push updates from keyframe directly to the front of the output queue ↵ | Melanie | 2013-02-12 | 5 | -46/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e. | |||||
| * | | | Revert "Use actual time dilation for unqueued updates" | Melanie | 2013-02-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit 048e904f051ccc38e7d00936b45288af3c6fc010. | |||||
| * | | | Use actual time dilation for unqueued updates | Melanie | 2013-02-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Push updates from keyframe directly to the front of the output queue rather | Melanie | 2013-02-12 | 5 | -10/+46 | |
| | | | | | | | | | | | | | | | | than through the update system. | |||||
| * | | | Make keyframes use the sim's frame timer | Melanie | 2013-02-11 | 1 | -15/+8 | |
| | | | | ||||||
| * | | | Refactor KeyframeMotion to use one timer class per scene | Melanie | 2013-02-11 | 1 | -20/+75 | |
| | | | | ||||||
| * | | | Actually plumb the new values to physics. | Melanie | 2013-02-07 | 1 | -0/+20 | |
| | | | | ||||||
| * | | | Rename "Bounce" to "Restitution" in PhysicsActor as well. It appears these | Melanie | 2013-02-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | values are not even used. | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-02-14 | 5 | -15/+175 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Fix a very unlikely-to-occur NullReferenceException race condition in ↵ | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | llPushObject() where the code assumed that the physics actor it null-checked would still be null when it invoked a method on it | |||||
| * | | | Adds a couple requested functions to the JsonStore script | Mic Bowman | 2013-02-13 | 4 | -1/+162 | |
| | | | | | | | | | | | | | | | | | | | | | | | | interface. JsonPathType returns the type of node pointed to by the path and deprecates the functionality of both JsonTestPath functions. JsonArrayLength returns the length of an array node. | |||||
| * | | | Make path parsing more robust in the JsonStore. | Mic Bowman | 2013-02-12 | 1 | -12/+6 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-02-13 | 10 | -156/+522 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-02-13 | 10 | -156/+522 | |
| |\ \ \ | ||||||
| | * | | | Add more sub-tests to TestJsonSetValue for paths containing []{} without {} ↵ | Justin Clark-Casey (justincc) | 2013-02-13 | 1 | -5/+86 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delineation. As expected, values are not set and the set call returns FALSE (0). As a reminder, these tests are not currently running on jenkins continuous integration as the functionality is only available on .net 4 (mono 2.8 and later). | |||||
| | * | | | Extend JsonTestSetValue() with tests for escaping brackets, periods and ↵ | Justin Clark-Casey (justincc) | 2013-02-13 | 1 | -2/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unbalanced braces from paths The sub-tests that are commented out are currently those which fail unexpectedly based on my understanding of the path syntax | |||||
| | * | | | Add test for array as root element in TestJsonCreateStore() | Justin Clark-Casey (justincc) | 2013-02-13 | 1 | -0/+9 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-13 | 9 | -141/+304 | |
| | |\ \ \ | ||||||
| | | * | | | BulletSim: fix density since the simulator/viewer track density in a | Robert Adams | 2013-02-12 | 7 | -25/+150 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | funny unit that is 100 times real density (default 1000). Fix avatar drifting slowly when stationary flying. Fix for physical prims getting corrected for being under terrain when it was just its geometric center that was below terrain. Add PreUpdatePropertyAction allowing plugable modifiction of phys parameters returned from Bullet. Fix an exception setting GravityMultiplier on initialization. Update DLLs and SOs for good measure (no functional change). | |||||
| | | * | | | BulletSim: More work on center-of-mass. Remove linksetinfo and rely on ↵ | Robert Adams | 2013-02-12 | 8 | -124/+162 | |
| | | | | | | | | | | | | | | | | | | | | | | | | simulator to update info. | |||||
| | * | | | | Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arrays | Justin Clark-Casey (justincc) | 2013-02-13 | 1 | -13/+57 | |
| | |/ / / | ||||||
| * | | | | Make the sim features module register it's interface so it can be used | Melanie | 2013-02-13 | 1 | -0/+2 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-02-12 | 6 | -44/+272 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Extend TestJsonCreateStore() with a one key input and an input with raw ↵ | Justin Clark-Casey (justincc) | 2013-02-12 | 1 | -2/+20 | |
| | | | | | | | | | | | | | | | | number values | |||||
| * | | | Use an integer when specifying the XWorkItem wait rather than a TimeSpan to ↵ | Justin Clark-Casey (justincc) | 2013-02-12 | 3 | -4/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid a Windows casting issue in SmartThreadPool for large TimeSpans. TimeSpan.Milliseconds is an int64. However, STP casts this to an int (32-bit). If TimeSpan.MaxValue is given then the casting results in an invalid value for the SDK WaitHandle.WaitAll() call. This was causing the co-op script termination regression tests to fail on Windows but not Mono 2.10.8 (which is perhaps not strict in the negative values that it accepts). Solution here is to use the int millisecondsTimeout STP call rather than the TimeSpan one. This also allows us to more clearly specify Timeout.Infinite rather than TimeSpan.MaxValue Thanks to Teravus for this spot. | |||||
| * | | | Re-enable subtest for single quoted token in TestJsonSetValueJson() | Justin Clark-Casey (justincc) | 2013-02-12 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | This is in response to the resolution of http://opensimulator.org/mantis/view.php?id=6540 | |||||
| * | | | Adds the parameter for OSD serialization to encode default values. This | Mic Bowman | 2013-02-12 | 2 | -5/+8 | |
| | |/ | |/| | | | | | | | makes the JsonStore get/set operations symmetric. |