diff options
author | Melanie Thielker | 2017-01-05 18:53:02 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 18:53:02 +0000 |
commit | e88e2945e902a9f0edeb4f4d1b356ce77cdb4ee6 (patch) | |
tree | 411c9d47fc5b395f8a484d969d174fd4acfe5786 /OpenSim/Region/CoreModules/Avatar | |
parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-e88e2945e902a9f0edeb4f4d1b356ce77cdb4ee6.zip opensim-SC-e88e2945e902a9f0edeb4f4d1b356ce77cdb4ee6.tar.gz opensim-SC-e88e2945e902a9f0edeb4f4d1b356ce77cdb4ee6.tar.bz2 opensim-SC-e88e2945e902a9f0edeb4f4d1b356ce77cdb4ee6.tar.xz |
Make it possible to disable the bakes module in the way it is described in config comments
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs index ea5bb64..6d97251 100644 --- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | |||
@@ -53,6 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures | |||
53 | private UTF8Encoding enc = new UTF8Encoding(); | 53 | private UTF8Encoding enc = new UTF8Encoding(); |
54 | private string m_URL = String.Empty; | 54 | private string m_URL = String.Empty; |
55 | private static XmlSerializer m_serializer = new XmlSerializer(typeof(AssetBase)); | 55 | private static XmlSerializer m_serializer = new XmlSerializer(typeof(AssetBase)); |
56 | private static bool m_enabled = false; | ||
56 | 57 | ||
57 | private static IServiceAuth m_Auth; | 58 | private static IServiceAuth m_Auth; |
58 | 59 | ||
@@ -63,11 +64,19 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures | |||
63 | return; | 64 | return; |
64 | 65 | ||
65 | m_URL = config.GetString("URL", String.Empty); | 66 | m_URL = config.GetString("URL", String.Empty); |
67 | if (m_URL == String.Empty) | ||
68 | return; | ||
69 | |||
70 | m_enabled = true; | ||
71 | |||
66 | m_Auth = ServiceAuth.Create(configSource, "XBakes"); | 72 | m_Auth = ServiceAuth.Create(configSource, "XBakes"); |
67 | } | 73 | } |
68 | 74 | ||
69 | public void AddRegion(Scene scene) | 75 | public void AddRegion(Scene scene) |
70 | { | 76 | { |
77 | if (!m_enabled) | ||
78 | return; | ||
79 | |||
71 | // m_log.InfoFormat("[XBakes]: Enabled for region {0}", scene.RegionInfo.RegionName); | 80 | // m_log.InfoFormat("[XBakes]: Enabled for region {0}", scene.RegionInfo.RegionName); |
72 | m_Scene = scene; | 81 | m_Scene = scene; |
73 | 82 | ||
@@ -211,4 +220,4 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures | |||
211 | ); | 220 | ); |
212 | } | 221 | } |
213 | } | 222 | } |
214 | } \ No newline at end of file | 223 | } |