aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | Fix a minor race condition in llInstantMessage() where slightly wrong origin ↵Justin Clark-Casey (justincc)2013-03-141-3/+5
| | | | | | | | | | | | | | | | co-ordinates could be given for a fast moving prim
| * | | Fix minor race condition in llGetOmega() where inconsistent results could be ↵Justin Clark-Casey (justincc)2013-03-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | returned (accidentally stated that commit 1774c631 was this fix). Commit 1774c631 was actually a fix for a similar minor race condition in llGetAccel()
| * | | Fix minor race condition in llGetOmega() where a call whilst a prim was ↵Justin Clark-Casey (justincc)2013-03-141-1/+2
| | | | | | | | | | | | | | | | changing angular velocity could return inconsistent results
| * | | refactor: Use LSL_Vector(Vector3) constructor in llGetVel()Justin Clark-Casey (justincc)2013-03-141-1/+1
| | | |
| * | | refactor: Use LSL_Vector(Vector3) constructor in llGetTorque()Justin Clark-Casey (justincc)2013-03-141-2/+2
| | | |
| * | | Fix minor race condition in llGetLocalRot() where inconsistent results could ↵Justin Clark-Casey (justincc)2013-03-141-1/+2
| | | | | | | | | | | | | | | | be returned if the prim was rotating during the call
| * | | refactor: use cleaner LSL_Rotation quaternion constructor in ↵Justin Clark-Casey (justincc)2013-03-141-3/+4
| | | | | | | | | | | | | | | | LSL_Api.GetPartRot()
| * | | Fix sensors, llGetRootRotation(), llGet*Param() and other functions to use ↵Justin Clark-Casey (justincc)2013-03-143-10/+7
| | | | | | | | | | | | | | | | the world rotation if the avatar to which they are attached is sitting
| * | | Make llGetObjectDetails() return the correct world rotation for a sitting avatarJustin Clark-Casey (justincc)2013-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=6567 This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation() SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting.
* | | | Merge branch 'master' into careminsterMelanie2013-03-132-4/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * | | Make C# scripts return correct error line and column numbers instead of ↵Justin Clark-Casey (justincc)2013-03-131-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | failing because they have no linemap. Adapted fix from http://opensimulator.org/mantis/view.php?id=6571 Thanks Nickel Briand
| * | | minor: Remove mono compiler warnings from LSL_ApiHttpTestsJustin Clark-Casey (justincc)2013-03-111-1/+0
| | | |
generated by cgit v1.1 at 2024-12-26 02:14:22 +0000