aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-291-2/+4
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * Stop attempts to update/add existing attachments in user inventory when ↵Justin Clark-Casey (justincc)2013-03-281-2/+4
| | | | | | | | | | | | teleporting between regions. This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
* | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-291-0/+4
|\ \ | |/
| * If the viewer has already rezzed any attachments itself, then ignore the ↵Justin Clark-Casey (justincc)2013-03-281-0/+4
| | | | | | | | | | | | simulator-side rez attachments call. This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
| * Multiattach, part 1Melanie2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | Multiattach, part 1Melanie2013-03-051-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-10-031-0/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-021-0/+9
| |
* | Merge branch 'master' into careminsterMelanie2012-08-141-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-141-1/+1
| |
| * Change attachment handling to remove object from the scene first as perMelanie2012-07-231-1/+1
| | | | | | | | | | | | 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.
* | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-1/+1
| | | | | | | | | | | | 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 'master' into careminsterMelanie2012-07-121-1/+1
|\ \ | |/ | | | | | | | | | | | | 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-1/+1
| | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
* | Merge branch 'master' into careminsterMelanie2012-06-291-3/+3
|\ \ | |/ | | | | | | | | 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-281-3/+3
| | | | | | | | | | | | | | 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
* | Merge branch 'master' into careminsterMelanie2012-06-281-0/+14
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * refactor: Move ScenePresence <-> AgentData attachments copying code into ↵Justin Clark-Casey (justincc)2012-06-271-0/+14
| | | | | | | | AttachmentsModule.
* | Merge branch 'master' into careminsterMelanie2012-06-261-3/+8
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * When attachments are being saved and deleted for a closing root agent, ↵Justin Clark-Casey (justincc)2012-06-251-3/+8
| | | | | | | | | | | | delete first to avoid a hud race condition with update threads. If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
* | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach ↵Melanie2012-06-041-1/+1
| | | | | | | | positions.
* | Merge branch 'master' into careminsterMelanie2012-02-011-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix copy/paste errorsMelanie2012-02-011-1/+1
| |
* | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmergeMelanie2011-10-121-27/+10
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
| * Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵Dan Lake2011-10-041-22/+9
| | | | | | | | handlers for attachments to call public interface and rearranged module file into sections
* | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-111-29/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Removed redundant code in AttachmentsModule and simplified interfaces which ↵Dan Lake2011-10-031-29/+6
| | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still.
* | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmergeMelanie2011-10-111-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
| * Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake2011-10-031-2/+2
| |
* | Bring us up to date.Tom2011-09-141-16/+8
|\ \ | |/
| * Remove UpdateKnownItem() from IAttachmentsModule.Justin Clark-Casey (justincc)2011-09-131-9/+0
| | | | | | | | It's not appropriate for code outside the attachments module to call this.
| * Start locking entire add/remove operations on an ↵Justin Clark-Casey (justincc)2011-09-121-0/+9
| | | | | | | | | | | | | | | | | | IScenePresence.AttachmentsSyncLock object Attach and detach packets are processed asynchronously when received from a viewer. Bugs like http://opensimulator.org/mantis/view.php?id=5644 indicate that in some situations (such as attaching/detaching entire folders of objects at once), there are race conditions between these threads. Since multiple data structures need to be updated on attach/detach, it's not enough to lock the individual collections. Therefore, this commit introduces a new IScenePresence.AttachmentsSyncLock which add/remove operations lock on.
| * Get rid of the confusing version of ↵Justin Clark-Casey (justincc)2011-09-061-14/+0
| | | | | | | | IAttachmentsModule.RezSingleAttachmentFromInventory() with the updateInventoryStatus switch, since this is never called with false
* | Merge fixes, and fix the buildTom2011-09-141-1/+1
| |
* | Resolve merge commits, stage 1Tom2011-09-041-25/+37
|\ \ | |/
| * move common code into AttachmentsModule.DeleteAttachmentsFromScene()Justin Clark-Casey (justincc)2011-08-311-0/+9
| |
| * refactor: move SP.SaveChangedAttachments() fully into AttachmentsModuleJustin Clark-Casey (justincc)2011-08-301-0/+6
| |
| * refactor: Move ScenePresence.RezAttachments() into AttachmentsModuleJustin Clark-Casey (justincc)2011-08-301-0/+6
| | | | | | | | This adds an incomplete IScenePresence to match ISceneEntity
| * refactor: migrate DropObject handling fully into AttachmentsModule from SceneJustin Clark-Casey (justincc)2011-08-301-4/+4
| |
| * refactor: simplify DetachSingleAttachmentToGround() by retrieving the scene ↵Justin Clark-Casey (justincc)2011-08-261-2/+2
| | | | | | | | object group direct
| * rename AttachmentsModule.ShowDetachInUserInventory() to ↵Justin Clark-Casey (justincc)2011-08-231-15/+7
| | | | | | | | DetachSingleAttachmentToInv() for consistency and to reflect it's actual behaviour
| * If an attachment fails, then start logging the exception for now, in order ↵Justin Clark-Casey (justincc)2011-08-221-5/+3
| | | | | | | | | | | | to help with the inconsistent state bug. This also refactors AttachmentsModules to stop pointlessly refetching the ScenePresence in various methods. However, more of this is required.
| * Fix issue where loading a new appearance onto an NPC would not remove the ↵Justin Clark-Casey (justincc)2011-08-171-1/+2
| | | | | | | | | | | | previous attachments from the scene. Addresses http://opensimulator.org/mantis/view.php?id=5636
| * reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being ↵Justin Clark-Casey (justincc)2010-12-141-6/+9
| | | | | | | | | | | | used by a 3rd party region module and contains non-obvious attachment specific code There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-6/+15
| | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching.
* | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-6/+13
| | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching.
* | When detaching a scripted item, always consider it modified. Script statesMelanie2010-11-161-0/+2
| | | | | | | | | | will have changed and for real usability, we need to save it. It bloats assets, but that can't be avoided.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-141-11/+0
|\ \ | |/
| * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-131-11/+0
| | | | | | | | No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-1/+1
|\ \ | |/ | | | | | | 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.
generated by cgit v1.1 at 2024-12-21 10:23:15 +0000