aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix a LSL merge artefactMelanie2012-04-081-10/+2
* Merge branch 'master' into careminsterMelanie2012-04-072-17/+118
|\
| * Store FromItemID for attachments once on SOG instead of on every SOP and only...Justin Clark-Casey (justincc)2012-04-071-1/+1
| * Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL ...Justin Clark-Casey (justincc)2012-04-061-0/+1
| * 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 o...Justin Clark-Casey (justincc)2012-04-061-10/+11
| * 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
| * | For llGetMass(), return the mass of the avatar is the object is attached.Justin Clark-Casey (justincc)2012-04-061-3/+24
| |/
| * Make llGetMass() return total mass of object when called on root prim.Justin Clark-Casey (justincc)2012-04-061-1/+4
* | Merge branch 'master' into careminsterMelanie2012-04-031-4/+13
|\ \ | |/
| * 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
|\ \
| * | Allow llTeleportAgent to work in attachmentsMelanie2012-03-291-0/+10
* | | Merge branch 'master' into careminsterMelanie2012-03-311-1/+1
|\ \ \ | |/ / |/| / | |/
| * Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing Con...Justin Clark-Casey (justincc)2012-03-311-3/+3
* | Merge branch 'master' into careminsterMelanie2012-03-273-0/+82
|\ \ | |/
| * Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(user...Snoopy Pfeffer2012-03-273-0/+82
| * User level based restrictions for HyperGrid teleports, asset uploads, group c...Snoopy Pfeffer2012-03-271-0/+3
* | Merge branch 'master' into careminsterMelanie2012-03-263-1/+16
|\ \ | |/
| * 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
* | Merge branch 'master' into careminsterMelanie2012-03-232-6/+6
|\ \ | |/
| * fix yield prolog so it compiles with mono 2.11 there has been a bugzillanebadon2012-03-232-6/+6
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-221-0/+168
|\ \ | |/
| * Fix llGiveInventory() so that it checks the destination part for AllowInvento...Justin Clark-Casey (justincc)2012-03-221-1/+58
| * Add llGiveInventory() test from object to object where both objects are owned...Justin Clark-Casey (justincc)2012-03-221-0/+111
* | Fix merge issue from coreMelanie2012-03-221-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-221-2/+2
|\ \ | |/
| * refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity...Justin Clark-Casey (justincc)2012-03-221-3/+3
| * Instead of loading default avatar animations in both SLUtil and AvatarAnimati...Justin Clark-Casey (justincc)2012-03-211-3/+3
* | Merge branch 'master' into careminsterMelanie2012-03-189-4/+222
|\ \ | |/
| * Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927Justin Clark-Casey (justincc)2012-03-173-0/+30
| * Aggregate script execution times by linksets rather than individual prims.Justin Clark-Casey (justincc)2012-03-161-0/+6
| * Replace script-lines-per-second with the script execution time scaled by its ...Justin Clark-Casey (justincc)2012-03-161-1/+20
| * Protect the scriptmodulecomms interface.Mic Bowman2012-03-151-1/+4
| * Adds a new script command 'modInvoke' to invoke registered functionsMic Bowman2012-03-155-3/+163
* | Merge branch 'master' into careminsterMelanie2012-03-151-213/+135
|\ \ | |/
| * Remove property/field duplication in ScriptInstance where it's unnecessary.Justin Clark-Casey (justincc)2012-03-151-170/+107
| * Simplify some logic in the ScriptInstance constructor - running is set to fal...Justin Clark-Casey (justincc)2012-03-151-9/+3
| * minor: correct indentation levelsJustin Clark-Casey (justincc)2012-03-151-13/+12
| * Remove duplication of m_RunEvents and RunningJustin Clark-Casey (justincc)2012-03-151-17/+11
| * Alleviate an issue where calling Thread.Abort() on script WorkItems can fail ...Justin Clark-Casey (justincc)2012-03-151-3/+10
* | Allow llTeleportAgent to teleport gods when not in god modeMelanie2012-03-141-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-144-22/+75
|\ \ | |/
| * refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ...Justin Clark-Casey (justincc)2012-03-141-22/+44
| * Add max thread and min thread information to "xengine status" region console ...Justin Clark-Casey (justincc)2012-03-121-0/+3
| * Added osGetGridGatekeeperURI()Diva Canto2012-03-103-0/+20
* | Implement llSetPrimitiveParams for physics shape and material. AddMelanie2012-03-134-0/+77