aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-271-5/+20
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * minor: style adjustments in SensorRepeat, mainly related to patch from stoehrJustin Clark-Casey (justincc)2012-04-271-3/+4
| |
| * Fixing wrong position of llSensor, SensePoint wasnt following the rotation ↵Stefan_Boom2012-04-271-8/+22
| | | | | | | | of the root prim.
* | Merge branch 'master' into careminsterMelanie2012-04-278-20/+77
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-275-6/+6
| | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
| * OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.Oren Hurvitz2012-04-261-13/+12
| | | | | | | | OSSL permissions are now controlled in OpenSim.ini.
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-267-276/+227
| |\
| | * Port Avination link order to make OpenSim behave like SL. Make Primstar ↵Melanie2012-04-251-5/+7
| | | | | | | | | | | | scripts work. Fixes Mantis #5990
| * | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-263-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osNpcSay(UUID npc, string message) left untouched New functions:- osNpcSay(UUID npc, int channel, string message) osNpcShout(UUID npc, int channel, string message) osNpcWhisper(UUID npc, int channel, string message) Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Adapt some TeleportWithMomentum callsMelanie2012-04-251-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-251-3/+5
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | Minor improvements to loggingOren Hurvitz2012-04-241-3/+5
| | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
* | | Merge branch 'master' into careminsterMelanie2012-04-246-323/+215
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | 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
| | | | | | | | | | | | | | | | | | These behave identically to llAttachToAvatar() and llDetachFromAvatar() except that they do not enforce the PERMISSION_ATTACH check Intended for use in completely controlled dedicated environments where these checks are more a UI hinderance than a help. Threat level high.
| * | 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 ↵Justin Clark-Casey (justincc)2012-04-231-155/+76
| | | | | | | | | | | | | | | | | | GetSelfInventoryItem() However, at some point it would be far more convenient to receive the TaskInventoryItem in the constructor rather than just the item UUID, so we don't have to constantly refetch our self item.
| * | refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_ApiJustin Clark-Casey (justincc)2012-04-231-94/+42
| | | | | | | | | | | | There's no point look up an item ID that we already have.
* | | 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>
| * Fix a logic error in app domain creationMelanie2012-04-181-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-04-181-3/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Don't re-add the assembly resolver for each script if not creating the appdomainMelanie2012-04-181-4/+8
| |
* | 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-135-38/+119
| |\ \
| * | | 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-132-38/+51
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | Mantis 55025 Implement script time.Talun2012-04-122-38/+51
| | | | | | | | | | | | | | | | 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
| |
generated by cgit v1.1 at 2024-11-06 06:35:40 +0000