diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs index 0d7b1fc..8e1f63a 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |||
| @@ -47,7 +47,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps; | |||
| 47 | 47 | ||
| 48 | namespace OpenSim.Region.ClientStack.Linden | 48 | namespace OpenSim.Region.ClientStack.Linden |
| 49 | { | 49 | { |
| 50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetMeshModule")] |
| 51 | public class GetMeshModule : INonSharedRegionModule | 51 | public class GetMeshModule : INonSharedRegionModule |
| 52 | { | 52 | { |
| 53 | // private static readonly ILog m_log = | 53 | // private static readonly ILog m_log = |
| @@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 58 | private bool m_Enabled = true; | 58 | private bool m_Enabled = true; |
| 59 | private string m_URL; | 59 | private string m_URL; |
| 60 | 60 | ||
| 61 | #region IRegionModuleBase Members | 61 | #region Region Module interfaceBase Members |
| 62 | 62 | ||
| 63 | public Type ReplaceableInterface | 63 | public Type ReplaceableInterface |
| 64 | { | 64 | { |