aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-206-4/+82
| | | | | | Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format).
* Add flush after write feature to LogWriterRobert Adams2013-02-201-1/+12
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-2061-155/+58
|\
| * Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-194-96/+3
| | | | | | | | remove the deprecated TestPath functions.
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-1955-55/+53
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-194-17/+28
| |\
| * | Updated AssemblyInfo.cs for Groups and OfflineIM to 0.7.6.*. Removed ↵Diva Canto2013-02-192-4/+2
| | | | | | | | | | | | AssemblyFileVersionNumber too.
* | | Correct mistake in parsing 'show object pos' and similar pos commands where ↵Justin Clark-Casey (justincc)2013-02-202-9/+9
| |/ |/| | | | | | | | | the 'to' text would be treat as the end vector rather than discarded. Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
* | Give the user some feedback about the success or failure of console login ↵Justin Clark-Casey (justincc)2013-02-201-2/+13
| | | | | | | | property commands
* | minor: remove some mono compiler warnings in ↵Justin Clark-Casey (justincc)2013-02-202-5/+5
| | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll
* | Convert JsonTestPath() use in json regression tests to JsonGetPathType() insteadJustin Clark-Casey (justincc)2013-02-191-10/+10
|/
* First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵Diva Canto2013-02-1920-0/+9455
| | | | rest to Addons.Groups.dll.
* Offline IM: moved the Data and MySQL bits to the corresponding places in ↵Diva Canto2013-02-193-8/+2
| | | | core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.
* One more sql statement on migration #2 for offline im, to really clean up ↵Diva Canto2013-02-181-0/+1
| | | | things.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-181-1/+1
|\
| * minor: Rename regression test method TestGetArrayLength() -> ↵Justin Clark-Casey (justincc)2013-02-181-1/+1
| | | | | | | | JsonTestGetArrayLength() to match others
* | Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dllDiva Canto2013-02-189-0/+1016
| |
* | I need these for OfflineIM and Groups.Diva Canto2013-02-181-0/+60
|/
* BulletSim: experimental lock axis code using constraints. Not enabledRobert Adams2013-02-172-22/+74
| | | | by default. Like more debugging is needed.
* BulletSim: add calls for creating all the different Bullet constraint types.Robert Adams2013-02-175-47/+338
| | | | | Updated the DLLs and SOs and code for BulletXNA to create the types. All the detailed control calls are not all in place yet.
* BulletSim: rework parameter setting for different types of valuesRobert Adams2013-02-175-394/+348
| | | | (like vectors or quaternions).
* * Fix walking to <NaN, NaN, NaN> via autopilot.teravus2013-02-161-1/+5
|
* BulletSim: fix physical object appearing to slowly float off whenRobert Adams2013-02-161-1/+1
| | | | they stop moving.
* Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
|
* Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
|
* Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| | | | | | | | Really "My Inventory" is just the name of the root, it isn't a folder in its own right. This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /* /* will still work and this is a special case just for the root If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/* Added a regression test for this case.
* 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-1427-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-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