aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-014-9/+10
|\ \ | |/ | | | | | | 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-014-9/+12
| | | | | | | | | | | | | | | | | | | | 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-04-021-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Use Output instead of OutputFormat in appropriate places of XEngine status ↵Justin Clark-Casey (justincc)2013-04-021-2/+2
| | | | | | | | reporting.
* | 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
| |\
| | * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-262-2/+4
| | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
| * | Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars ↵Justin Clark-Casey (justincc)2013-03-261-30/+194
| |/ | | | | | | | | | | | | in a linkset. llGetPrimitiveParams() works through PRIM_LINK_TARGET Setting via llSetLinkPrimitiveParams(), etc. not yet implemented
| * Merge branch 'master' into newmultiattachMelanie2013-03-186-203/+201
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| | * Make the LSL memory functions virtual so script engines can override them if ↵Melanie2013-03-151-3/+3
| | | | | | | | | | | | they have different memory management.
| * | Multiattach, part 1Melanie2013-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-242-2/+4
| | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | | Merge branch 'avination' into careminsterMelanie2013-03-191-1/+1
|\ \ \
| * | | Fix case where the string member of a LSL_String in a list is nullroot2013-03-161-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-03-152-132/+132
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | refactor: make llGetLinkName() and llGetLinkKey() use a common ↵Justin Clark-Casey (justincc)2013-03-151-84/+80
| | | | | | | | | | | | | | | | GetLinkEntity() method
| * | | minor: remove mono compiler warnings in LSL_Api.csJustin Clark-Casey (justincc)2013-03-141-3/+3
| | | |
| * | | refactor: minor cleanup in osGetAvatarList()Justin Clark-Casey (justincc)2013-03-141-2/+1
| | | |
| * | | Fix bug in osCauseHealing() if called with an avatar ID for an avatar that ↵Justin Clark-Casey (justincc)2013-03-141-13/+9
| | | | | | | | | | | | | | | | is not in the scene.
| * | | minor: Use more compact libomv primitive constructors in osNpcGetPos() and ↵Justin Clark-Casey (justincc)2013-03-141-6/+3
| | | | | | | | | | | | | | | | osNpcGetRot()
| * | | Fix minor race conditions in OSSL_Api functions where a parcel could be ↵Justin Clark-Casey (justincc)2013-03-141-6/+4
| | | | | | | | | | | | | | | | misidentified for moving prims.
| * | | refactor: Use LSL_Vector(Vector3) constructor in llCastRay()Justin Clark-Casey (justincc)2013-03-141-1/+1
| | | |
| * | | refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than ↵Justin Clark-Casey (justincc)2013-03-141-41/+21
| | | | | | | | | | | | | | | | having to continually take intermediate Vector3s to avoid race conditions
| * | | Fix minor race condition in llGetCameraRot() where inconsistent information ↵Justin Clark-Casey (justincc)2013-03-141-4/+4
| | | | | | | | | | | | | | | | could be returned for a rotating camera
| * | | Fix minor race condition in llGetCameraPos() where an inconsistent post ↵Justin Clark-Casey (justincc)2013-03-141-4/+5
| | | | | | | | | | | | | | | | could be returned for a moving camera
| * | | Fix minor race condition in llParcelMediaCommandList() where a parcel could ↵Justin Clark-Casey (justincc)2013-03-141-1/+3
| | | | | | | | | | | | | | | | be misidentified for a moving prim
| * | | Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, ↵Justin Clark-Casey (justincc)2013-03-141-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | PRIM_SIZE and PRIM_ROT_LOCAL This function is used by all the various ll*Params() and os*Params() functions
| * | | Fix minor race condition in llGetGeometricCenter() if this was changing ↵Justin Clark-Casey (justincc)2013-03-141-1/+1
| | | | | | | | | | | | | | | | whilst the function was called.
* | | | Merge branch 'master' into careminsterMelanie2013-03-143-45/+63
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | | refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation()Justin Clark-Casey (justincc)2013-03-141-1/+2
| | | |
| * | | Fix minor race condition in llGetRootPosition() where inconsistent results ↵Justin Clark-Casey (justincc)2013-03-141-2/+2
| | | | | | | | | | | | | | | | could be returned for moving prims
| * | | Fix minor race conditions in detecting current parcel for ↵Justin Clark-Casey (justincc)2013-03-141-3/+7
| | | | | | | | | | | | | | | | llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims
| * | | refactor: use LSL_Vector(Vector3) constructor in llGroundNormal()Justin Clark-Casey (justincc)2013-03-141-1/+1
| | | |
| * | | minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new ↵Justin Clark-Casey (justincc)2013-03-141-1/+6
| | | | | | | | | | | | | | | | one.
| * | | Fix minor race conditions in llTeleportAgent(), ↵Justin Clark-Casey (justincc)2013-03-141-14/+21
| | | | | | | | | | | | | | | | llTeleportAgentGlobalCoords(), llEjectFromLand() and llOverMyLand() where the wrong parcel could be identified for very fast moving avatars.
| * | | refactor: Use LSL_Vector(Vector3) constructor in llGetCenterOfMass()Justin Clark-Casey (justincc)2013-03-141-2/+2
| | | |
generated by cgit v1.1 at 2024-12-30 16:40:31 +0000