| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
like master
|
|\
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
teleporting between regions.
This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
|
| |
| |
| |
| | |
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"
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
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"
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
|
| | | |
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| | |
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
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
|
| | |
|
| |
| |
| |
| | |
permissions and add support for this (incomplete!) to LSL
|
| | |
|
| |
| |
| |
| | |
permissions and add support for this (incomplete!) to LSL
|
|\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
|
| |
| |
| |
| | |
updates on the new temp attachment.
|
| | |
|
|/
|
|
|
|
|
| |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| |
|
|
|