diff options
author | Justin Clark-Casey (justincc) | 2009-11-16 19:16:24 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-16 19:16:24 +0000 |
commit | 2606bf4a535decde80a5836ff3b57c2046908b42 (patch) | |
tree | 3925fcf6b567d47761f52f5efcb153b3a60ea593 /OpenSim | |
parent | minor: add forgotton copyright header (diff) | |
download | opensim-SC-2606bf4a535decde80a5836ff3b57c2046908b42.zip opensim-SC-2606bf4a535decde80a5836ff3b57c2046908b42.tar.gz opensim-SC-2606bf4a535decde80a5836ff3b57c2046908b42.tar.bz2 opensim-SC-2606bf4a535decde80a5836ff3b57c2046908b42.tar.xz |
minor: very minor formatting change
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 43761fc..f51d0c2 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -124,7 +124,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
124 | { | 124 | { |
125 | if (RenderPlugins.ContainsKey(contentType)) | 125 | if (RenderPlugins.ContainsKey(contentType)) |
126 | { | 126 | { |
127 | |||
128 | DynamicTextureUpdater updater = new DynamicTextureUpdater(); | 127 | DynamicTextureUpdater updater = new DynamicTextureUpdater(); |
129 | updater.SimUUID = simID; | 128 | updater.SimUUID = simID; |
130 | updater.PrimID = primID; | 129 | updater.PrimID = primID; |
@@ -275,7 +274,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
275 | /// </summary> | 274 | /// </summary> |
276 | public void DataReceived(byte[] data, Scene scene) | 275 | public void DataReceived(byte[] data, Scene scene) |
277 | { | 276 | { |
278 | |||
279 | SceneObjectPart part = scene.GetSceneObjectPart(PrimID); | 277 | SceneObjectPart part = scene.GetSceneObjectPart(PrimID); |
280 | 278 | ||
281 | if (part == null || data == null || data.Length <= 1) | 279 | if (part == null || data == null || data.Length <= 1) |
@@ -364,7 +362,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
364 | 362 | ||
365 | if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0)) | 363 | if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0)) |
366 | { | 364 | { |
367 | // scene.CommsManager.AssetCache.ExpireAsset(oldID); | ||
368 | scene.AssetService.Delete(oldID.ToString()); | 365 | scene.AssetService.Delete(oldID.ToString()); |
369 | } | 366 | } |
370 | } | 367 | } |
@@ -433,4 +430,4 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
433 | 430 | ||
434 | #endregion | 431 | #endregion |
435 | } | 432 | } |
436 | } | 433 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs index 95f9cef..abcaf91 100644 --- a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs | |||
@@ -30,10 +30,8 @@ using OpenMetaverse; | |||
30 | 30 | ||
31 | namespace OpenSim.Region.Framework.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | |||
34 | public interface IDynamicTextureManager | 33 | public interface IDynamicTextureManager |
35 | { | 34 | { |
36 | |||
37 | void RegisterRender(string handleType, IDynamicTextureRender render); | 35 | void RegisterRender(string handleType, IDynamicTextureRender render); |
38 | void ReturnData(UUID id, byte[] data); | 36 | void ReturnData(UUID id, byte[] data); |
39 | 37 | ||