aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-1310-156/+522
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-1310-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-139-141/+304
| | |\
| | | * BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-127-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
| | |/
| * | Make the sim features module register it's interface so it can be usedMelanie2013-02-131-0/+2
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-126-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
| * 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-103-8/+57
|\ \ | |/
| * Fix code to check for no spawn points. Possibly a merge artefact?Melanie2013-02-101-2/+4
| |
| * 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-1024-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-0822-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-0915-259/+712
| | |\
| | | * BulletSim: add parameter to set global contact breaking threshold. Update ↵Robert Adams2013-02-082-0/+7
| | | | | | | | | | | | | | | | DLLs and SOs for setting same.
| | | * BulletSim: Change BSCharacter to use new base Density and FrictionRobert Adams2013-02-082-16/+12
| | | | | | | | | | | | | | | | variables rather than own local varaibles.
| | | * BulletSim: fix avatar bobbing or jiggling while stationary flying.Robert Adams2013-02-086-19/+34
| | | | | | | | | | | | | | | | Various comments and debugging message mods.
| | | * BulletSim: add initial instance of the ExtendedPhysics region module which ↵Robert Adams2013-02-081-0/+163
| | | | | | | | | | | | | | | | adds new LSL commands for extended physics functions. Uses the modInvoke system. Disabled by default.
| | | * BulletSim: include the linkage to the layered prim implementation. Separate ↵Robert Adams2013-02-088-225/+109
| | | | | | | | | | | | | | | | layers for physical (vs simulator) location displacement and linksets.
| | | * BulletSim: reclass BSPrim into layers so linkset and physical world ↵Robert Adams2013-02-082-0/+297
| | | | | | | | | | | | | | | | displacement is implemented as overlay classes rather than if statements scattered about.
| | * | Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that ↵Justin Clark-Casey (justincc)2013-02-091-5/+2
| | | | | | | | | | | | | | | | the return values have changed.
| | * | Added physics parameters support to MSSQL and SQLite (not tested)Oren Hurvitz2013-02-096-13/+71
| | | |
| * | | Make JsonStore path parsing more robust. Should fix theMic Bowman2013-02-082-21/+59
| | |/ | |/| | | | | | | invalid path problem.
| * | Broaden the internal OSD type checks to parse JSON that hasMic Bowman2013-02-081-2/+29
| | | | | | | | | | | | non string values.
* | | Merge branch 'master' into careminsterMelanie2013-02-0811-95/+348
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * | 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-082-2/+66
| | |/ | |/| | | | | | | 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.
generated by cgit v1.1 at 2024-09-12 17:26:18 +0000