aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-101-0/+3
|\
| * Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-091-0/+3
| | | | | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly.
* | Merge branch 'master' into careminsterMelanie2012-08-291-32/+32
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵Justin Clark-Casey (justincc)2012-08-291-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders. This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
* | | Merge branch 'master' into careminsterMelanie2012-08-231-1/+1
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-1/+1
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
| * Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
| |
* | Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-08-142-16/+37
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * As per lindn spec, disable detach and drop for temp attachmentsMelanie2012-08-141-0/+8
| |
| * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-142-17/+30
| |
* | Merge branch 'master' into careminsterMelanie2012-08-041-4/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Fix build break.Justin Clark-Casey (justincc)2012-08-031-1/+1
| |
| * Update settings loading in AvatarFactoryModule which should have been in ↵Justin Clark-Casey (justincc)2012-08-031-4/+4
| | | | | | | | last commit 205f2326
* | Merge branch 'avination' into careminsterMelanie2012-07-291-0/+3
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Allow load and save of IAR without a password. The password must still beMelanie2012-07-241-0/+3
| | | | | | | | | | | | | | | | | | present on the command line for compatibility, but is ignored. Avination's IAR operations are administratively done and the staff doesn't have the passwords of the users.
* | | Merge branch 'master' into careminsterMelanie2012-07-281-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-1/+1
| | | | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
* | | Merge branch 'master' into careminsterMelanie2012-07-251-7/+44
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Remove bad using statement in AttachmentsModuleTests.Justin Clark-Casey (justincc)2012-07-241-2/+1
| | | | | | | | | | | | It seems that the mono 2.10.8.1 doesn't choke on this but for some reason 2.4.3 fails.
| * | extend regression TestRezScriptedAttachmentFromInventory() to check actual ↵Justin Clark-Casey (justincc)2012-07-241-3/+19
| | | | | | | | | | | | start of script rather than just the script status reported by SOG.ContainsScripts()
| * | extend regression TestDetachScriptedAttachementToInventory() to check ↵Justin Clark-Casey (justincc)2012-07-241-3/+25
| | | | | | | | | | | | correct running status on a re-rezzed attachment
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-29/+59
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | | Merge branch 'avination' into careminsterMelanie2012-07-231-29/+58
|\ \ \ | | |/ | |/|
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-29/+58
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
* | | Merge branch 'master' into careminsterMelanie2012-07-201-6/+10
|\ \ \ | | |/ | |/|
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
* | | Merge branch 'master' into careminsterMelanie2012-07-201-10/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Comment out OnIncomingInstantMessage and OnInstantMessage handlers in ↵Justin Clark-Casey (justincc)2012-07-191-10/+10
| | | | | | | | | | | | GroupsModule, since these led to a private blank method
* | | Merge branch 'master' into careminsterMelanie2012-07-193-11/+17
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix regression where llGiveInventory() had stopped asking non-owner ↵Justin Clark-Casey (justincc)2012-07-172-9/+14
| | | | | | | | | | | | | | | | | | receivers to accept/decline. This appears to be a regression from back in commit db91044 (Mon Aug 22 2011) where we started to send TaskInventoryOffered msg dialog rather than InventoryOffered dialog. This is probably correct, but failed because the bucket was too large and because we wouldn't have handled the TaskInventoryDeclined option anyway. This patch handles both of these and make llGiveInventoryList() use TaskInventoryOffered as well Fixes http://opensimulator.org/mantis/view.php?id=6089
| * Restore update of inventory item on derez/logout. This is necessary to ↵Justin Clark-Casey (justincc)2012-07-171-1/+6
| | | | | | | | | | | | | | update the name if this has been changed whilst attached. Note, this behaviour appears to be at variance with the ll grid as of Tues 17 July 2012, testing with viewer 3.2.1. The item name in inventory does not change either at the point of detach or after a relog.
| * Stop sending the viewer an inventory create message if a known attachment ↵Justin Clark-Casey (justincc)2012-07-171-4/+1
| | | | | | | | | | | | | | item is updated. This doesn't seem to make any sense and probably stems from a period when this code was directly involved in attaching objects directly from the scene. This message is already being sent by InventoryAccessModule code instead.
* | Merge branch 'master' into careminsterMelanie2012-07-122-22/+155
|\ \ | |/ | | | | | | | | | | | | 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
| * Allow XEngine StartDelay to be configured in the [XEngine] config section.Justin Clark-Casey (justincc)2012-07-111-1/+2
| | | | | | | | | | This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously. Therefore, this is not yet documented externally.
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-112-20/+127
| | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
| * Add regression TestRezScriptedAttachmentsFromInventory() though this ↵Justin Clark-Casey (justincc)2012-07-111-1/+26
| | | | | | | | currently only checks for the presence of script items, not for started scripts
* | Merge branch 'master' into careminsterMelanie2012-07-112-100/+105
|\ \ | |/ | | | | | | | | | | | | | | 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
| * When an attachment is detached to inv or derezzed, stop the scripts, update ↵Justin Clark-Casey (justincc)2012-07-101-6/+14
| | | | | | | | | | | | the known item with script state still in the script engine and then remove the scripts. This is to fix a regression starting from 5301648 where attachments had to start being deleted before persistence in order to avoid race conditions with hud update threads.
| * Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-092-1/+40
| | | | | | | | | | | | This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar. This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar. Recording HashSet is null if there are no sitting avatars in order to save memory.
| * minor: Remove some wrong comments in attachments regression testsJustin Clark-Casey (justincc)2012-07-061-2/+0
| |
| * Add assert to attachment regression tests to check that number of objects in ↵Justin Clark-Casey (justincc)2012-07-061-0/+14
| | | | | | | | the scene graph
| * refactor: extract method UpdateUserInventoryWithAttachment() from ↵Justin Clark-Casey (justincc)2012-07-061-29/+38
| | | | | | | | AttachObject() for better code comprehension
* | Merge branch 'avination' into careminsterMelanie2012-07-061-3/+2
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | stop chat being sent to child avs again.Melanie2012-06-291-3/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-051-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first. Still only attaches objects to the owner of the script. This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them. Threat level high.
* | | Merge branch 'master' into careminsterMelanie2012-06-292-53/+46
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG ↵Justin Clark-Casey (justincc)2012-06-282-40/+45
| | | | | | | | | | | | | | | | | | | | | directly instead of an item ID to then shuffle through attachments, saving CPU busywork. Almost all callers already had the sog to hand. Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
generated by cgit v1.1 at 2025-01-05 06:00:22 +0000