diff options
author | Justin Clark-Casey (justincc) | 2013-03-26 20:32:22 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-03-26 20:32:22 +0000 |
commit | 13170ca627d266bbd53cd32fa71a5caa47f6fb98 (patch) | |
tree | 1398da06f070a14d6741b1418e3ce0bbcb705381 /OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |
parent | Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars i... (diff) | |
parent | Implement a pref to turn on the simulator ExportSupported feature entry. (diff) | |
download | opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.zip opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.gz opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.bz2 opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | 1 |
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 e9ddbbe..54c86ae 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; | |||
40 | using OpenSim.Region.ClientStack.LindenUDP; | 40 | using OpenSim.Region.ClientStack.LindenUDP; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
43 | 44 | ||
44 | namespace OpenSim.Region.OptionalModules.Avatar.Attachments | 45 | namespace OpenSim.Region.OptionalModules.Avatar.Attachments |
45 | { | 46 | { |