aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-12-08 19:37:35 -0800
committerDiva Canto2010-12-08 19:37:35 -0800
commit90bcfefe093889914523743ff10388c0b39fa7d9 (patch)
treec2b681a38b6f416dd3afa2d4f373269ffcc1e088
parentUpdate ode.dll to r1754 (diff)
downloadopensim-SC_OLD-90bcfefe093889914523743ff10388c0b39fa7d9.zip
opensim-SC_OLD-90bcfefe093889914523743ff10388c0b39fa7d9.tar.gz
opensim-SC_OLD-90bcfefe093889914523743ff10388c0b39fa7d9.tar.bz2
opensim-SC_OLD-90bcfefe093889914523743ff10388c0b39fa7d9.tar.xz
Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet...
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
index ac2ad7a..a8da330 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
226 } 226 }
227 else 227 else
228 { 228 {
229 AssetBase newTexture = new AssetBase(texture.ID + "-" + format, texture.Name, (sbyte)AssetType.Texture, texture.CreatorID); 229 AssetBase newTexture = new AssetBase(texture.ID + "-" + format, texture.Name, (sbyte)AssetType.Texture, texture.Metadata.CreatorID);
230 newTexture.Data = ConvertTextureData(texture, format); 230 newTexture.Data = ConvertTextureData(texture, format);
231 if (newTexture.Data.Length == 0) 231 if (newTexture.Data.Length == 0)
232 return false; // !!! Caller try another codec, please! 232 return false; // !!! Caller try another codec, please!