aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-03-031-5/+0
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * Remove osParseJSONNew because it's "object" return type is not useful for LSLroot2013-02-251-5/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-02-052-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
| * | Remove the return value from llGiveMoney and add llTransferLindenDollars. AlsoMelanie2013-01-231-2/+7
| | | | | | | | | | | | | | | make llGiveMoney async so the script thread is not held up waiting for comms to an external server.
* | | Merge branch 'avination' into careminsterMelanie2013-01-241-2/+2
|\ \ \
| * | | Reintroduce the return value of llGiveMoney. The grid will crash and burn ↵Melanie2013-01-241-2/+2
| | | | | | | | | | | | | | | | without it.
* | | | Merge branch 'avination' into careminsterMelanie2013-01-231-2/+2
|\ \ \ \ | |/ / /
| * | | Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) andMelanie2013-01-231-2/+2
| | |/ | |/| | | | | | | | | | make the function async so the script thread is not held up waiting for comms to an external server.
* | | Merge branch 'master' into careminsterMelanie2013-01-191-0/+17
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * | New constants for llGetObjectDetailsTalun2013-01-191-0/+17
| | | | | | | | | | | | | | | | | | | | | New constants for llGetObjectDetails OBJECT_CHARACTER_TIME, OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE, OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ also Pathfining constants, 3 of which are used by llGetObjectDetails
* | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-161-0/+5
|\ \ \ | |/ / | | / | |/ |/| Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * BulletSim: add osGetPhysicsEngineType() LSL function and updateRobert Adams2013-01-111-0/+5
| | | | | | | | | | | | | | | | the physics engines to return the name that is specified in the INI file ("physics = XXX") as the type of engine. This os function is a little different than the others in that it does not throw an exception of one is not privilaged to use it. It merely returns an empty string.
* | Merge branch 'master' into careminsterMelanie2012-11-152-0/+66
|\ \ | |/
| * Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-142-0/+66
| |
* | Merge branch 'master' into careminsterMelanie2012-11-091-0/+5
|\ \ | |/
| * llSetLinkCamera implementationPixelTomsen2012-11-091-0/+5
| | | | | | | | | | | | wiki: http://wiki.secondlife.com/wiki/LlSetLinkCamera mantis: http://opensimulator.org/mantis/view.php?id=6397
* | Merge branch 'master' into careminsterMelanie2012-10-262-0/+20
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * adding ability for listeners to be filtered by regular expressions and a ↵SignpostMarv2012-10-262-0/+20
| | | | | | | | general-purpose function to see if a given string matches a given regex
* | Merge branch 'master' into careminsterMelanie2012-10-231-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/LandData.cs
| * Add CLICK_ACTION_ZOOMBlueWall2012-10-201-0/+1
| | | | | | | | Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction
* | Merge branch 'master' into careminsterMelanie2012-10-031-0/+20
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * added perms checking, duplicated functionality to methods that do not ↵SignpostMarv2012-10-021-0/+10
| | | | | | | | require perms and have higher threat level
| * implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-021-0/+10
| |
* | Merge branch 'master' into careminsterMelanie2012-09-072-1/+65
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * wrapping attachment functions in a regionSignpostMarv2012-09-041-1/+1
| |
| * Implementing functing to send messages directly to attachmentsSignpostMarv2012-09-042-0/+57
| |
| * implementing a function to get the number of attachments wornSignpostMarv2012-09-041-0/+7
| |
* | Merge branch 'master' into careminsterMelanie2012-08-311-0/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * This partially implements the LSL function to set the responseMic Bowman2012-08-291-0/+5
| | | | | | | | | | | | | | | | type for an HTTP request. Since the "official" LSL function limits the use of the response type, it is implemented as osSetContentType with a string for the content mime type and a threat level of high. With this function you should be able to implement rather functional media-on-a-prim application with much less difficulty.
* | Merge branch 'master' into careminsterMelanie2012-08-241-1/+6
|\ \ | |/
| * Revert "implementing function to allow scripts to self-replicate as if the ↵Justin Clark-Casey (justincc)2012-08-241-5/+0
| | | | | | | | | | | | | | | | owner duplicated them, using the same script delay as llRezObject()" This reverts commit 2ad9d656b3a1a0c519c9599d7680f98eba7e82b8. Reverted pending consideration of associated issues.
| * implementing function to allow scripts to self-replicate as if the owner ↵SignpostMarv2012-08-241-0/+5
| | | | | | | | duplicated them, using the same script delay as llRezObject()
| * Adds osGetHealth.TBG Renfold2012-08-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns the amount of health (in an integer) that an avatar has left in the scene. If an avatar is not found or safe is enabled on a region, -1 is returned. Example usage: default { touch_end(integer _t) { key agentID = llDetectedKey(0); osCauseDamage(agentID, 50); llSay(0, llKey2Name(agentID) + " has " + (string)osGetHealth(agentID) + "% health left."); } }
* | Merge branch 'master' into careminsterMelanie2012-08-181-0/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * implementedSignpostMarv2012-08-171-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-08-161-0/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * adding ATTACH_*_PEC constantsSignpostMarv2012-08-151-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-08-031-0/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * reduced-complexity implementation of function to get rezzing object keySignpostMarv2012-08-021-0/+5
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2012-07-281-0/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * LSL/OSSL lacks Math.Min & Math.Max implementations.SignpostMarv2012-07-281-0/+10
| |
* | Remove support for the OS_NPC constant. That one seems to be overly paranoidMelanie2012-07-251-1/+0
| | | | | | | | to have and confuses the issue.
* | Merge branch 'master' into careminsterMelanie2012-07-231-0/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * As per opensim-dev mailing list conversation, introduce OS_NPC constant for ↵Justin Clark-Casey (justincc)2012-07-201-0/+1
| | | | | | | | | | | | | | | | | | use with llSensor() This same constant will later be used with llGetDetectedType(). This constant has a different name from NPC to avoid possible conflict with future LSL changes. This constant has a different value to try and avoid unnecessary conflict with future constants that may use the same value. Using the 'NPC' constant with llSensor() will remain valid but is deprecated.
* | Merge branch 'master' into careminsterMelanie2012-07-201-0/+5
|\ \ | |/
| * Implements a very useful OSSL function to test a string to seeMic Bowman2012-07-201-0/+5
| | | | | | | | | | | | if it is a UUID. The function is osIsUUID(). Thanks SignpostMarv!
| * Implementation of llSetRegionPos(). Does not implement failure on object ↵SignpostMarv2012-07-141-0/+5
| | | | | | | | | | | | entry/prim limit/access restrictions. Signed-off-by: SignpostMarv <github@signpostmarv.name>
* | Merge branch 'master' into careminsterMelanie2012-07-111-0/+10
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * This script allows an object to be attached directly from prim inventory to ↵Justin Clark-Casey (justincc)2012-07-091-0/+5
| | | | | | | | | | | | | | another avatar in the scene. Very useful in serious game/environment scenarios where its only allowed for trusted creators. Threat level Severe