| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Fix copy/paste errors | Melanie | 2012-02-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 1 | -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 Lake | 2011-10-04 | 1 | -22/+9 |
| | | | | | | | | | handlers for attachments to call public interface and rearranged module file into sections | ||||
| * | | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 1 | -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 Lake | 2011-10-03 | 1 | -29/+6 |
| | | | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still. | ||||
| * | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | ||||
| | * | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 1 | -2/+2 |
| | | | |||||
| * | | Bring us up to date. | Tom | 2011-09-14 | 1 | -16/+8 |
| |\ \ | |/ | |||||
| | * | Remove UpdateKnownItem() from IAttachmentsModule. | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -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-12 | 1 | -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-06 | 1 | -14/+0 |
| | | | | | | | | | IAttachmentsModule.RezSingleAttachmentFromInventory() with the updateInventoryStatus switch, since this is never called with false | ||||
| * | | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -1/+1 |
| | | | |||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -25/+37 |
| |\ \ | |/ | |||||
| | * | move common code into AttachmentsModule.DeleteAttachmentsFromScene() | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -0/+9 |
| | | | |||||
| | * | refactor: move SP.SaveChangedAttachments() fully into AttachmentsModule | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -0/+6 |
| | | | |||||
| | * | refactor: Move ScenePresence.RezAttachments() into AttachmentsModule | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -0/+6 |
| | | | | | | | | | This adds an incomplete IScenePresence to match ISceneEntity | ||||
| | * | refactor: migrate DropObject handling fully into AttachmentsModule from Scene | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -4/+4 |
| | | | |||||
| | * | refactor: simplify DetachSingleAttachmentToGround() by retrieving the scene ↵ | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -2/+2 |
| | | | | | | | | | object group direct | ||||
| | * | rename AttachmentsModule.ShowDetachInUserInventory() to ↵ | Justin Clark-Casey (justincc) | 2011-08-23 | 1 | -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-22 | 1 | -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-17 | 1 | -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-14 | 1 | -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 now | Melanie | 2010-11-16 | 1 | -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 now | Melanie | 2010-11-16 | 1 | -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 states | Melanie | 2010-11-16 | 1 | -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-refactor | Melanie | 2010-09-14 | 1 | -11/+0 |
| |\ \ | |/ | |||||
| | * | Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -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-refactor | Melanie | 2010-09-13 | 1 | -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. | ||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 1 | -0/+8 |
| |\ \ | |/ | |||||
| | * | refactor: break out attachment position change code in ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -0/+8 |
| | | | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions. | ||||
| | * | Major attachments cleanup. Remove unused AttachObject ClientView method | Melanie | 2010-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters | ||||
| | * | Remove useless quaternion parameter from AttachObject sig | Melanie Thielker | 2010-07-14 | 1 | -2/+2 |
| | | | |||||
| * | | Major attachments cleanup. Remove unused AttachObject ClientView method | Melanie Thielker | 2010-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters | ||||
| * | | Remove useless quaternion parameter from AttachObject sig | Melanie Thielker | 2010-07-14 | 1 | -2/+2 |
| | | | |||||
| * | | Plumb a data path to initialize an attachment from an alternate source | Melanie Thielker | 2010-04-24 | 1 | -1/+6 |
| |/ | |||||
| * | refactor: move DeatchObject() into the AttachmentsModule | Justin Clark-Casey (justincc) | 2010-04-17 | 1 | -0/+10 |
| | | |||||
| * | refactor: crudely move DetachSingleAttachmentToGround() over to the ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -0/+7 |
| | | | | | AttachmentsModule | ||||
| * | refactor: crudely move the RezMultipleAttachments() method into the ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -0/+12 |
| | | | | | AttachmentsModule | ||||
| * | refactor: Move another RezSingleAttachment() from Scene.Inventory to ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 1 | -2/+16 |
| | | | | | AttachmentsModule | ||||
| * | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 1 | -1/+10 |
| | | | | | AttachmentsModule | ||||
| * | refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule | Justin Clark-Casey (justincc) | 2010-03-12 | 1 | -3/+14 |
| | | |||||
| * | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 1 | -3/+3 |
| | | |||||
| * | refactor: Move DetachSingleAttachmentToInv to region module | Justin Clark-Casey (justincc) | 2010-03-06 | 1 | -0/+11 |
| | | | | | need to rationalize method names later | ||||
| * | refactor: move user inventory side of RezSingleAttachment to module | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -0/+12 |
| | | |||||
| * | refactor: begin to move attachments code into a region module | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -0/+49 |
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |