aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-231-2/+6
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Mantis 5977 Corrections to llRegionSayToTalun2012-04-231-2/+6
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-04-173-6/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: Rename EstateSettings.IsEstateManager() to ↵Justin Clark-Casey (justincc)2012-04-173-5/+5
| | | | | | | | | | | | | | EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does. This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities. As per opensim-dev mailing list.
| * Null reference in llGetObjectMass on a seated avatar.Talun2012-04-171-1/+1
| |
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-171-24/+109
|\ \ | | | | | | | | | careminster
| * | fix (http://opensimulator.org/mantis/view.php?id=5965) llGetObjectMass was ↵UbitUmarov2012-04-161-2/+23
| | | | | | | | | | | | bad for sitted avatars not checking for the null physicsactor
| * | Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that ↵UbitUmarov2012-04-161-22/+86
| | | | | | | | | | | | should be checked. PROBLEM: it will not detect nonphysical phantons :(
* | | Merge branch 'master' into careminsterMelanie2012-04-144-13/+55
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
| * | Correct whitespace error introduced by previous commitMelanie2012-04-141-1/+1
| | |
| * | Missing or unimplemented LSL memory functions.Talun2012-04-134-13/+62
| | | | | | | | | | | | | | | | | | Implemented to behave as if scripts were LSO. Signed-off-by: nebadon <michael@osgrid.org>
* | | Merge branch 'master' into careminsterMelanie2012-04-131-37/+26
|\ \ \ | |/ /
| * | Change threat level of osNpcStopMoveToTarget from Low to High to match other ↵Justin Clark-Casey (justincc)2012-04-131-1/+1
| | | | | | | | | | | | | | | | | | NPC functions, and change OSSL permissions name to osNpcStopMoveToTarget instead of osNpcStopMoveTo Thanks to Oren Hurvitz for pointing out these mistakes.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-134-4/+71
| |\ \
| * | | Remove hardcoded god requirement from osSetRegionWaterHeight, ↵Justin Clark-Casey (justincc)2012-04-131-36/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osSetRegionSunSettings and, osSetEstateSunSettings no matter the threat level. Change threat level on osSetRegionSunSettings and osSetEstateSunSettings from nuisance to high to match similar functions. If you had enabled these functions but had relied on the hardcoded god check in the code, then please adjust your OSSL permissions config. Thanks to Oren Hurvitz for pointing this out.
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-133-9/+30
|\ \ \ \ | | |_|/ | |/| | | | | | careminster
| * | | llGetMass and llGetObjectMass (and push estimation) always use object mass ↵UbitUmarov2012-04-093-9/+30
| | | | | | | | | | | | | | | | as in current SL ( push is what makes sense or impulse will depend on what prim it is and not object). Added llGetMassMKS() that just returns 100 x llGetMass() as it seems to be in SL.
* | | | Merge branch 'master' into careminsterMelanie2012-04-131-4/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | Mantis 55025 Implement script time.Talun2012-04-121-4/+3
| | | | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
* | | | Merge branch 'master' into careminsterMelanie2012-04-113-0/+68
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * | | New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as ↵Snoopy Pfeffer2012-04-103-0/+68
| | |/ | |/| | | | | | | originally proposed in SL Jira (https://jira.secondlife.com/browse/SVC-244).
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-091-10/+2
|\ \ \ | | |/ | |/| | | | careminster
| * | Fix a LSL merge artefactMelanie2012-04-081-10/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-091-18/+24
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IScriptModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Mantis5502 implementation of some of the new constantsTalun2012-04-091-18/+24
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | 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
| |
generated by cgit v1.1 at 2024-12-23 17:04:06 +0000