Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge

2011-10-12 07:24:53 +01:00 · 2011-10-12 07:24:53 +01:00 · 4b069d23d0
parent 816d0de11a f138a2056e
commit 4b069d23d0
1 changed files with 1 additions and 0 deletions
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@ -194,6 +194,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                RenderPlugins[contentType].AsyncConvertData(updater.UpdaterID, data, extraParams);
                return updater.UpdaterID;
            }
+            
            return UUID.Zero;
        }