aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-086-7472/+7710
|\ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * If the LSL state_entry() event definition contains any parameters, then ↵Justin Clark-Casey (justincc)2013-11-024-7471/+7692
| | | | | | | | | | | | | | | | generate syntax error as seen on the LL grid This is done through the parser and so generates the same syntax error message if any parameters are wrongly specified for this event. We were already enforcing event names in the parser. This is only for state_entry so far as an initial test of the approach - appears to work correctly.
| * add new particle system blending rule enumerationsdahlia2013-10-311-1/+5
| |
| * add new LSL constants associated with new "ribbon", "glow", and "blend" ↵dahlia2013-10-311-0/+13
| | | | | | | | particle system functionality. Note that this does *not* complete required server side changes for implementing the new particle system
* | Merge branch 'master' into careminsterMelanie2013-11-031-27/+22
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Call ScriptSleep() instead of llSleep() in routine for llEmail.Kevin Cozens2013-10-181-1/+1
| | | | | | | | Signed-off-by: teravus <teravus@gmail.com>
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-151-19/+22
| | | | | | | | Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-061-1/+1
|\ \ | | | | | | | | | careminster
| * \ Merge branch 'master' of careminster:/var/git/careminsterteravus2013-10-044-242/+407
| |\ \
| * | | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-09-162-12/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work. (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)
* | | | Merge branch 'master' into careminsterMelanie2013-10-064-4/+4
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * | Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-044-4/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2013-10-044-242/+407
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-271-1/+1
| | | | | | | | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| * | Fix bug where using PRIM_LINK_TARGET with only two remaining list items ↵Justin Clark-Casey (justincc)2013-09-162-2/+16
| | | | | | | | | | | | | | | | | | (e.g. link number then PRIM_ROTATION) would not return the parameter Extended regression test for this case
| * | Make llGetLinkPrimitiveParams() abort and return existing list of params ↵Justin Clark-Casey (justincc)2013-09-163-239/+397
| | | | | | | | | | | | | | | | | | | | | | | | | | | when it encounters an invalid link number, rather than throwing an exception Addresses http://opensimulator.org/mantis/view.php?id=6768 Thanks to talun for the patch on that commit - in the end I took a different approach that also deals with invalid PRIM_LINK_TARGET However, not yet generating the same warning on invalid PRIM_LINK_TARGET as seen on LL grid This commit also adds regression tests for some cases of llGetLinkPrimitiveParams()
| * | 6762: llList2Key fails to convert a string in a list to a keyTalun2013-09-121-1/+1
| | | | | | | | | | | | | | | llGetPrimitiveParams changed to return the sculpty key as an LSL_String so that type checking in llList2Key will work
* | | Merge branch 'avination-current' into careminsterMelanie2013-09-162-11/+46
|\ \ \ | |_|/ |/| | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-08-242-11/+46
| | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
* | | Merge branch 'master' into careminsterMelanie2013-08-131-1/+1
|\ \ \ | | |/ | |/|
| * | Remove exception when printing error for failure removing script state.Robert Adams2013-08-131-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-08-072-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Fix problem with modInvoke defined integer constants being build intoRobert Adams2013-08-022-3/+3
| | | | | | | | | | | | | | | | | | scripts as boxed integers rather than proper reference to a new LSLInteger. This fixes an exception when using a registered integer constant in a script.
* | | Merge branch 'master' into careminsterMelanie2013-07-291-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Fix NPC regression test failures.Justin Clark-Casey (justincc)2013-07-261-0/+1
| | | | | | | | | | | | | | | These were genuine failures caused by ScenePresence.CompleteMovement() waiting for an UpdateAgent from NPC introduction that would never come. Instead, we do not wait if the agent is an NPC.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-07-182-6/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-07-131-2/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
| * | | Merge branch 'master' into careminsterMelanie2013-07-133-12/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
* | \ \ \ Merge branch 'master' into careminsterMelanie2013-07-184-8/+34
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * | | In co-op termination, extend EventWaitHandle to give this an indefinite ↵Justin Clark-Casey (justincc)2013-07-131-2/+21
| |/ / | | | | | | | | | | | | | | | | | | lifetime in order to avoid a later RemotingException if scripts are being loaded into their own domains. This is necessary because XEngineScriptBase now retains a reference to an EventWaitHandle when co-op termination is active. Aims to address http://opensimulator.org/mantis/view.php?id=6634
| * | If a sensor is in an attachment, avoid throwing an exception if the attachee ↵Justin Clark-Casey (justincc)2013-07-091-0/+10
| | | | | | | | | | | | is removed from the scene before we try to retrieve them.
| * | Add implementations for llSetVelocity and llSetAngularVelocity.Robert Adams2013-07-063-0/+38
| | |
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-231-3/+5
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * | Forward the reason to the scriptMelanie2013-06-131-1/+1
| | |
| * | Add a result param to te money module interfaceMelanie2013-06-131-2/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-184-15/+93
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * | correct method doc for llRot2Axis()dahlia2013-06-141-1/+1
| | |
| * | minor: remove mono compiler warnings from LSL_Api, properly format method ↵Justin Clark-Casey (justincc)2013-06-151-7/+5
| | | | | | | | | | | | doc for llRot2Axis()
| * | Mantis 6280: llSetContentType(). An implementation.Talun2013-06-154-0/+84
| | | | | | | | | | | | | | | An implimentation of llSetContentType including all of the new constants added since the mantis was raised.
| * | Mantis 6108: ossetprimitiveparams temporary/phantom problemTalun2013-06-151-2/+2
| | | | | | | | | | | | | | | | | | Corrected to ensure that the target prim is updated by osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM instead of the prim that the script is in.
* | | Merge branch 'master' into careminsterMelanie2013-06-112-13/+8
|\ \ \ | |/ /
| * | Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. ↵dahlia2013-06-111-0/+3
| | | | | | | | | | | | Addresses Mantis #0006671
| * | LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization ↵dahlia2013-06-101-2/+2
| | | | | | | | | | | | fails
| * | llRot2Angle now checks absolute value of s rotation component before normalizingdahlia2013-06-101-11/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-111-22/+6
|\ \ \ | |/ /
| * | llRot2Axis now checks absolute value of s rotation component before ↵dahlia2013-06-101-22/+6
| | | | | | | | | | | | normalizing. Also removed some excessive division and cleaned up a bit
* | | Merge branch 'master' into careminsterMelanie2013-06-112-2/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669teravus2013-06-101-2/+4
| | |
| * | add a Normalize() method for LSL_Rotationdahlia2013-06-101-0/+25
| | |
| * | Mantis 5346: llAxisAngle2Rot() should normalize before computingTalun2013-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Corrected to agree with http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes to normalise the vector before computing the quaternion Signed-off-by: dahlia <dahlia@nomail>
generated by cgit v1.1 at 2024-12-28 07:18:50 +0000