aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-162-22/+22
|\
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-1432-242/+983
| |\
| * | Use SortedDictionary in StatsManager instead of regular Dictionary so stats ↵Dan Lake2013-02-142-22/+22
| | | | | | | | | | | | will interate and print in a defined order
* | | Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-1611-54/+277
| |/ |/|
* | Enable one sub-test in TestJsonSetValue() which now works (using identifier ↵Justin Clark-Casey (justincc)2013-02-151-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-152-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-151-62/+62
| | | | | | | | will go away soon
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-153-7/+11
|\ \
| * | * Handle null check on configs in module startup so that the the code can be ↵teravus2013-02-142-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 ↵teravus2013-02-141-0/+2
| | | | | | | | | | | | WebSocket handler
* | | Add regression TestJsonList2Path()Justin Clark-Casey (justincc)2013-02-151-2/+27
|/ /
* | Add regression TestGetArrayLength()Justin Clark-Casey (justincc)2013-02-141-0/+33
| |
* | Add regression TestJsonGetPathType()Justin Clark-Casey (justincc)2013-02-141-0/+47
| |
* | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2013-02-142-2/+2
| |
* | Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵Justin Clark-Casey (justincc)2013-02-143-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-141-5/+5
| | | | | | | | | | | | consistent with existing LSL/OSSL, etc script constants. Agreed with cmickeyb
* | Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
| | | | | | | | from the physical scene. Invocations added in SceneObjectPart.
* | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-142-5/+26
| |
* | 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' 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
| |/ /
* | | Make the sim features module register it's interface so it can be usedMelanie2013-02-131-0/+2
|/ /
* | 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
* 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' 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
| |
generated by cgit v1.1 at 2024-11-10 04:32:45 +0000