aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-142-3/+8
|\ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * In the osGetGrid functions, if the [GridInfo] section does not exist then ↵Justin Clark-Casey (justincc)2012-06-131-1/+6
| | | | | | | | return "Configuration Error", as already happens if there is no GridInfoURI
| * Committing the Avination implementation of llCastRay. This is a complete rewriteMelanie2012-06-131-100/+345
| | | | | | | | wich does it's thing independently of physics. Enjoy!
| * Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in ↵Justin Clark-Casey (justincc)2012-06-111-3956/+3978
| | | | | | | | | | | | | | | | LSL where these aren't evaluated propertly." This reverts commit a8a9d13dc07bc9e23ebf439cbea5ece6ae002315. Accidentally committed, this patch might not be the correct approach.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-113-0/+106
| |\
| | * Commitig the Avination implementation of llTeleportAgent andMelanie2012-06-113-0/+106
| | | | | | | | | | | | | | | | | | llTeleportAgentGlobalCoords. These do NOT use PERMISSION_TELEPORT like their SL counterparts because that permission is not yet understood by TPVs based on v1.x.
| * | Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL ↵Justin Clark-Casey (justincc)2012-06-091-3978/+3956
| |/ | | | | | | | | | | where these aren't evaluated propertly. Addresses http://opensimulator.org/mantis/view.php?id=3268
* | Merge branch 'avination' into careminsterMelanie2012-06-113-5/+73
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | Make llTeleportAgent conform to Magnum SL Server and add ↵Melanie2012-06-083-5/+73
| | | | | | | | | | | | llTeleportAgentGlobalCoords()
* | | Merge branch 'avination' into careminsterMelanie2012-06-071-0/+2
|\ \ \ | |/ /
| * | Typo correctionMelanie2012-06-071-1/+1
| | |
| * | Set collision sound type so custom sound types are recognizedMelanie2012-06-071-0/+2
| | |
| * | Prevent a null ref when getting the velocity of an avatar during login orMelanie2012-06-071-2/+3
| | | | | | | | | | | | logout.
* | | Remove a null ref when an avatar's attachment gets the avatar velocityMelanie2012-06-061-4/+3
| | | | | | | | | | | | | | | | | | while the avatar is logging in or out. Also remove some unlocking calls without matching locking call. Merge artefact cleanup, again.
* | | Merge branch 'avination' into careminsterMelanie2012-06-061-3/+4
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | revert last bad commit but fix recoil directionUbitUmarov2012-06-051-4/+4
| | |
| * | Stop llRezAtRoot() from applying velocity setting impulse in ↵UbitUmarov2012-06-051-2/+3
| | | | | | | | | | | | World.RezObject, doing it only in itself, so its applyed after resuming scripts etc. It was giving twice the requested velocity.
| * | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach ↵Melanie2012-06-041-1/+1
| | | | | | | | | | | | positions.
* | | Merge branch 'master' into careminsterMelanie2012-06-061-1/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Remove unused ScenePresence list structure in llGetAgentList()Justin Clark-Casey (justincc)2012-06-051-1/+0
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-06-021-7/+33
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix LSL animation state reporting and animation state transitions on crossingMelanie2012-06-011-7/+33
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-05-311-0/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Prevent multiple requests to go physical from reaching the physics pluginMelanie2012-05-301-0/+4
| | |
* | | 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-0912-225/+290
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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
| | |