aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-232-3/+29
|\ | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-2/+2
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
| * add support for particle glow LSL functionsdahlia2013-11-051-0/+12
| |
| * add support for particle blending LSL functionsdahlia2013-11-051-1/+15
| |
* | Merge branch 'master' into careminsterMelanie2013-11-082-1/+18
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * 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' into careminsterMelanie2013-10-061-1/+1
|\ \ | |/ | | | | | | | | 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-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-10-042-5/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-2/+2
| | | | | | | | | | | | (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-161-2/+11
| | | | | | | | | | | | | | | | | | 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 'master' into careminsterMelanie2013-08-071-2/+2
|\ \ | |/ | | | | | | | | | | 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-021-2/+2
| | | | | | | | | | | | 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' 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-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-183-6/+13
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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-111-11/+6
|\ \ \ | |/ /
| * | Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. ↵dahlia2013-06-111-0/+3
| | | | | | | | | | | | Addresses Mantis #0006671
| * | 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-111-2/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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
| | |
| * | 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>
| * | Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-064-0/+159
| | | | | | | | | | | | may yield unexpected results in some cases. No database persistence yet,
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-065-19/+77
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Fix llTeleportAgentGlobalCoordsMelanie2013-06-021-11/+16
| | |
| * | Implement PERMISSION_TELEPORT and the needed checks to make it work.Melanie2013-06-022-7/+19
| | | | | | | | | | | | Old auth system still works as well.
| * | Allow Linden trees to preserve their type when taken into inventory and ↵Melanie2013-05-261-1/+3
| | | | | | | | | | | | rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
| * | Implement llSetContentType using the new OpenID auth support for authenticationMelanie2013-05-054-0/+21
| | |
| * | Add llGetPhysicsMaterialMelanie2013-05-043-0/+18
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-041-139/+187
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * | Remove unnecessary m_scenes and m_scene from AsyncCommandManager.Justin Clark-Casey (justincc)2013-05-311-6/+1
| | | | | | | | | | | | These were private and the sole point of use (to know when to load config for the first time) can be done by looking at script engines instead.
| * | Lock areas of AsyncCommandManager where multiple threads could try to ↵Justin Clark-Casey (justincc)2013-05-311-111/+177
| | | | | | | | | | | | | | | | | | | | | | | | access/update the same static structures simultaneously. This is possible where there is more than one scene (multiple copies of the same script engine) and/or more than one script engine being used. These operations are not thread safe and could be leading to the exceptions/problems seen in http://opensimulator.org/mantis/view.php?id=6651 This also prevents a small race condition where more than one AsyncLSLCmdHandlerThread could be started.
generated by cgit v1.1 at 2024-12-26 01:09:53 +0000