aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mbworkvar2' into ubitvarUbitUmarov2015-08-191-1/+4
|\
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-291-1/+4
| | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
* | Comment spammy XMLRPC router message - we don't need to know every time aMelanie Thielker2015-03-251-1/+1
|/ | | | script does something that wil fail anyway.
* Merge branch 'master' into careminsterMelanie2014-01-283-3/+274
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * Clean up orphaned json stores. This can happen when an object isMic Bowman2014-01-203-3/+274
| | | | | | | | | | | | removed, when a script is removed, or when a script is reset. Also added a stats command to track the number of json stores used by a region. Will probably add some more commands later.
* | Intermediate commit. Sill errors.Melanie2014-01-051-3/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵Justin Clark-Casey (justincc)2013-12-141-3/+5
| | | | | | | | | | | | | | console rather than log as warning The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
* | Merge branch 'master' into careminsterMelanie2013-12-071-2/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Change the log level for the LOGIN DISABLED and LOGIN ENABLED messages isMic Bowman2013-11-271-2/+4
| | | | | | | | | | | | the RegionReady module to be warn so that the message will show up in the log for simulators running in a more production mode (knowing when logins are functional is useful).
* | Merge branch 'master' into careminsterMelanie2013-10-041-9/+326
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: add LSL function and plumbing for setting a springRobert Adams2013-09-111-1/+3
| | | | | | | | equilibrium point in the physics engine constraint.
| * BulletSim: add extended physics LSL constants for axis specification.Robert Adams2013-09-111-2/+14
| | | | | | | | | | Add specific error warnings for mis-matched parameter types in extended physics functions.
| * BulletSim: ability to specify groups of axis to modify in constraint ↵Robert Adams2013-09-111-1/+11
| | | | | | | | parameters that control multiple axis. Add useLinearReferenceFrameA constraint parameter.
| * BulletSim: add axis parameter for specifying enable, damping, and stiffness ↵Robert Adams2013-09-111-4/+6
| | | | | | | | for spring constraints. Renumber parameter ops since I can as no one is using them yet.
| * BulletSim: implementation of setting spring specific physical parameters. ↵Robert Adams2013-09-111-1/+5
| | | | | | | | Add setting of linkset type to physChangeLinkParams. Lots of detail logging for setting of linkset constraint parameters.
| * BulletSim: pass both root and child BSPhysObjects to Extension function. ↵Robert Adams2013-09-111-13/+17
| | | | | | | | Update routines to use the new parameters list from above change.
| * BulletSim: Extension parameters passed through the classes made to pass just ↵Robert Adams2013-09-111-5/+18
| | | | | | | | and array of objects rather than a mixture of parameters and array. Makes understanding and parsing what is being passed much easier.
| * BulletSim: add extended physics function physGetLinkType(linkNum). Add ↵Robert Adams2013-09-111-0/+19
| | | | | | | | implementation of physChangeLinkParams() in BSLinksetConstraint.
| * BulletSim: change ExtendedPhysics constants to 'const' so they can be used ↵Robert Adams2013-09-111-28/+28
| | | | | | | | as case variables in switch statements.
| * BulletSim: add physChangeLinkParams to set individual parameters on link ↵Robert Adams2013-09-111-94/+171
| | | | | | | | constraints. Not fully functional. Remove double definition of ExtendedPhysics parameters by having BulletSim reference the optional module (addition to prebuild.xml and usings).
| * BulletSim: add physChangeLinkSpring to change linkset link to be a spring ↵Robert Adams2013-09-111-3/+70
| | | | | | | | constraint. Add implementation to create spring constraint. Send up property updates for linkset children at the end of flexible linkset links. The simulator probably doesn't do the right thing yet.
| * BulletSim: initial implementation of physChangeLinkFixed that resets a ↵Robert Adams2013-09-111-1/+81
| | | | | | | | linkset's link back to a fixed, non-moving connection.
| * BulletSim: fixes for change linkset implementation of physical linksets.Robert Adams2013-09-111-1/+28
| |
* | Merge branch 'master' into careminsterMelanie2013-08-071-5/+60
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'Robert Adams2013-08-021-5/+60
| | | | | | | | | | and processing routines in BulletSim. Add linkset rebuild/conversion routine in BSLinkset.
* | Merge branch 'master' into careminsterMelanie2013-08-011-8/+46
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * BulletSim: test method for debugging of extended physics script operations.Robert Adams2013-07-301-8/+46
| |
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-1/+2
| | | | | | | | 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"
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-1/+2
| | | | | | | | 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"
* | Merge branch 'master' into careminsterMelanie2013-03-084-34/+130
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * 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.
* | Merge branch 'master' into careminsterMelanie2013-02-224-106/+14
|\ \ | |/
| * Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-193-95/+3
| | | | | | | | remove the deprecated TestPath functions.
| * 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
* | Merge branch 'master' into careminsterMelanie2013-02-153-69/+170
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * 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
* | Merge branch 'master' into careminsterMelanie2013-02-143-13/+153
|\ \ | |/
| * 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
| |
* | Merge branch 'master' into careminsterMelanie2013-02-131-15/+218
|\ \ | |/
| * 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