aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* change NPC restriction options default from restricted to all allowed, as ↵UbitUmarov2015-10-081-10/+4
| | | | master
* add several options for NPC creation so abusive use can be reduced ↵UbitUmarov2015-09-301-0/+26
| | | | (restrictive by default) UNTESTED
* seems to compile ( tests comented out)UbitUmarov2015-09-021-4/+0
|
* bad merge?UbitUmarov2015-09-011-29/+33
|\
| * dont fire a thread on npc creation keeping the main one just waitingUbitUmarov2014-08-021-5/+6
| |
| * Merge branch 'master' into careminsterMelanie2013-10-041-9/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ Merge branch 'master' into careminsterMelanie2013-08-131-1/+3
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-07-241-2/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-121-46/+78
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | | | | | Remove NPC debug spamMelanie2012-08-141-7/+7
| | | | | | |
| * | | | | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵Melanie2012-08-141-33/+29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | avination
| | * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-08-141-33/+29
| | |\ \ \ \ \ \
| * | | | | | | | Removed more spammy NPC crapMelanie2012-08-141-1/+1
| | | | | | | | |
| * | | | | | | | Comment spammy debugMelanie2012-08-141-3/+3
| |/ / / / / / /
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-07-111-0/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-071-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-04-271-1/+42
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-04-251-10/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | | | | | | | | | | Allow scripts in attachments owned by the NPC to control the NPCMelanie2012-04-181-1/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-061-11/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | | | | | | | | | | | Fix NPC appearance setting to include attachments againMelanie2012-02-271-1/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-02-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-151-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-101-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-091-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * | | | | | | | | | | | | | | | Push more NPC stuff into threadsMelanie2012-02-081-15/+22
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Avoid deadlock in NPCModule between DeleteNPC and GetNPC on m_avatarstglion2015-04-181-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | | | | | | | | | | | | | | | Allow scripts in attachments on an owned NPC to call NPC functions on that NPCJustin Clark-Casey (justincc)2014-12-041-1/+8
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | When osNpcMoveToTarget() is called for a sitting avatar then silently do ↵Justin Clark-Casey (justincc)2014-09-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nothing rather than throwing an error. Resolves http://opensimulator.org/mantis/view.php?id=7311
* | | | | | | | | | | | | | | | | Fix issue where only one of multiple attachments on the same attachpoint for ↵Justin Clark-Casey (justincc)2014-05-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NPCs would be seen by other viewers. It appears that at least Singularity 1.8.5 (but probably others) rely on attachment FromItemIDs being different to display more than one. This commit resolves this by generating random IDs instead of always using UUID.Zero for NPCs. Resolves http://opensimulator.org/mantis/view.php?id=7110
* | | | | | | | | | | | | | | | | Overload INPCModule.CreateNPC() to allow agentID to be specified. Note: this ↵dahlia2014-02-011-2/+24
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is intended for use in region modules and is not exposed to scripts.
* | | | | | | | | | | | | | | | refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ↵Justin Clark-Casey (justincc)2013-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the code that this is symmetric with CloseAgent()
* | | | | | | | | | | | | | | | refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
* | | | | | | | | | | | | | | | minor: Stop debug logging whenever an npc is moved, other npc log related ↵Justin Clark-Casey (justincc)2013-09-191-16/+15
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | formatting cleanups
* | | | | | | | | | | | | | | Get rid of issue where removing NPCs would through an exception by routing ↵Justin Clark-Casey (justincc)2013-08-121-1/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | close through Scene.IncomingCloseAgent() and NPCAvatar.Close() rather than directly to Scene.RemoveClient(). This exception was actually harmless since it occurred at the very last stage of the remove client process.
* | | | | | | | | | | | | | Attachments module only registers when enabled. This enables alternative ↵Dan Lake2013-07-161-2/+4
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.
* | | | | | | | | | | | | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-121-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | document & 80-character width terminal formattingSignpostMarv2012-11-111-49/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* | | | | | | | | | | | converting NPC module to ISharedRegionModuleSignpostMarv2012-11-111-9/+22
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* | | | | | | | | | | Prevent race conditions when one thread removes an NPC SP before another ↵Justin Clark-Casey (justincc)2012-08-141-34/+30
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread has retreived it after checking whether the NPC exists.
* | | | | | | | | | Mantis 6063 osNpcTouch.Talun2012-07-061-0/+10
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Allow NPCS to touch obects.
* | | | | | | | | remove default values from prior commit since mono cant deal with themdahlia2012-05-071-1/+1
| | | | | | | | |
* | | | | | | | | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for ↵dahlia2012-05-061-1/+2
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | moving NPCs
* | | | | | | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-261-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Minor improvements to loggingOren Hurvitz2012-04-241-2/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
* | | | | | | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-261-1/+42
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osNpcSay(UUID npc, string message) left untouched New functions:- osNpcSay(UUID npc, int channel, string message) osNpcShout(UUID npc, int channel, string message) osNpcWhisper(UUID npc, int channel, string message) Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | | | | Go back to setting appearance directly in NPCModule.SetAppearance() to fix ↵Justin Clark-Casey (justincc)2012-03-061-8/+12
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mantis 5914 The part reverted is from commit 2ebb421. Unfortunately, IAvatarFactoryModule.SetAppearance() does not transfer attachments. I'm not sure how to do this separately, unfortunately I'll need to leave it to Dan :) Regression test added for this case. Mantis ref: http://opensimulator.org/mantis/view.php?id=5914
* | | | | Fix some logic mistakes where firstly osNpcCreate() without options was ↵Justin Clark-Casey (justincc)2012-02-161-2/+2
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | 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
* | | | Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-141-6/+6
| |_|/ |/| |
generated by cgit v1.1 at 2024-08-22 03:34:01 +0000