diff options
| author | Melanie | 2013-04-28 19:03:39 +0200 |
|---|---|---|
| committer | Melanie | 2013-04-28 19:03:39 +0200 |
| commit | 4275d7a839d7380ee50aeadc38a31dd467bd891e (patch) | |
| tree | 1e589fc3b448b580d1cc25b52215ef5ce2d7ae78 /OpenSim/Region/CoreModules/Framework/Library | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Controller module for dynamic floaters (WIP) (diff) | |
| download | opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.zip opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.gz opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.bz2 opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
bin/Regions/Regions.ini.example
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/Library')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index ec22146..d07cff4 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
| @@ -43,6 +43,7 @@ using OpenMetaverse; | |||
| 43 | using log4net; | 43 | using log4net; |
| 44 | using Mono.Addins; | 44 | using Mono.Addins; |
| 45 | using Nini.Config; | 45 | using Nini.Config; |
| 46 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
| 46 | 47 | ||
| 47 | namespace OpenSim.Region.CoreModules.Framework.Library | 48 | namespace OpenSim.Region.CoreModules.Framework.Library |
| 48 | { | 49 | { |