diff options
author | Melanie | 2012-11-13 10:49:24 +0000 |
---|---|---|
committer | Melanie | 2012-11-13 10:49:24 +0000 |
commit | af01a2320a4449b8852248a7b7264fde7e5ab726 (patch) | |
tree | c8b704c7efdc603751acb2d3c47a2873848413ac /OpenSim/Region/CoreModules/World/Warp3DMap | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Moved the WindModule and its own plugins out of .addin.xml (diff) | |
download | opensim-SC-af01a2320a4449b8852248a7b7264fde7e5ab726.zip opensim-SC-af01a2320a4449b8852248a7b7264fde7e5ab726.tar.gz opensim-SC-af01a2320a4449b8852248a7b7264fde7e5ab726.tar.bz2 opensim-SC-af01a2320a4449b8852248a7b7264fde7e5ab726.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Warp3DMap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 31f8aec..7ef44db 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -35,6 +35,7 @@ using CSJ2K; | |||
35 | using Nini.Config; | 35 | using Nini.Config; |
36 | using log4net; | 36 | using log4net; |
37 | using Rednettle.Warp3D; | 37 | using Rednettle.Warp3D; |
38 | using Mono.Addins; | ||
38 | using OpenMetaverse; | 39 | using OpenMetaverse; |
39 | using OpenMetaverse.Imaging; | 40 | using OpenMetaverse.Imaging; |
40 | using OpenMetaverse.Rendering; | 41 | using OpenMetaverse.Rendering; |
@@ -49,6 +50,7 @@ using WarpRenderer = global::Warp3D.Warp3D; | |||
49 | 50 | ||
50 | namespace OpenSim.Region.CoreModules.World.Warp3DMap | 51 | namespace OpenSim.Region.CoreModules.World.Warp3DMap |
51 | { | 52 | { |
53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "Warp3DImageModule")] | ||
52 | public class Warp3DImageModule : IMapImageGenerator, INonSharedRegionModule | 54 | public class Warp3DImageModule : IMapImageGenerator, INonSharedRegionModule |
53 | { | 55 | { |
54 | private static readonly UUID TEXTURE_METADATA_MAGIC = new UUID("802dc0e0-f080-4931-8b57-d1be8611c4f3"); | 56 | private static readonly UUID TEXTURE_METADATA_MAGIC = new UUID("802dc0e0-f080-4931-8b57-d1be8611c4f3"); |