Commit Graph

11 Commits (1dd75fcdb476d20b96efba64a842ac82000c400d)

Author SHA1 Message Date
Melanie 1dd75fcdb4 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-09-17 14:15:22 +01:00
SignpostMarv 5e626ce55d script invocations cannot have void return type 2012-09-17 13:29:01 +01:00
Melanie 2efd13ae18 Fix a typo 2012-08-18 22:36:42 +02:00
Melanie ebbf349c6a Let the temp attachment module add a command to allow attaching without permissions and add support for this (incomplete!) to LSL 2012-08-15 19:37:16 +01:00
Melanie 44dc138d8b Let the temp attachment module add a command to allow attaching without permissions and add support for this (incomplete!) to LSL 2012-08-15 18:22:52 +02:00
Melanie e81e26498b Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-08-14 16:51:47 +01:00
Melanie a5b6492223 Perform ownership transfer and permission propagation as well as needed
updates on the new temp attachment.
2012-08-14 13:40:13 +01:00
Melanie 1be072f19e Move inititalization to RegionLoaded to avoid a module loading order issue 2012-08-14 09:55:44 +01:00
Melanie 053e7279ca Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-14 02:11:13 +01:00
Melanie 4bbdcfb5ee Implement the temp attachments. UNTESTED 2012-08-14 01:45:02 +01:00
Melanie 62acfabec4 Add the skeleton for the temp attachments module 2012-08-14 00:54:12 +01:00