aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Texture_manager.cs
diff options
context:
space:
mode:
authorMW2007-02-03 19:51:52 +0000
committerMW2007-02-03 19:51:52 +0000
commit3a157273da7de6caa098ac4af406e37be02a1171 (patch)
treeb30b6a30a7e84ebe2dcff80e9d0207b8495f1173 /Texture_manager.cs
parent(no commit message) (diff)
downloadopensim-SC-3a157273da7de6caa098ac4af406e37be02a1171.zip
opensim-SC-3a157273da7de6caa098ac4af406e37be02a1171.tar.gz
opensim-SC-3a157273da7de6caa098ac4af406e37be02a1171.tar.bz2
opensim-SC-3a157273da7de6caa098ac4af406e37be02a1171.tar.xz
Added Basic Inventory support
Diffstat (limited to 'Texture_manager.cs')
-rw-r--r--Texture_manager.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/Texture_manager.cs b/Texture_manager.cs
index 7177cb6..daf1452 100644
--- a/Texture_manager.cs
+++ b/Texture_manager.cs
@@ -1,5 +1,5 @@
1/* 1/*
2Copyright (c) 2007 Michael Wright 2Copyright (c) OpenSim project, http://sim.opensecondlife.org/
3 3
4* Copyright (c) <year>, <copyright holder> 4* Copyright (c) <year>, <copyright holder>
5* All rights reserved. 5* All rights reserved.
@@ -165,6 +165,7 @@ namespace OpenSim
165 TextureImage im=new TextureImage(); 165 TextureImage im=new TextureImage();
166 im.filename="testpic2.jp2"; 166 im.filename="testpic2.jp2";
167 im.Full_ID=new LLUUID("00000000-0000-0000-5005-000000000005"); 167 im.Full_ID=new LLUUID("00000000-0000-0000-5005-000000000005");
168 im.Name="test Texture";
168 this.LoadImage(im); 169 this.LoadImage(im);
169 this.textures.Add(im.Full_ID,im); 170 this.textures.Add(im.Full_ID,im);
170 171
@@ -219,11 +220,11 @@ namespace OpenSim
219 220
220 } 221 }
221 } 222 }
222 public class TextureImage 223 public class TextureImage: AssetBase
223 { 224 {
224 public byte[] data; 225 //public byte[] data;
225 public LLUUID Full_ID; 226 //public LLUUID Full_ID;
226 public string name; 227 //public string name;
227 public string filename; 228 public string filename;
228 public bool loaded; 229 public bool loaded;
229 public ulong last_used; //need to add a tick/time counter and keep record 230 public ulong last_used; //need to add a tick/time counter and keep record