aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-277-19/+76
|\
| * Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-274-5/+5
| * OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.Oren Hurvitz2012-04-261-13/+12
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-266-273/+222
| |\
| | * Port Avination link order to make OpenSim behave like SL. Make Primstar scrip...Melanie2012-04-251-5/+7
| * | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-263-1/+59
* | | Adapt some TeleportWithMomentum callsMelanie2012-04-251-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-04-246-323/+215
|\ \ \ | | |/ | |/|
| * | OSSL: fixed the threat level check for osParseJSONNewOren Hurvitz2012-04-241-1/+1
| * | Add osForceAttachToAvatar() and osForceDetachFromAvatar()Justin Clark-Casey (justincc)2012-04-246-49/+127
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-231-2/+6
| |\ \ | | |/
| * | Replace common code to fetch self inventory item (as opposed to uuid) with Ge...Justin Clark-Casey (justincc)2012-04-231-155/+76
| * | refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_ApiJustin Clark-Casey (justincc)2012-04-231-94/+42
* | | Merge branch 'master' into careminsterMelanie2012-04-231-2/+6
|\ \ \ | | |/ | |/|
| * | Mantis 5977 Corrections to llRegionSayToTalun2012-04-231-2/+6
| |/
* | Merge branch 'master' into careminsterMelanie2012-04-173-6/+6
|\ \ | |/
| * refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateM...Justin Clark-Casey (justincc)2012-04-173-5/+5
| * 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
|\ \
| * | fix (http://opensimulator.org/mantis/view.php?id=5965) llGetObjectMass was ba...UbitUmarov2012-04-161-2/+23
| * | Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that ...UbitUmarov2012-04-161-22/+86
* | | Merge branch 'master' into careminsterMelanie2012-04-144-13/+55
|\ \ \ | | |/ | |/|
| * | Correct whitespace error introduced by previous commitMelanie2012-04-141-1/+1
| * | Missing or unimplemented LSL memory functions.Talun2012-04-134-13/+62
* | | 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
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-134-4/+71
| |\ \
| * | | Remove hardcoded god requirement from osSetRegionWaterHeight, osSetRegionSunS...Justin Clark-Casey (justincc)2012-04-131-36/+25
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-133-9/+30
|\ \ \ \ | | |_|/ | |/| |
| * | | llGetMass and llGetObjectMass (and push estimation) always use object mass a...UbitUmarov2012-04-093-9/+30
* | | | Merge branch 'master' into careminsterMelanie2012-04-131-4/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Mantis 55025 Implement script time.Talun2012-04-121-4/+3
* | | | Merge branch 'master' into careminsterMelanie2012-04-113-0/+68
|\ \ \ \ | |/ / /
| * | | New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as orig...Snoopy Pfeffer2012-04-103-0/+68
| | |/ | |/|
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-091-10/+2
|\ \ \ | | |/ | |/|
| * | Fix a LSL merge artefactMelanie2012-04-081-10/+2
* | | Merge branch 'master' into careminsterMelanie2012-04-091-18/+24
|\ \ \ | |/ / |/| / | |/
| * Mantis5502 implementation of some of the new constantsTalun2012-04-091-18/+24
* | 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
|\ \