aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-162-2/+17
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Fix some logic mistakes where firstly osNpcCreate() without options was ↵Justin Clark-Casey (justincc)2012-02-162-3/+18
| | | | | | | | | | | | creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect. Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872
* | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-141-3/+9
| | | | | | | | crossings
* | Merge branch 'master' into careminsterMelanie2012-02-101-9/+20
|\ \ | |/
| * Fix an npc delete race condition with LSL sensors where an initial presence ↵Justin Clark-Casey (justincc)2012-02-101-9/+20
| | | | | | | | | | | | | | check could succeed but then the npc removed before the subequent npc check. The resulting null would cause an exception. We now check for null before looking at SenseAsAgent. Hopefully fixes http://opensimulator.org/mantis/view.php?id=5872
* | Merge branch 'master' into careminsterMelanie2012-02-091-1/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * minor: put in commented out logging statements for future reuseJustin Clark-Casey (justincc)2012-02-091-1/+7
| |
* | Push more NPC stuff into threadsMelanie2012-02-081-8/+18
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-073-4/+16
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-073-4/+16
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| | * Add a regression test to compile and start a script. Remove ↵Justin Clark-Casey (justincc)2012-02-073-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
* | | Experimental. Expand Fire & Forget for NPC deleteMelanie2012-02-061-7/+7
|/ /
* | Merge branch 'master' into careminsterMelanie2012-02-041-15/+17
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would ↵Justin Clark-Casey (justincc)2012-02-041-0/+2
| | | | | | | | eventually be used by llCastRay(), though OpenSim does not use these yet.
| * Correct RC_* LSL constants used by llCastRay().Justin Clark-Casey (justincc)2012-02-041-12/+12
| | | | | | | | Many thanks to WhiteStar for doing the research on this.
* | Merge branch 'master' into careminsterMelanie2012-02-032-1/+7
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-032-1/+7
| |\
| | * D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not ↵Justin Clark-Casey (justincc)2012-02-021-1/+1
| | | | | | | | | | | | llGetLinkNumber().
| | * Add llGetLinkNumberOfSides to LSL_Stub and ILSL_ApiJustin Clark-Casey (justincc)2012-02-022-1/+7
| | | | | | | | | | | | | | | It already existed in LSL_Api but it also needs to exist in these two other places for a script to be able to see it. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5489
| * | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-021-31/+68
| |/ | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-021-31/+70
| |
* | Fix remembering attachment point and position when an item is rezzed in world.Melanie2012-02-021-49/+50
| | | | | | | | | | Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script in the root.
* | Merge branch 'master' into careminsterMelanie2012-01-311-3/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * Fix:llSetText - limited text to a maximum of 254 charsPixelTomsen2012-01-311-3/+3
| | | | | | | | | | | | mantis: http://opensimulator.org/mantis/view.php?id=5867 Signed-off-by: nebadon <michael@osgrid.org>
* | Merge branch 'master' into careminsterMelanie2012-01-291-1/+1
|\ \ | |/
| * Fix llEdgeOfWorld functionality - see mantis ↵Garmin Kawaguichi2012-01-291-1/+1
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5865 Signed-off-by: nebadon <michael@osgrid.org>
* | Make all NPCs owned by defaultMelanie2012-01-281-1/+1
| |
* | Fix build breakMelanie2012-01-281-1/+2
| |
* | Completely disable NPC being sensed as agents, the abuse potential is too greatMelanie2012-01-281-4/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-01-283-6/+18
|\ \ | |/
| * Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().Justin Clark-Casey (justincc)2012-01-283-6/+18
| | | | | | | | | | This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension). Wiki doc on this and other recent NPC functions will follow soon
* | Merge branch 'master' into careminsterMelanie2012-01-273-21/+125
|\ \ | |/
| * Increment LPS script stat for OSSL functions that were not already doing thisJustin Clark-Casey (justincc)2012-01-271-2/+41
| |
| * Implement osIsNpc(key npc):integer. This return TRUE if the given key ↵Justin Clark-Casey (justincc)2012-01-273-0/+29
| | | | | | | | belongs to an NPC in the region. FALSE if not or if the NPC module isn't present.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-274-0/+83
| |\
| * | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ↵Justin Clark-Casey (justincc)2012-01-273-19/+55
| | | | | | | | | | | | | | | | | | | | | NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input key was not an npc. llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return. Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash.
* | | Merge branch 'master' into careminsterMelanie2012-01-264-0/+83
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Framework/EstateSettings.cs
| * | llManageEstateAccess implementation ↵PixelTomsen2012-01-264-0/+83
| |/ | | | | | | | | | | http://wiki.secondlife.com/wiki/LlManageEstateAccess Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-01-261-8/+17
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Re-enable error logging associated with assembly and script loading failure ↵Justin Clark-Casey (justincc)2012-01-261-9/+19
| | | | | | | | | | | | in ScriptInstance. Swallowing exceptions just leads to more mysterious failures later on.
* | Merge branch 'master' into careminsterMelanie2012-01-263-1/+19
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), ↵Justin Clark-Casey (justincc)2012-01-251-1/+2
| | | | | | | | RezNewScript() and rename one RezScript() to RezScriptFromPrim()
| * llGetParcelMusicURL implementation ↵Pixel Tomsen2012-01-253-0/+18
| | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Typo fixMelanie2012-01-251-1/+1
| |
* | Spin off starting scripts in rezzed objects into a thread to avoid a recursionMelanie2012-01-251-1/+4
| | | | | | | | into the script engine if the script was suspended inside an event.
* | Fix llLookAt the right wayMelanie2012-01-231-19/+24
| |
* | Merge branch 'master' into careminsterMelanie2012-01-213-3/+130
|\ \ | |/
| * Add osGetGridHomeURI functionBlueWall2012-01-193-0/+28
| | | | | | | | Add osGetHomeURI function to the family of osGetGrid* functions. Returns the SRV_HomeURI setting from the [LoginService] configuration.
| * Add function osGetGridCustomBlueWall2012-01-173-1/+34
| | | | | | | | Add function osGetGridCustom to take an argument for the GridInfo kpv to retrieve from the GridInfoService
| * Update osGetGrid**** functionsBlueWall2012-01-171-3/+69
| | | | | | | | The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.