aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix a LSL merge artefactMelanie2012-04-081-10/+2
|
* Merge branch 'master' into careminsterMelanie2012-04-072-17/+118
|\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Store FromItemID for attachments once on SOG instead of on every SOP and ↵Justin Clark-Casey (justincc)2012-04-071-1/+1
| | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use.
| * Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL ↵Justin Clark-Casey (justincc)2012-04-061-0/+1
| | | | | | | | | | | | functions. This is the same as PRIM_POSITION
| * refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos()Justin Clark-Casey (justincc)2012-04-061-4/+4
| |
| * Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene ↵Justin Clark-Casey (justincc)2012-04-061-10/+11
| | | | | | | | | | | | | | | | or attachments. Return relative position to root prim rather than 0,0,0. Should fix same issue with llGetLocalPos() http://opensimulator.org/mantis/view.php?id=5951
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-062-0/+82
| |\
| | * Addition of missing constants for llGetObjectDetails including for Mantis 5502Talun2012-04-062-0/+82
| | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
| * | For llGetMass(), return the mass of the avatar is the object is attached.Justin Clark-Casey (justincc)2012-04-061-3/+24
| |/ | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass This is the mass as used by the physics engine (ODE or Bullet).
| * Make llGetMass() return total mass of object when called on root prim.Justin Clark-Casey (justincc)2012-04-061-1/+4
| | | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass Aims to resolve http://opensimulator.org/mantis/view.php?id=5954
* | Merge branch 'master' into careminsterMelanie2012-04-031-4/+13
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fix more SOP.PhysActor race conditions in LSL_ApiJustin Clark-Casey (justincc)2012-04-031-7/+19
| |
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-311-0/+10
|\ \ | | | | | | | | | careminster
| * | Allow llTeleportAgent to work in attachmentsMelanie2012-03-291-0/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-311-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ↵Justin Clark-Casey (justincc)2012-03-311-3/+3
| | | | | | | | | | | | ContainsPart method and remove method duplication. HasChildPrim is also misleading since the 'root' prim can also be returned.
* | Merge branch 'master' into careminsterMelanie2012-03-273-0/+82
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Two new scripting functions osInviteToGroup(userID) and ↵Snoopy Pfeffer2012-03-273-0/+82
| | | | | | | | osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
| * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-271-0/+3
| | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* | Merge branch 'master' into careminsterMelanie2012-03-263-1/+16
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| * Add a hust UUID to the script invocationsMelanie2012-03-263-1/+16
| |
* | Merge branch 'master' into careminsterMelanie2012-03-253-74/+229
|\ \ | |/
| * Add support for key, vector, rotation and list types for bothMic Bowman2012-03-243-74/+229
| | | | | | | | | | | | arguments and return values to the modInvoke family of functions. See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
* | Merge branch 'master' into careminsterMelanie2012-03-232-6/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * fix yield prolog so it compiles with mono 2.11 there has been a bugzillanebadon2012-03-232-6/+6
| | | | | | | | | | | | report files with mono project in regards to this change, this simply lets us move forward with using mono 2.11 for now : https://bugzilla.xamarin.com/show_bug.cgi?id=4052
* | Fix merge issue from coreMelanie2012-03-221-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-221-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code ↵Justin Clark-Casey (justincc)2012-03-221-3/+3
| | | | | | | | clarity since non-default animations are handled completely separately from this class
| * Instead of loading default avatar animations in both SLUtil and ↵Justin Clark-Casey (justincc)2012-03-211-3/+3
| | | | | | | | | | | | | | | | AvatarAnimations, load just in AvatarAnimations instead. This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST. This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND") but scripts refer to them with lowercase names (e.g. "sit").
* | Merge branch 'master' into careminsterMelanie2012-03-186-0/+163
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927Justin Clark-Casey (justincc)2012-03-173-0/+30
| | | | | | | | | | This allows one to get description data for a given prim inventory item. Thanks MarcelEdward and GuduleLapointe!
| * Adds a new script command 'modInvoke' to invoke registered functionsMic Bowman2012-03-153-0/+133
| | | | | | | | | | | | | | | | | | from region modules. The LSL translator is extended to generate the modInvoke format of commands for directly inlined function calls. A region module can register a function Test() with the name "Test". LSL code can call that function as "Test()". The compiler will translate that invocation into modInvoke("Test", ...)
* | Allow llTeleportAgent to teleport gods when not in god modeMelanie2012-03-141-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-143-0/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Added osGetGridGatekeeperURI()Diva Canto2012-03-103-0/+20
| |
* | Implement llSetPrimitiveParams for physics shape and material. AddMelanie2012-03-134-0/+77
| | | | | | | | llSetPhysicsMaterial support.
* | Add AVATAR_MALE flag to return values of llGetAgentInfoMelanie2012-03-122-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-03-091-16/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Use SP.ParentPart instead of ParentID in places where it's more efficient ↵Justin Clark-Casey (justincc)2012-03-091-17/+7
| | | | | | | | | | | | | | (saving extra null checks, etc.) However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null. Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
| * FireAndForget scripted rez - port from AvinationMelanie2012-03-091-41/+46
| |
* | Merge branch 'master' into careminsterMelanie2012-03-075-12/+96
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)2012-03-065-12/+96
| | | | | | | | | | | | status" command. This is for diagnostic purposes.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-062-5/+27
|\ \ | | | | | | | | | careminster
| * | Allow NPC to be removed by the owner of the parcel they're over.Melanie2012-03-051-2/+9
| | | | | | | | | | | | Don't allow NPC creation unless the prim owner has rez rights.
| * | Teleport users to the cornfield when they are teleported withMelanie2012-03-051-3/+13
| | | | | | | | | | | | llTeleportAgentHome(). Don't try to teleport NPCs.
| * | SL compatibility - return only points on segemtn, not ray in llCastRayMelanie2012-03-051-0/+5
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-044-3/+188
|\ \ \ | |/ / | | | | | | careminster
| * | Fix and hook up llTeleportAgentMelanie2012-02-283-1/+7
| | |
| * | Implement llTeleportAgentMelanie2012-02-281-0/+22
| | |
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-11/+11
| | | | | | | | | | | | other way because SOG doesn't technically exist in the DB
generated by cgit v1.1 at 2024-12-18 02:56:53 +0000