diff options
| author | Melanie | 2013-03-26 03:26:28 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-26 03:26:28 +0000 |
| commit | 36c57bac8e86b5c64c5ef89a0dc24e55662ad34c (patch) | |
| tree | db7079f27f7209f5eacdd27e9a25903d56030032 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask (diff) | |
| download | opensim-SC_OLD-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.zip opensim-SC_OLD-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.gz opensim-SC_OLD-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.bz2 opensim-SC_OLD-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | 3 |
2 files changed, 3 insertions, 1 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; | |||
| 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 | { |
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs index 4a754a9..1bb5aee 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | |||
| @@ -42,6 +42,7 @@ using OpenSim.Region.Framework.Scenes; | |||
| 42 | using OpenSim.Region.Framework.Scenes.Scripting; | 42 | using OpenSim.Region.Framework.Scenes.Scripting; |
| 43 | using System.Collections.Generic; | 43 | using System.Collections.Generic; |
| 44 | using System.Text.RegularExpressions; | 44 | using System.Text.RegularExpressions; |
| 45 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
| 45 | 46 | ||
| 46 | namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | 47 | namespace OpenSim.Region.OptionalModules.Scripting.JsonStore |
| 47 | { | 48 | { |
| @@ -643,4 +644,4 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
| 643 | } | 644 | } |
| 644 | 645 | ||
| 645 | } | 646 | } |
| 646 | } \ No newline at end of file | 647 | } |