aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Attachments (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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"
* | 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 'master' into careminsterMelanie2013-03-221-10/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 ↵Justin Clark-Casey (justincc)2013-03-201-10/+7
| | | | | | | | | | | | 21:38:00 2013) This break was not connected with the recent attachment code changes.
| * 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
* | 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 careminsterMelanie2013-01-041-0/+1
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add "show animations" console command for debug purposes.Justin Clark-Casey (justincc)2013-01-021-0/+1
| | | | | | | | This shows the current animation sequence and default anims for avatars.
* | Merge branch 'master' into careminsterMelanie2012-10-201-1/+1
|\ \ | |/
| * minor: Increase attachment name field from 36 to 50 chars in "attachments ↵Justin Clark-Casey (justincc)2012-10-191-1/+1
| | | | | | | | show" report
* | 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-0/+126
|\ \ | |/ | | | | | | | | | | 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
|/
* 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.
* refactor: Rename ConsoleTableRow and ConsoleTableColumn to ↵Justin Clark-Casey (justincc)2012-05-231-6/+6
| | | | ConsoleDisplayTableRow and ConsoleDisplayTableColumn
* refactor: rename ConsoleTable -> ConsoleDisplayTable for clarityJustin Clark-Casey (justincc)2012-05-231-1/+1
|
* Add ConsoleTable framework class for future uniform formatting of console ↵Justin Clark-Casey (justincc)2012-05-101-8/+26
| | | | | | | output tables. Still subject to change - if you use this be prepared to change your output code if/when the methods change. Make new "attachments show" command use this.
* Add "attachments" show console command that will show the server's record of ↵Justin Clark-Casey (justincc)2012-05-101-0/+177
which attachments an in-scene avatar has. For debugging purposes.
generated by cgit v1.1 at 2024-09-12 17:22:58 +0000