aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-011-5/+6
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Look up the NPC module when the SensorRepeat class is created, rather than ↵Justin Clark-Casey (justincc)2012-08-011-5/+6
| | | | | | | | on every single sensor sweep.
* | Merge branch 'master' into careminsterMelanie2012-08-011-35/+43
|\ \ | |/
| * Resolve a deadlock between INPCModule and SensorRepeat by replacing the ↵Justin Clark-Casey (justincc)2012-07-311-35/+43
| | | | | | | | | | | | | | | | SensorRepeat list with a new list on add/removes rather than locking it for the duration of the sensor sweep. A deadlock was observed today where NPC removal on a script thread would lock the NPC list and then try to lock the sensor list via scripted attachment removal. Concurrently, the sensor sweep thread would lock the sensor list and then try to lock the NPC list to check NPC status. This commit resolves the deadlock by replacing the sensor list on update rather than locking it for the duration of the sweep.
* | Remove support for the OS_NPC constant. That one seems to be overly paranoidMelanie2012-07-251-3/+2
| | | | | | | | to have and confuses the issue.
* | Merge branch 'master' into careminsterMelanie2012-07-231-2/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * As per opensim-dev mailing list conversation, introduce OS_NPC constant for ↵Justin Clark-Casey (justincc)2012-07-201-2/+3
| | | | | | | | | | | | | | | | | | use with llSensor() This same constant will later be used with llGetDetectedType(). This constant has a different name from NPC to avoid possible conflict with future LSL changes. This constant has a different value to try and avoid unnecessary conflict with future constants that may use the same value. Using the 'NPC' constant with llSensor() will remain valid but is deprecated.
* | Merge branch 'master' into careminsterMelanie2012-07-121-2/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-111-2/+6
| | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
* | Merge branch 'master' into careminsterMelanie2012-04-271-5/+20
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * minor: style adjustments in SensorRepeat, mainly related to patch from stoehrJustin Clark-Casey (justincc)2012-04-271-3/+4
| |
| * Fixing wrong position of llSensor, SensePoint wasnt following the rotation ↵Stefan_Boom2012-04-271-8/+22
| | | | | | | | of the root prim.
* | Merge branch 'master' into careminsterMelanie2012-03-074-11/+44
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)2012-03-064-11/+44
| | | | | | | | | | | | status" command. This is for diagnostic purposes.
* | Merge branch 'master' into careminsterMelanie2012-03-031-5/+7
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Move SenseRepeaters.Count check inside the SenseRepeatListLock.Justin Clark-Casey (justincc)2012-03-021-4/+4
| | | | | | | | No methods in the List class are thread safe in the MS specification/documentation
| * lock SenseRepeatListLock when added a new sensor during script reconstitution.Justin Clark-Casey (justincc)2012-03-021-1/+3
| | | | | | | | | | This is already being done in the other place where a sensor is added. Adding a sensor whilst another thread is iterating over the sensor list can cause a concurrency exception.
* | Merge branch 'master' into careminsterMelanie2012-02-161-1/+16
|\ \ | |/ | | | | | | 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-161-1/+16
| | | | | | | | | | | | 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
* | 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-01-281-2/+7
|\ \ | |/
| * Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().Justin Clark-Casey (justincc)2012-01-281-2/+7
| | | | | | | | | | 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-121-6/+9
|\ \ | |/
| * 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 osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵Melanie2012-01-061-1/+19
| | | | | | | | owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
* | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵Melanie2012-01-061-2/+17
| | | | | | | | owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
* | Fix hit testing link sets properly. Fix raycasting for LSL.Melanie2011-12-171-0/+5
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * When removing an LSL sensor for a script (e.g. through llResetScript() or ↵Justin Clark-Casey (justincc)2011-11-261-1/+1
| | | | | | | | | | | | state change), don't also remove sensors for other scripts in the same prim. Hopefully fixes http://opensimulator.org/mantis/view.php?id=4448 and http://opensimulator.org/mantis/view.php?id=4452
* | Merge branch 'master' into bigmergeMelanie2011-11-041-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-031-2/+2
| | | | | | | | | | | | from previous commit which sort out which iterator is used are left intact. A discussion is needed as to what constitutes an avatar vs a ScenePresence.
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the 3 iteration functions so more of them are using the correct iteration for the action they are performing. The 3 iterators that seem to fit all actions within OpenSim at this time are: ForEachAvatar: Perform an action on all avatars (root presences) ForEachClient: Perform an action on all clients (root or child clients) ForEachRootClient: Perform an action on all clients that have an avatar There are still a dozen places or so calling the old ForEachScenePresence that will take a little more refactoring to eliminate.
* | Resolve merge commits, stage 1Tom2011-09-041-7/+6
|\ \ | |/
| * refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid ↵Justin Clark-Casey (justincc)2011-08-271-4/+4
| | | | | | | | pointless duplication of identical values
| * refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatarJustin Clark-Casey (justincc)2011-08-261-2/+2
| | | | | | | | This does a tiny bit to reduce code complexity, memory requirement and the cpu time of pointlessly setting this field to the same value in every SOP
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-1/+2
|\ \ | |/
| * If an llSensor() is in an attachment, make the detection cone face in the ↵Justin Clark-Casey (justincc)2011-06-031-1/+10
| | | | | | | | | | | | | | direction of the avatar, not the relative rotation of the attachment towards the avatar. This is effectively a copy/paste from 459323a, which should be refactored sometime. This seems the obvious problem from field reports but I have not tested the fix myself. Feedback welcome.
| * Add support for the new display name related functions in LSL. This does notMelanie2011-04-081-4/+22
| | | | | | | | | | | | implement the display names functionality as such, but it allows scripts that are display name aware to function as if the display name were implemented and set to the avatar name.
* | Add support for the new display name related functions in LSL. This does notMelanie2011-04-081-4/+22
| | | | | | | | | | | | implement the display names functionality as such, but it allows scripts that are display name aware to function as if the display name were implemented and set to the avatar name.
* | Correct Sensor axis for unattached daughter prims.Kitto Flora2010-12-121-1/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-3/+3
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * Formatting cleanup.Jeff Ames2010-09-121-2/+2
| |
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-101-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-101-1/+0
|\ \ | |/
| * Return agents when angle is PIMelanie2010-05-101-0/+4
| | | | | | | | Fixes Mantis #4703
* | Fix full circle sensorsMelanie Thielker2010-05-041-0/+5
| |
* | Fix sensor cone for sensing avatarsMelanie Thielker2010-05-031-1/+12
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-211-0/+9
|\ \ | |/
| * Make the detection cone in attachments face in the direction of the avatar,Melanie2010-04-211-0/+9
| | | | | | | | not the relative rotation of the attachment towards the avatar.
generated by cgit v1.1 at 2024-11-20 00:47:18 +0000