diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index 4268f2e..0e7051e 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||
@@ -46,6 +46,11 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
46 | { | 46 | { |
47 | public class VectorRenderModule : IRegionModule, IDynamicTextureRender | 47 | public class VectorRenderModule : IRegionModule, IDynamicTextureRender |
48 | { | 48 | { |
49 | // These fields exist for testing purposes, please do not remove. | ||
50 | // private static bool s_flipper; | ||
51 | // private static byte[] s_asset1Data; | ||
52 | // private static byte[] s_asset2Data; | ||
53 | |||
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 55 | ||
51 | private Scene m_scene; | 56 | private Scene m_scene; |
@@ -161,6 +166,13 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
161 | { | 166 | { |
162 | m_textureManager.RegisterRender(GetContentType(), this); | 167 | m_textureManager.RegisterRender(GetContentType(), this); |
163 | } | 168 | } |
169 | |||
170 | // This code exists for testing purposes, please do not remove. | ||
171 | // s_asset1Data = m_scene.AssetService.Get("00000000-0000-1111-9999-000000000001").Data; | ||
172 | // s_asset1Data = m_scene.AssetService.Get("9f4acf0d-1841-4e15-bdb8-3a12efc9dd8f").Data; | ||
173 | |||
174 | // Terrain dirt - smallest bin/assets file (6004 bytes) | ||
175 | // s_asset2Data = m_scene.AssetService.Get("b8d3965a-ad78-bf43-699b-bff8eca6c975").Data; | ||
164 | } | 176 | } |
165 | 177 | ||
166 | public void Close() | 178 | public void Close() |
@@ -364,6 +376,14 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
364 | } | 376 | } |
365 | 377 | ||
366 | byte[] imageJ2000 = new byte[0]; | 378 | byte[] imageJ2000 = new byte[0]; |
379 | |||
380 | // This code exists for testing purposes, please do not remove. | ||
381 | // if (s_flipper) | ||
382 | // imageJ2000 = s_asset1Data; | ||
383 | // else | ||
384 | // imageJ2000 = s_asset2Data; | ||
385 | // | ||
386 | // s_flipper = !s_flipper; | ||
367 | 387 | ||
368 | try | 388 | try |
369 | { | 389 | { |