aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-272-78/+83
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * minor: code formatting from 0b72f773Justin Clark-Casey (justincc)2012-05-261-12/+11
| |
| * Mantis 6025 llRequestPermissions auto grant for NPCs.Talun2012-05-261-1/+23
| | | | | | | | | | | | If the script requesting permissions is owned by either the NPC or the NPCs owner (if the NPC is created as owned) then grant any permissions automatically.
| * One can now get hyoergrid region co-ordinates with llRequestSimulatorDataBlake.Bourque2012-05-261-5/+21
| |
| * Use GetInventoryItem() in LSL_Api.InventoryKey(string name, int type).Justin Clark-Casey (justincc)2012-05-261-17/+7
| | | | | | | | Also removes small bug where calling this method would add 1 to LPS, evne though all callers already did this.
| * Use SceneObjectPartInventory.GetInventoryItem() in OSSL.AvatarStopAnimation ↵Justin Clark-Casey (justincc)2012-05-261-14/+12
| | | | | | | | instead of searching the task inventory manually.
| * refactor: replace LSL_Api.InventoryKey(string) largely with ↵Justin Clark-Casey (justincc)2012-05-261-37/+15
| | | | | | | | | | | | SceneObjectPartInventory.GetInventoryItem(string) Also gets llStopAnimation() to call KeyOrName rather than duplicating logic.
| * Mantis 6028 osAvatarStopAnimation not stopping animations via UUIDTalun2012-05-251-7/+11
| | | | | | | | | | Corrected to stop animations using the animation UUID similar to llStopAnimation. See http://opensimulator.org/wiki/OsAvatarStopAnimation
| * Fix llGetSimulatorHostname to return configured hostnameBlueWall2012-05-231-1/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-05-191-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * Port Avination's collision fixes to core.Melanie2012-05-151-10/+11
| |
* | Merge branch 'avination' into careminsterMelanie2012-05-172-2/+10
|\ \
| * | Added a invalidCollisionSoundUUID so that scripts can stop all collision ↵UbitUmarov2012-05-162-2/+10
| | | | | | | | | | | | sounds with llCollisionSound("",...). UUID.Zero means defaults should be used. In case part has several scripts with confliting llCollisionSound result depende on exec order. Specially on reset the efect of "" depends on reset order, it should override the others. This is intermediate improve(?) since collisions sounds seem to need a deaper revision.
* | | Merge branch 'avination' into careminsterMelanie2012-05-151-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-05-151-10/+11
| |\ \
| * | | make llGetCameraPos and llGetCameraRot apply to avatar that granted ↵UbitUmarov2012-05-141-4/+14
| | | | | | | | | | | | | | | | permission and not owner
* | | | Merge branch 'avination' into careminsterMelanie2012-05-141-10/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-141-10/+11
| |/ /
| * | Mantis 6015 new LSL function llGetAgentList.Talun2012-05-114-0/+96
| | | | | | | | | | | | Details in the lsl wiki
* | | Merge branch 'master' into careminsterMelanie2012-05-141-7/+21
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out ↵Chris Koeritz2012-05-131-7/+21
| | | | | | | | | | | | | | | | | | of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'master' into careminsterMelanie2012-05-104-0/+96
|\ \ \ | |/ /
| * | Mantis 6015 new LSL function llGetAgentList.Talun2012-05-094-0/+96
| | | | | | | | | | | | Details in the lsl wiki
* | | Merge branch 'master' into careminsterMelanie2012-05-0911-218/+278
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Add automated TestllBreakLink()Justin Clark-Casey (justincc)2012-05-081-0/+27
| | |
| * | Add automated TestllCreateLink()Justin Clark-Casey (justincc)2012-05-081-0/+112
| | |
| * | refactor: Eliminate local id parameter from api initialize.Justin Clark-Casey (justincc)2012-05-089-44/+35
| | | | | | | | | | | | This is always available from m_host.LocalId
| * | Instead of constantly looking up unchanging self item in script code, pass ↵Justin Clark-Casey (justincc)2012-05-089-183/+132
| | | | | | | | | | | | in self item on initialization.
* | | Merge branch 'master' into careminsterMelanie2012-05-081-8/+10
|\ \ \ | |/ /
| * | For osGetGridNick(), osGetGridName(), osGetGridLoginURI() and ↵Justin Clark-Casey (justincc)2012-05-071-8/+10
| | | | | | | | | | | | | | | | | | osGetGridCustom(), try to read from the [GridInfoService] section on standalone rather than [GridInfo] [GridInfoService] is the section that's actually in bin/config-include/StandaloneCommon.ini.example
* | | Merge branch 'master' into careminsterMelanie2012-05-072-2/+4
|\ \ \ | |/ /
| * | remove default values from prior commit since mono cant deal with themdahlia2012-05-071-1/+1
| | |
| * | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for ↵dahlia2012-05-062-1/+3
| | | | | | | | | | | | moving NPCs
* | | Merge branch 'master' into careminsterMelanie2012-05-051-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fixes Mantis #5999. llSetLinkPrimitiveParams with PRIM_BUMP_SHINY did cause ↵Snoopy Pfeffer2012-05-031-1/+1
| | | | | | | | | | | | a runtime error.
* | | Merge branch 'avination'Melanie2012-05-021-1/+2
|\ \ \ | | |/ | |/|
| * | llGetGeometricCenter...UbitUmarov2012-04-291-1/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-303-0/+13
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * | llGenerateKey implementation. Creates a random UUID I.E: ↵TBG Renfold2012-04-303-0/+13
| | | | | | | | | | | | | | | | | | UUID.Random().ToString(); Signed-off-by: TBG Renfold <tbg.renfold@g2mv.co.uk>
* | | Merge branch 'avination'Melanie2012-04-291-1/+1
|\ \ \ | | |/ | |/|
| * | fix llGetCenterOfMass ( checked with ubitODE only)UbitUmarov2012-04-281-1/+1
| | |
* | | 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-277-19/+76
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-274-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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-266-273/+222
| |\ \
| | * | 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>