aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | 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.
| * | refactor: Remove unused AsyncCommandManager.PleaseShutdownJustin Clark-Casey (justincc)2013-05-311-19/+1
| | |
| * | If an exception occurs in the AsyncCommandManager loop, spit it out to log ↵Justin Clark-Casey (justincc)2013-05-301-8/+6
| | | | | | | | | | | | | | | | | | rather than silently swallowing it. This might help diagnose the cause of http://opensimulator.org/mantis/view.php?id=6651 where sometimes scripts fail to start on region start.
* | | Merge branch 'master' into careminsterMelanie2013-05-241-3/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Implement llSetSoundQueueing().Justin Clark-Casey (justincc)2013-05-221-4/+8
| | | | | | | | | | | | | | | | | | This is controlled by the viewer, not the server. So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim. You probably need to use llPreloadSound() for best results
* | | Merge branch 'master' into careminsterMelanie2013-05-161-30/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Fix issue where osMakeNotecard() would fail if given a list containing ↵Justin Clark-Casey (justincc)2013-05-151-30/+30
| | | | | | | | | | | | | | | | | | vectors or quaternions. http://opensimulator.org/mantis/view.php?id=6640
* | | Merge branch 'master' into careminsterMelanie2013-05-011-3/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * | Add in-code exaplanation for the change in cancellation signalling in STP ↵Justin Clark-Casey (justincc)2013-05-011-2/+0
| | | | | | | | | | | | 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306
| * | Update SmartThreadPool to latest version 2.2.3 with a major and minor change.Justin Clark-Casey (justincc)2013-05-011-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those. However, two changes have been made to stock 2.2.3. Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified. This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled. Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
* | | Merge branch 'master' into careminsterMelanie2013-04-101-1/+6
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * minor: Log an exception if we aren't able to delete a script state file ↵Justin Clark-Casey (justincc)2013-04-091-1/+6
| | | | | | | | | | | | rather than simply ignoring it. This should never normally happen but if it does then it can be valuable diagonstic information.
| * Fix bug where outstanding llHTTPRequests for scripts were not being aborted ↵Justin Clark-Casey (justincc)2013-04-041-1/+7
| | | | | | | | | | | | | | | | | | when they were deleted. This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID. This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself. This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
* | Merge branch 'master' into careminsterMelanie2013-03-292-50/+121
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added missing functionality (mainly custom headers) to llHTTPRequest.Kevin Cozens2013-03-292-56/+128
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-262-2/+4
| |\
generated by cgit v1.1 at 2024-12-23 09:34:06 +0000