aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Attachments
diff options
context:
space:
mode:
authorMelanie2013-03-26 03:26:28 +0000
committerMelanie2013-03-26 03:26:28 +0000
commit36c57bac8e86b5c64c5ef89a0dc24e55662ad34c (patch)
treedb7079f27f7209f5eacdd27e9a25903d56030032 /OpenSim/Region/OptionalModules/Avatar/Attachments
parentMerge branch 'master' into careminster (diff)
parentPhase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask (diff)
downloadopensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.zip
opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.gz
opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.bz2
opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
index bed192a..8740f87 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Monitoring;
40using OpenSim.Region.ClientStack.LindenUDP; 40using OpenSim.Region.ClientStack.LindenUDP;
41using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
43using PermissionMask = OpenSim.Framework.PermissionMask;
43 44
44namespace OpenSim.Region.OptionalModules.Avatar.Attachments 45namespace OpenSim.Region.OptionalModules.Avatar.Attachments
45{ 46{