aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Stop attempts to update/add existing attachments in user inventory when ↵Justin Clark-Casey (justincc)2013-03-281-1/+1
| | | | | | teleporting between regions. This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
* Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-262-1/+3
| | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-0/+31
| | | | | This is relevant to mega-regions where the borders are very different to a regular region. Also adds some method doc and other code comments.
* Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 ↵Justin Clark-Casey (justincc)2013-03-201-10/+7
| | | | | | 21:38:00 2013) This break was not connected with the recent attachment code changes.
* Merge branch 'master' into newmultiattachMelanie2013-03-185-49/+156
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Fix server statistics always reporting zero for total network bytes in/out.Robert Adams2013-03-151-15/+26
| | | | | | | | Clean up some parameter code in Statistics.Binary.
| * Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-054-34/+130
| | | | | | | | | | functions into one for node type and one for value type. Define and export constants for both nodes and values.
* | Multiattach, part 1Melanie2013-03-181-1/+1
|/ | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-03-021-6/+7
|\
| * minor: Quieten down the parts of the WebSocketEcho module logging for now ↵Justin Clark-Casey (justincc)2013-03-021-6/+7
| | | | | | | | where it tells us it is added/loaded/removed from regions
* | Fixed typos in TempAttachmentsModule. No changes.Diva Canto2013-03-021-1/+1
|/
* Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-011-2/+3
| | | | compatible ([Startup] still being looked up), but please update your configs sometime soon.
* Add the Mono AddinDependency attribute to the example region modules.Justin Clark-Casey (justincc)2013-03-012-2/+4
| | | | It turns out this is required to get Mono.Addins to pick up plugin DLLs
* Add comment to example region modules about need to add Assembly annotation ↵Justin Clark-Casey (justincc)2013-02-272-0/+10
| | | | if adding modules to a DLL which does not already have this
* Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-273-32/+47
| | | | places where we were not already.
* Streamline stat registration code in ServerStats. Remove most of theRobert Adams2013-02-241-160/+50
| | | | | usage of ProcessCounters which tend to fail oddly and are not supported everywhere.
* Addition of ServerStats shared region module which collects and registersRobert Adams2013-02-241-0/+438
| | | | server wide statistics (CPU%, network bytes sent, ...) with StatsManager.
* minor: Change summary in "show appearance" console command to "incomplete" ↵Justin Clark-Casey (justincc)2013-02-211-1/+1
| | | | | | | rather than "corrupt" Corrupt is misleading - it implies textures were uploaded but are not j2k valid. The actual situation is that at least one required baked texture is not present.
* Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-193-95/+3
| | | | remove the deprecated TestPath functions.
* Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
|
* Convert JsonTestPath() use in json regression tests to JsonGetPathType() insteadJustin Clark-Casey (justincc)2013-02-191-10/+10
|
* minor: Rename regression test method TestGetArrayLength() -> ↵Justin Clark-Casey (justincc)2013-02-181-1/+1
| | | | JsonTestGetArrayLength() to match others
* 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
* 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
|
* Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵Justin Clark-Casey (justincc)2013-02-142-6/+6
| | | | | | | | 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
* Adds a couple requested functions to the JsonStore scriptMic Bowman2013-02-133-1/+147
| | | | | | 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
|
* 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
|
* Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arraysJustin Clark-Casey (justincc)2013-02-131-13/+57
|
* Extend TestJsonCreateStore() with a one key input and an input with raw ↵Justin Clark-Casey (justincc)2013-02-121-2/+20
| | | | number values
* 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' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-082-5/+173
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-093-4/+266
| |\
| | * BulletSim: fix avatar bobbing or jiggling while stationary flying.Robert Adams2013-02-081-1/+9
| | | | | | | | | | | | Various comments and debugging message mods.