aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Spin off NPC deletion into a thread to avoid it being done on a scriptMelanie2012-01-171-1/+3
| | | | | | | | microthread. A stab at fixing exceptions.
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-151-14/+24
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-01-151-14/+24
| |\ \ | | |/
| | * commented out redundant land owner checks for osTeleportAgent there isnebadon2012-01-141-14/+24
| | | | | | | | | | | | | | | | | | no need for these checks just use Allow_osTeleportAgent = PARCEL_OWNER also increased function to severe threat level to make it harder to accidently enable it for everyone.
* | | Disable using an agent ID to clone NPCs. The griefing potential is too greatMelanie2012-01-151-7/+7
|/ /
* | Fix mergeMelanie2012-01-141-56/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-143-52/+80
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Extend scripts show command to accept a single item UUID parameter to ↵Justin Clark-Casey (justincc)2012-01-141-40/+47
| | | | | | | | | | | | display one script's status Usage is now scripts show [<script-item-uuid>]
| * Register the UrlModule for script engine events OnScriptRemoved and ↵Justin Clark-Casey (justincc)2012-01-142-12/+0
| | | | | | | | | | | | | | | | | | OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. Doing this in every script is unnecessary since the event trigger is parameterized by the item id. All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException. Registration moved to UrlModule so that the handler is registered for all script engine implementations. This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
| * Cleaned up the LookAt code in SOP and SOG. Added support for incrementallyMic Bowman2012-01-131-4/+4
| | | | | | | | | | rotating physical objects. This does not use physics. Currently the rate of change is determined as 1 / (PI * Strength).
| * Fix llRotLookAt and llLookAt for non-physical objects. Per conversationMic Bowman2012-01-131-7/+23
| | | | | | | | | | with Melanie and Nebadon, SL behavior seems to be that non physical objects snap to the request rotation.
* | Merge branch 'master' into careminsterMelanie2012-01-134-13/+3
|\ \ | |/
| * Change the default osNpcCreate() to create an 'owned' npc rather than an ↵Justin Clark-Casey (justincc)2012-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | 'unowned' one. An owned NPC is one that only the original creator can manipulate and delete. An unowned NPC is one that anybody with access to the osNpc* methods and knowledge of the avatar id can manipulate. This is to correct an oversight I made in the original reimplementation where I mistakenly assumed that avatar IDs could be treated as private. I am not anticipating that many people were deliberately making use of unowned npcs due to their insecure nature. If you do need an unowned NPC please call the new overloaded osCreateNpc() function with the option OS_NPC_NOT_OWNED.
| * Removing osNpcCreateOwned(). Please use osNpcCreate(string user, string ↵Justin Clark-Casey (justincc)2012-01-133-12/+0
| | | | | | | | | | | | name, vector position, string notecard, int options) instead with option OS_NPC_CREATOR_OWNED Please note that correct option name is OS_NPC_CREATOR_OWNED not OS_NPC_CREATE_OWNED as mistakenly put in a previous commit.
| * Add missing assert to confirm owner delete succeeded to the end of ↵Justin Clark-Casey (justincc)2012-01-121-0/+2
| | | | | | | | TestOsNpcRemoveOwned()
* | Fix typoMelanie2012-01-121-1/+1
| |
* | Disable unowned NPCsMelanie2012-01-121-0/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-01-126-31/+243
|\ \ | |/
| * Add api level test for removing an owned npcJustin Clark-Casey (justincc)2012-01-121-2/+55
| |
| * Add ossl level test for removing an unowned npcJustin Clark-Casey (justincc)2012-01-121-0/+115
| |
| * Add osNpcCreate(string firstname, string lastname, LSL_Vector position, ↵Justin Clark-Casey (justincc)2012-01-124-0/+15
| | | | | | | | | | | | | | | | | | | | | | string notecard, int options) variant. This will be documented soon. Options can currently be OS_NPC_CREATE_OWNED - creates a 'creator owned' avatar that will only respond to osNpc* functions made by scripts owned by the npc creator OS_NPC_NOT_OWNED - creates an avatar which will respond to any osNpc* functions that a caller has permission to make (through the usual OSSL permission mechanisms). options is being added to provide better scope for future extensibility without having to add more functions The original non-options osNpcCreate() function will continue to exist.
| * Allow all NPCs to show up on sensors as all osNpc* script methods now check ↵Justin Clark-Casey (justincc)2012-01-121-6/+9
| | | | | | | | | | | | for ownership permission before executing. As per #opensim-dev irc discussion.
| * Add permissions checks for owned avatars to all other osNpc* functions.Justin Clark-Casey (justincc)2012-01-121-20/+50
| | | | | | | | This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like.
| * refactor: Move existing npc owner checks to NPCModule.CheckPermissions() ↵Justin Clark-Casey (justincc)2012-01-121-5/+1
| | | | | | | | methods and expose on interface for external calls.
* | Merge branch 'master' into careminsterMelanie2012-01-071-1/+1
|\ \ | |/
| * Fix threat level setting on osNpcPlayAnimationMelanie2012-01-071-1/+1
| |
| * fix a typo "osNpcCreated" to "osNpcCreate" in OSSL threat level checknebadon2012-01-061-1/+1
| |
| * Fix some syntax issuesMelanie2012-01-062-4/+4
| |