aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-263-1/+16
|\ | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| * Add a hust UUID to the script invocationsMelanie2012-03-263-1/+16
| |
* | Merge branch 'master' into careminsterMelanie2012-03-253-74/+229
|\ \ | |/
| * Add support for key, vector, rotation and list types for bothMic Bowman2012-03-243-74/+229
| | | | | | | | | | | | arguments and return values to the modInvoke family of functions. See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
* | Merge branch 'master' into careminsterMelanie2012-03-232-6/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * fix yield prolog so it compiles with mono 2.11 there has been a bugzillanebadon2012-03-232-6/+6
| | | | | | | | | | | | report files with mono project in regards to this change, this simply lets us move forward with using mono 2.11 for now : https://bugzilla.xamarin.com/show_bug.cgi?id=4052
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-221-0/+168
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Fix llGiveInventory() so that it checks the destination part for ↵Justin Clark-Casey (justincc)2012-03-221-1/+58
| | | | | | | | | | | | | | AllowInventoryDrop, not the source. This allows llAllowInventoryDrop() to work. Regression test added for this case.
| * Add llGiveInventory() test from object to object where both objects are ↵Justin Clark-Casey (justincc)2012-03-221-0/+111
| | | | | | | | owned by the same user.
* | Fix merge issue from coreMelanie2012-03-221-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-221-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code ↵Justin Clark-Casey (justincc)2012-03-221-3/+3
| | | | | | | | clarity since non-default animations are handled completely separately from this class
| * Instead of loading default avatar animations in both SLUtil and ↵Justin Clark-Casey (justincc)2012-03-211-3/+3
| | | | | | | | | | | | | | | | AvatarAnimations, load just in AvatarAnimations instead. This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST. This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND") but scripts refer to them with lowercase names (e.g. "sit").
* | Merge branch 'master' into careminsterMelanie2012-03-189-4/+222
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927Justin Clark-Casey (justincc)2012-03-173-0/+30
| | | | | | | | | | This allows one to get description data for a given prim inventory item. Thanks MarcelEdward and GuduleLapointe!
| * Aggregate script execution times by linksets rather than individual prims.Justin Clark-Casey (justincc)2012-03-161-0/+6
| | | | | | | | This is for the top scripts report.
| * Replace script-lines-per-second with the script execution time scaled by its ↵Justin Clark-Casey (justincc)2012-03-161-1/+20
| | | | | | | | | | | | | | | | | | | | | | measurement period and an idealised frame time. The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute. Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100. The actual measurement value should be script execution time per frame but XEngine does not work this way. Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time. This is still not ideal but gives reasonable results and allows scripts to be compared. This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.
| * Protect the scriptmodulecomms interface.Mic Bowman2012-03-151-1/+4
| |
| * Adds a new script command 'modInvoke' to invoke registered functionsMic Bowman2012-03-155-3/+163
| | | | | | | | | | | | | | | | | | from region modules. The LSL translator is extended to generate the modInvoke format of commands for directly inlined function calls. A region module can register a function Test() with the name "Test". LSL code can call that function as "Test()". The compiler will translate that invocation into modInvoke("Test", ...)
* | Merge branch 'master' into careminsterMelanie2012-03-151-213/+135
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Remove property/field duplication in ScriptInstance where it's unnecessary.Justin Clark-Casey (justincc)2012-03-151-170/+107
| |
| * Simplify some logic in the ScriptInstance constructor - running is set to ↵Justin Clark-Casey (justincc)2012-03-151-9/+3
| | | | | | | | false in both if/else branches
| * minor: correct indentation levelsJustin Clark-Casey (justincc)2012-03-151-13/+12
| |
| * Remove duplication of m_RunEvents and RunningJustin Clark-Casey (justincc)2012-03-151-17/+11
| |
| * Alleviate an issue where calling Thread.Abort() on script WorkItems can fail ↵Justin Clark-Casey (justincc)2012-03-151-3/+10
| | | | | | | | | | | | | | | | | | | | to release locks, resulting in a crippled simulator. This seems to be a particular problem with ReaderWriterLockSlim, though other locks can be affected as well. It has been seen to happen when llDie() is called in a linkset running more than one script. Alleviation here means supplying a ScriptInstance.Stop() timeout of 1000ms rather than 0ms, to give events a chance to complete. Also, we check the IsRunning status at the top of the ScriptInstance.EventProcessor() so that another event doesn't start in the mean time. Ultimately, a better solution may have to be found since a long-running event would still exceed the timeout and be aborted.
* | Allow llTeleportAgent to teleport gods when not in god modeMelanie2012-03-141-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-144-22/+75
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ↵Justin Clark-Casey (justincc)2012-03-141-22/+44
| | | | | | | | | | | | it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event) Also add other various illustrative comments
| * Add max thread and min thread information to "xengine status" region console ↵Justin Clark-Casey (justincc)2012-03-121-0/+3
| | | | | | | | command
| * Added osGetGridGatekeeperURI()Diva Canto2012-03-103-0/+20
| |
* | Implement llSetPrimitiveParams for physics shape and material. AddMelanie2012-03-134-0/+77
| | | | | | | | llSetPhysicsMaterial support.
* | Add AVATAR_MALE flag to return values of llGetAgentInfoMelanie2012-03-122-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-03-091-16/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Use SP.ParentPart instead of ParentID in places where it's more efficient ↵Justin Clark-Casey (justincc)2012-03-091-17/+7
| | | | | | | | | | | | | | (saving extra null checks, etc.) However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null. Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
| * FireAndForget scripted rez - port from AvinationMelanie2012-03-091-41/+46
| |
* | Merge branch 'master' into careminsterMelanie2012-03-0713-46/+338
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)2012-03-065-12/+96
| | | | | | | | | | | | status" command. This is for diagnostic purposes.
| * Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()Justin Clark-Casey (justincc)2012-03-061-8/+14
| | | | | | | | | | | | | | They were all failing assertions but the exceptions these threw were caught as expected Exceptions. I don't think we can easily distinguish these from the Exceptions that we're expecting. So for now we'll do some messy manually checking with boolean setting instead. This patch also corrects the assertions themselves.
| * Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that ↵Justin Clark-Casey (justincc)2012-03-068-26/+228
| | | | | | | | they're running
* | Merge branch 'master' into careminsterMelanie2012-03-061-1/+1
|\ \ | |/
| * Fix off by one error in script error reporting.Justin Clark-Casey (justincc)2012-03-061-1/+1
| |
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-063-7/+32
|\ \ | | | | | | | | | careminster
| * | Allow NPC to be removed by the owner of the parcel they're over.Melanie2012-03-051-2/+9
| | | | | | | | | | | | Don't allow NPC creation unless the prim owner has rez rights.
| * | Teleport users to the cornfield when they are teleported withMelanie2012-03-051-3/+13
| | | | | | | | | | | | llTeleportAgentHome(). Don't try to teleport NPCs.
| * | llListSort SL compatibility: When sorting strided list and the listMelanie2012-03-051-2/+5
| | | | | | | | | | | | | | | | | | length is not a multiple of the stride, return the original list. Also, enforce that sort is ascending only when the ascending parameter is 1, and not when it is != 0
| * | SL compatibility - return only points on segemtn, not ray in llCastRayMelanie2012-03-051-0/+5
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-044-3/+188
|\ \ \ | |/ / | | | | | | careminster
| * | Fix and hook up llTeleportAgentMelanie2012-02-283-1/+7
| | |
| * | Implement llTeleportAgentMelanie2012-02-281-0/+22
| | |
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-11/+11
| | | | | | | | | | | | other way because SOG doesn't technically exist in the DB
generated by cgit v1.1 at 2024-12-19 06:37:04 +0000