aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-02-142-20/+77
|\
| * Small fix to sim features moduleMelanie2013-02-141-0/+2
| |
| * Revert "Make keyframes use the sim's frame timer"Melanie2013-02-121-8/+15
| | | | | | | | This reverts commit e85a6237bfc0f00de4a183e29e515fa5baf1aa7f.
| * Revert "Push updates from keyframe directly to the front of the output queue ↵Melanie2013-02-125-46/+10
| | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
| * Revert "Use actual time dilation for unqueued updates"Melanie2013-02-121-1/+1
| | | | | | | | This reverts commit 048e904f051ccc38e7d00936b45288af3c6fc010.
| * Use actual time dilation for unqueued updatesMelanie2013-02-121-1/+1
| |
| * Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-125-10/+46
| | | | | | | | than through the update system.
| * Make keyframes use the sim's frame timerMelanie2013-02-111-15/+8
| |
| * Refactor KeyframeMotion to use one timer class per sceneMelanie2013-02-111-20/+75
| |
| * Actually plumb the new values to physics.Melanie2013-02-071-0/+20
| |
| * Rename "Bounce" to "Restitution" in PhysicsActor as well. It appears theseMelanie2013-02-071-1/+1
| | | | | | | | values are not even used.
* | Merge branch 'master' into careminsterMelanie2013-02-145-15/+175
|\ \
| * | Fix a very unlikely-to-occur NullReferenceException race condition in ↵Justin Clark-Casey (justincc)2013-02-141-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 scriptMic Bowman2013-02-134-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 Bowman2013-02-121-12/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-1314-156/+522
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-1314-156/+522
| |\ \
| | * | Add more sub-tests to TestJsonSetValue for paths containing []{} without {} ↵Justin Clark-Casey (justincc)2013-02-131-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-131-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-131-0/+9
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-1313-141/+304
| | |\ \
| | | * | BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-1211-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 Adams2013-02-128-124/+162
| | | | | | | | | | | | | | | | | | | | simulator to update info.
| | * | | Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arraysJustin Clark-Casey (justincc)2013-02-131-13/+57
| | |/ /
* | | | Merge branch 'master' into careminsterMelanie2013-02-130-0/+0
|\ \ \ \ | |/ / /
| * | | Make the sim features module register it's interface so it can be usedMelanie2013-02-131-0/+2
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-127-44/+272
|\ \ \ | |/ /
| * | Extend TestJsonCreateStore() with a one key input and an input with raw ↵Justin Clark-Casey (justincc)2013-02-121-2/+20
| | | | | | | | | | | | number values
| * | Replaced Ionic.Zip.dll with a new one that fixes a bug in it. DotNetZip ↵Diva Canto2013-02-121-0/+0
| | | | | | | | | | | | (from which Ionic.Zip.dll is derived) is now a fork in opensim-libs, forked from 1.9.1.8 and added that simple bug fix.
| * | Use an integer when specifying the XWorkItem wait rather than a TimeSpan to ↵Justin Clark-Casey (justincc)2013-02-123-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-121-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. ThisMic Bowman2013-02-122-5/+8
| | | | | | | | | | | | makes the JsonStore get/set operations symmetric.
| * | Fix handling of string values in JsonSetValueJson(). There areMic Bowman2013-02-111-1/+31
| | | | | | | | | | | | | | | some oddities with empty strings: the Json serializer treats them as default values and does not return them in serialized hashes.
| * | Add regression TestJsonSetValueJson()Justin Clark-Casey (justincc)2013-02-121-0/+58
| | | | | | | | | | | | | | | The part to test setting of single leaf-node string tokens is currently commented out. See http://opensimulator.org/mantis/view.php?id=6540
| * | 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
| | | | | | | | | | | | does not point to a value/leaf)
| * | Add section to TestJsonSetValue() to test attempted set of value where the ↵Justin Clark-Casey (justincc)2013-02-111-8/+23
| | | | | | | | | | | | penultimate section of path does not exist
| * | Add test to try reading notecard into an invalid path in ↵Justin Clark-Casey (justincc)2013-02-111-7/+13
| | | | | | | | | | | | TestJsonReadNotecard() regression test
* | | Merge branch 'master' into careminsterMelanie2013-02-104-8/+58
|\ \ \ | |/ /
| * | Fix code to check for no spawn points. Possibly a merge artefact?Melanie2013-02-101-2/+4
| | |
| * | Adding contributor to credits: Welcome Allen Kerensky!BlueWall2013-02-101-0/+1
| | |
| * | Additional ThreadPool worker and IOCP thread startup logicAllen Kerensky2013-02-101-6/+39
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Fix teleport/telehub issue:BlueWall2013-02-102-3/+17
| | | | | | | | | | | | Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
* | | Merge branch 'master' into careminsterMelanie2013-02-1028-298/+792
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-0826-279/+697
| |\ \
| | * | Fixed ReadSculptData(): the check whether there are enough bytes to read was ↵Oren Hurvitz2013-02-091-5/+6
| | | | | | | | | | | | | | | | incorrect
| | * | 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-0920-259/+716
| | |\ \
generated by cgit v1.1 at 2024-10-22 23:19:54 +0000