diff options
| author | Melanie | 2011-10-12 07:24:53 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-12 07:24:53 +0100 |
| commit | 4b069d23d08a40923c486bdb8dc7b2f26a72ff18 (patch) | |
| tree | 11754378633826811033dcbecda302b15124c9fe /OpenSim | |
| parent | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge (diff) | |
| parent | meaningless change to goose panda (diff) | |
| download | opensim-SC_OLD-4b069d23d08a40923c486bdb8dc7b2f26a72ff18.zip opensim-SC_OLD-4b069d23d08a40923c486bdb8dc7b2f26a72ff18.tar.gz opensim-SC_OLD-4b069d23d08a40923c486bdb8dc7b2f26a72ff18.tar.bz2 opensim-SC_OLD-4b069d23d08a40923c486bdb8dc7b2f26a72ff18.tar.xz | |
Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 8814fd8..6075e19 100644 --- 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 | |||
| 194 | RenderPlugins[contentType].AsyncConvertData(updater.UpdaterID, data, extraParams); | 194 | RenderPlugins[contentType].AsyncConvertData(updater.UpdaterID, data, extraParams); |
| 195 | return updater.UpdaterID; | 195 | return updater.UpdaterID; |
| 196 | } | 196 | } |
| 197 | |||
| 197 | return UUID.Zero; | 198 | return UUID.Zero; |
| 198 | } | 199 | } |
| 199 | 200 | ||