aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* remove unused parameterUbitUmarov2015-11-171-1/+1
|
* in llAttachToAvatarTemp() (TempAttachmentsModule) dont add to inventory, ↵UbitUmarov2015-10-041-1/+1
| | | | like master
* Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-291-1/+1
|\ | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | teleporting between regions. This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+1
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
| * 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
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Multiattach, part 1Melanie2013-03-051-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-03-051-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * Fixed typos in TempAttachmentsModule. No changes.Diva Canto2013-03-021-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-09-171-9/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * script invocations cannot have void return typeSignpostMarv2012-09-171-9/+9
| |
| * Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-151-3/+38
| | | | | | | | permissions and add support for this (incomplete!) to LSL
* | Fix a typoMelanie2012-08-181-1/+1
| |
* | Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-151-3/+38
| | | | | | | | permissions and add support for this (incomplete!) to LSL
* | Merge branch 'master' into careminsterMelanie2012-08-141-8/+36
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * Perform ownership transfer and permission propagation as well as neededMelanie2012-08-141-0/+28
| | | | | | | | updates on the new temp attachment.
| * Move inititalization to RegionLoaded to avoid a module loading order issueMelanie2012-08-141-8/+8
| |
* | 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
* Implement the temp attachments. UNTESTEDMelanie2012-08-141-0/+44
|
* Add the skeleton for the temp attachments moduleMelanie2012-08-141-0/+82