diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/AvatarAppearance.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 210 |
1 files changed, 105 insertions, 105 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index a287201..0c0cfd5 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -30,8 +30,8 @@ using System.Collections; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Runtime.Serialization; | 31 | using System.Runtime.Serialization; |
32 | using System.Security.Permissions; | 32 | using System.Security.Permissions; |
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | using libsecondlife.Packets; | 34 | using OpenMetaverse.Packets; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | 36 | ||
37 | namespace OpenSim.Framework | 37 | namespace OpenSim.Framework |
@@ -58,20 +58,20 @@ namespace OpenSim.Framework | |||
58 | 58 | ||
59 | private readonly static int MAX_WEARABLES = 13; | 59 | private readonly static int MAX_WEARABLES = 13; |
60 | 60 | ||
61 | private static LLUUID BODY_ASSET = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); | 61 | private static UUID BODY_ASSET = new UUID("66c41e39-38f9-f75a-024e-585989bfab73"); |
62 | private static LLUUID BODY_ITEM = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"); | 62 | private static UUID BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9"); |
63 | private static LLUUID SKIN_ASSET = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); | 63 | private static UUID SKIN_ASSET = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb"); |
64 | private static LLUUID SKIN_ITEM = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"); | 64 | private static UUID SKIN_ITEM = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9"); |
65 | private static LLUUID SHIRT_ASSET = new LLUUID("00000000-38f9-1111-024e-222222111110"); | 65 | private static UUID SHIRT_ASSET = new UUID("00000000-38f9-1111-024e-222222111110"); |
66 | private static LLUUID SHIRT_ITEM = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"); | 66 | private static UUID SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000"); |
67 | private static LLUUID PANTS_ASSET = new LLUUID("00000000-38f9-1111-024e-222222111120"); | 67 | private static UUID PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120"); |
68 | private static LLUUID PANTS_ITEM = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"); | 68 | private static UUID PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111"); |
69 | 69 | ||
70 | public readonly static int VISUALPARAM_COUNT = 218; | 70 | public readonly static int VISUALPARAM_COUNT = 218; |
71 | 71 | ||
72 | protected LLUUID m_owner; | 72 | protected UUID m_owner; |
73 | 73 | ||
74 | public virtual LLUUID Owner | 74 | public virtual UUID Owner |
75 | { | 75 | { |
76 | get { return m_owner; } | 76 | get { return m_owner; } |
77 | set { m_owner = value; } | 77 | set { m_owner = value; } |
@@ -100,107 +100,107 @@ namespace OpenSim.Framework | |||
100 | set { m_wearables = value; } | 100 | set { m_wearables = value; } |
101 | } | 101 | } |
102 | 102 | ||
103 | public virtual LLUUID BodyItem { | 103 | public virtual UUID BodyItem { |
104 | get { return m_wearables[BODY].ItemID; } | 104 | get { return m_wearables[BODY].ItemID; } |
105 | set { m_wearables[BODY].ItemID = value; } | 105 | set { m_wearables[BODY].ItemID = value; } |
106 | } | 106 | } |
107 | public virtual LLUUID BodyAsset { | 107 | public virtual UUID BodyAsset { |
108 | get { return m_wearables[BODY].AssetID; } | 108 | get { return m_wearables[BODY].AssetID; } |
109 | set { m_wearables[BODY].AssetID = value; } | 109 | set { m_wearables[BODY].AssetID = value; } |
110 | } | 110 | } |
111 | public virtual LLUUID SkinItem { | 111 | public virtual UUID SkinItem { |
112 | get { return m_wearables[SKIN].ItemID; } | 112 | get { return m_wearables[SKIN].ItemID; } |
113 | set { m_wearables[SKIN].ItemID = value; } | 113 | set { m_wearables[SKIN].ItemID = value; } |
114 | } | 114 | } |
115 | public virtual LLUUID SkinAsset { | 115 | public virtual UUID SkinAsset { |
116 | get { return m_wearables[SKIN].AssetID; } | 116 | get { return m_wearables[SKIN].AssetID; } |
117 | set { m_wearables[SKIN].AssetID = value; } | 117 | set { m_wearables[SKIN].AssetID = value; } |
118 | } | 118 | } |
119 | public virtual LLUUID HairItem { | 119 | public virtual UUID HairItem { |
120 | get { return m_wearables[HAIR].ItemID; } | 120 | get { return m_wearables[HAIR].ItemID; } |
121 | set { m_wearables[HAIR].ItemID = value; } | 121 | set { m_wearables[HAIR].ItemID = value; } |
122 | } | 122 | } |
123 | public virtual LLUUID HairAsset { | 123 | public virtual UUID HairAsset { |
124 | get { return m_wearables[HAIR].AssetID; } | 124 | get { return m_wearables[HAIR].AssetID; } |
125 | set { m_wearables[HAIR].AssetID = value; } | 125 | set { m_wearables[HAIR].AssetID = value; } |
126 | } | 126 | } |
127 | public virtual LLUUID EyesItem { | 127 | public virtual UUID EyesItem { |
128 | get { return m_wearables[EYES].ItemID; } | 128 | get { return m_wearables[EYES].ItemID; } |
129 | set { m_wearables[EYES].ItemID = value; } | 129 | set { m_wearables[EYES].ItemID = value; } |
130 | } | 130 | } |
131 | public virtual LLUUID EyesAsset { | 131 | public virtual UUID EyesAsset { |
132 | get { return m_wearables[EYES].AssetID; } | 132 | get { return m_wearables[EYES].AssetID; } |
133 | set { m_wearables[EYES].AssetID = value; } | 133 | set { m_wearables[EYES].AssetID = value; } |
134 | } | 134 | } |
135 | public virtual LLUUID ShirtItem { | 135 | public virtual UUID ShirtItem { |
136 | get { return m_wearables[SHIRT].ItemID; } | 136 | get { return m_wearables[SHIRT].ItemID; } |
137 | set { m_wearables[SHIRT].ItemID = value; } | 137 | set { m_wearables[SHIRT].ItemID = value; } |
138 | } | 138 | } |
139 | public virtual LLUUID ShirtAsset { | 139 | public virtual UUID ShirtAsset { |
140 | get { return m_wearables[SHIRT].AssetID; } | 140 | get { return m_wearables[SHIRT].AssetID; } |
141 | set { m_wearables[SHIRT].AssetID = value; } | 141 | set { m_wearables[SHIRT].AssetID = value; } |
142 | } | 142 | } |
143 | public virtual LLUUID PantsItem { | 143 | public virtual UUID PantsItem { |
144 | get { return m_wearables[PANTS].ItemID; } | 144 | get { return m_wearables[PANTS].ItemID; } |
145 | set { m_wearables[PANTS].ItemID = value; } | 145 | set { m_wearables[PANTS].ItemID = value; } |
146 | } | 146 | } |
147 | public virtual LLUUID PantsAsset { | 147 | public virtual UUID PantsAsset { |
148 | get { return m_wearables[PANTS].AssetID; } | 148 | get { return m_wearables[PANTS].AssetID; } |
149 | set { m_wearables[PANTS].AssetID = value; } | 149 | set { m_wearables[PANTS].AssetID = value; } |
150 | } | 150 | } |
151 | public virtual LLUUID ShoesItem { | 151 | public virtual UUID ShoesItem { |
152 | get { return m_wearables[SHOES].ItemID; } | 152 | get { return m_wearables[SHOES].ItemID; } |
153 | set { m_wearables[SHOES].ItemID = value; } | 153 | set { m_wearables[SHOES].ItemID = value; } |
154 | } | 154 | } |
155 | public virtual LLUUID ShoesAsset { | 155 | public virtual UUID ShoesAsset { |
156 | get { return m_wearables[SHOES].AssetID; } | 156 | get { return m_wearables[SHOES].AssetID; } |
157 | set { m_wearables[SHOES].AssetID = value; } | 157 | set { m_wearables[SHOES].AssetID = value; } |
158 | } | 158 | } |
159 | public virtual LLUUID SocksItem { | 159 | public virtual UUID SocksItem { |
160 | get { return m_wearables[SOCKS].ItemID; } | 160 | get { return m_wearables[SOCKS].ItemID; } |
161 | set { m_wearables[SOCKS].ItemID = value; } | 161 | set { m_wearables[SOCKS].ItemID = value; } |
162 | } | 162 | } |
163 | public virtual LLUUID SocksAsset { | 163 | public virtual UUID SocksAsset { |
164 | get { return m_wearables[SOCKS].AssetID; } | 164 | get { return m_wearables[SOCKS].AssetID; } |
165 | set { m_wearables[SOCKS].AssetID = value; } | 165 | set { m_wearables[SOCKS].AssetID = value; } |
166 | } | 166 | } |
167 | public virtual LLUUID JacketItem { | 167 | public virtual UUID JacketItem { |
168 | get { return m_wearables[JACKET].ItemID; } | 168 | get { return m_wearables[JACKET].ItemID; } |
169 | set { m_wearables[JACKET].ItemID = value; } | 169 | set { m_wearables[JACKET].ItemID = value; } |
170 | } | 170 | } |
171 | public virtual LLUUID JacketAsset { | 171 | public virtual UUID JacketAsset { |
172 | get { return m_wearables[JACKET].AssetID; } | 172 | get { return m_wearables[JACKET].AssetID; } |
173 | set { m_wearables[JACKET].AssetID = value; } | 173 | set { m_wearables[JACKET].AssetID = value; } |
174 | } | 174 | } |
175 | public virtual LLUUID GlovesItem { | 175 | public virtual UUID GlovesItem { |
176 | get { return m_wearables[GLOVES].ItemID; } | 176 | get { return m_wearables[GLOVES].ItemID; } |
177 | set { m_wearables[GLOVES].ItemID = value; } | 177 | set { m_wearables[GLOVES].ItemID = value; } |
178 | } | 178 | } |
179 | public virtual LLUUID GlovesAsset { | 179 | public virtual UUID GlovesAsset { |
180 | get { return m_wearables[GLOVES].AssetID; } | 180 | get { return m_wearables[GLOVES].AssetID; } |
181 | set { m_wearables[GLOVES].AssetID = value; } | 181 | set { m_wearables[GLOVES].AssetID = value; } |
182 | } | 182 | } |
183 | public virtual LLUUID UnderShirtItem { | 183 | public virtual UUID UnderShirtItem { |
184 | get { return m_wearables[UNDERSHIRT].ItemID; } | 184 | get { return m_wearables[UNDERSHIRT].ItemID; } |
185 | set { m_wearables[UNDERSHIRT].ItemID = value; } | 185 | set { m_wearables[UNDERSHIRT].ItemID = value; } |
186 | } | 186 | } |
187 | public virtual LLUUID UnderShirtAsset { | 187 | public virtual UUID UnderShirtAsset { |
188 | get { return m_wearables[UNDERSHIRT].AssetID; } | 188 | get { return m_wearables[UNDERSHIRT].AssetID; } |
189 | set { m_wearables[UNDERSHIRT].AssetID = value; } | 189 | set { m_wearables[UNDERSHIRT].AssetID = value; } |
190 | } | 190 | } |
191 | public virtual LLUUID UnderPantsItem { | 191 | public virtual UUID UnderPantsItem { |
192 | get { return m_wearables[UNDERPANTS].ItemID; } | 192 | get { return m_wearables[UNDERPANTS].ItemID; } |
193 | set { m_wearables[UNDERPANTS].ItemID = value; } | 193 | set { m_wearables[UNDERPANTS].ItemID = value; } |
194 | } | 194 | } |
195 | public virtual LLUUID UnderPantsAsset { | 195 | public virtual UUID UnderPantsAsset { |
196 | get { return m_wearables[UNDERPANTS].AssetID; } | 196 | get { return m_wearables[UNDERPANTS].AssetID; } |
197 | set { m_wearables[UNDERPANTS].AssetID = value; } | 197 | set { m_wearables[UNDERPANTS].AssetID = value; } |
198 | } | 198 | } |
199 | public virtual LLUUID SkirtItem { | 199 | public virtual UUID SkirtItem { |
200 | get { return m_wearables[SKIRT].ItemID; } | 200 | get { return m_wearables[SKIRT].ItemID; } |
201 | set { m_wearables[SKIRT].ItemID = value; } | 201 | set { m_wearables[SKIRT].ItemID = value; } |
202 | } | 202 | } |
203 | public virtual LLUUID SkirtAsset { | 203 | public virtual UUID SkirtAsset { |
204 | get { return m_wearables[SKIRT].AssetID; } | 204 | get { return m_wearables[SKIRT].AssetID; } |
205 | set { m_wearables[SKIRT].AssetID = value; } | 205 | set { m_wearables[SKIRT].AssetID = value; } |
206 | } | 206 | } |
@@ -217,9 +217,9 @@ namespace OpenSim.Framework | |||
217 | m_wearables[PANTS].ItemID = PANTS_ITEM; | 217 | m_wearables[PANTS].ItemID = PANTS_ITEM; |
218 | } | 218 | } |
219 | 219 | ||
220 | protected LLObject.TextureEntry m_texture; | 220 | protected Primitive.TextureEntry m_texture; |
221 | 221 | ||
222 | public virtual LLObject.TextureEntry Texture | 222 | public virtual Primitive.TextureEntry Texture |
223 | { | 223 | { |
224 | get { return m_texture; } | 224 | get { return m_texture; } |
225 | set { m_texture = value; } | 225 | set { m_texture = value; } |
@@ -242,13 +242,13 @@ namespace OpenSim.Framework | |||
242 | m_wearables[i] = new AvatarWearable(); | 242 | m_wearables[i] = new AvatarWearable(); |
243 | } | 243 | } |
244 | m_serial = 0; | 244 | m_serial = 0; |
245 | m_owner = LLUUID.Zero; | 245 | m_owner = UUID.Zero; |
246 | m_visualparams = new byte[VISUALPARAM_COUNT]; | 246 | m_visualparams = new byte[VISUALPARAM_COUNT]; |
247 | SetDefaultWearables(); | 247 | SetDefaultWearables(); |
248 | m_texture = GetDefaultTexture(); | 248 | m_texture = GetDefaultTexture(); |
249 | } | 249 | } |
250 | 250 | ||
251 | public AvatarAppearance(LLUUID avatarID, AvatarWearable[] wearables, byte[] visualParams) | 251 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams) |
252 | { | 252 | { |
253 | m_owner = avatarID; | 253 | m_owner = avatarID; |
254 | m_serial = 1; | 254 | m_serial = 1; |
@@ -264,7 +264,7 @@ namespace OpenSim.Framework | |||
264 | /// <param name="visualParam"></param> | 264 | /// <param name="visualParam"></param> |
265 | public virtual void SetAppearance(byte[] texture, List<byte> visualParam) | 265 | public virtual void SetAppearance(byte[] texture, List<byte> visualParam) |
266 | { | 266 | { |
267 | LLObject.TextureEntry textureEnt = new LLObject.TextureEntry(texture, 0, texture.Length); | 267 | Primitive.TextureEntry textureEnt = new Primitive.TextureEntry(texture, 0, texture.Length); |
268 | m_texture = textureEnt; | 268 | m_texture = textureEnt; |
269 | 269 | ||
270 | m_visualparams = visualParam.ToArray(); | 270 | m_visualparams = visualParam.ToArray(); |
@@ -281,16 +281,16 @@ namespace OpenSim.Framework | |||
281 | m_wearables[wearableId] = wearable; | 281 | m_wearables[wearableId] = wearable; |
282 | } | 282 | } |
283 | 283 | ||
284 | public static LLObject.TextureEntry GetDefaultTexture() | 284 | public static Primitive.TextureEntry GetDefaultTexture() |
285 | { | 285 | { |
286 | LLObject.TextureEntry textu = new LLObject.TextureEntry(new LLUUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); | 286 | Primitive.TextureEntry textu = new Primitive.TextureEntry(new UUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); |
287 | textu.CreateFace(0).TextureID = new LLUUID("00000000-0000-1111-9999-000000000012"); | 287 | textu.CreateFace(0).TextureID = new UUID("00000000-0000-1111-9999-000000000012"); |
288 | textu.CreateFace(1).TextureID = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f"); | 288 | textu.CreateFace(1).TextureID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f"); |
289 | textu.CreateFace(2).TextureID = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f"); | 289 | textu.CreateFace(2).TextureID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f"); |
290 | textu.CreateFace(3).TextureID = new LLUUID("6522E74D-1660-4E7F-B601-6F48C1659A77"); | 290 | textu.CreateFace(3).TextureID = new UUID("6522E74D-1660-4E7F-B601-6F48C1659A77"); |
291 | textu.CreateFace(4).TextureID = new LLUUID("7CA39B4C-BD19-4699-AFF7-F93FD03D3E7B"); | 291 | textu.CreateFace(4).TextureID = new UUID("7CA39B4C-BD19-4699-AFF7-F93FD03D3E7B"); |
292 | textu.CreateFace(5).TextureID = new LLUUID("00000000-0000-1111-9999-000000000010"); | 292 | textu.CreateFace(5).TextureID = new UUID("00000000-0000-1111-9999-000000000010"); |
293 | textu.CreateFace(6).TextureID = new LLUUID("00000000-0000-1111-9999-000000000011"); | 293 | textu.CreateFace(6).TextureID = new UUID("00000000-0000-1111-9999-000000000011"); |
294 | return textu; | 294 | return textu; |
295 | } | 295 | } |
296 | 296 | ||
@@ -313,13 +313,13 @@ namespace OpenSim.Framework | |||
313 | throw new ArgumentNullException("info"); | 313 | throw new ArgumentNullException("info"); |
314 | } | 314 | } |
315 | 315 | ||
316 | m_owner = new LLUUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid))); | 316 | m_owner = new UUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid))); |
317 | m_serial = (int)info.GetValue("m_wearablesSerial", typeof(int)); | 317 | m_serial = (int)info.GetValue("m_wearablesSerial", typeof(int)); |
318 | m_visualparams = (byte[])info.GetValue("m_visualParams", typeof(byte[])); | 318 | m_visualparams = (byte[])info.GetValue("m_visualParams", typeof(byte[])); |
319 | m_wearables = (AvatarWearable[])info.GetValue("m_wearables", typeof(AvatarWearable[])); | 319 | m_wearables = (AvatarWearable[])info.GetValue("m_wearables", typeof(AvatarWearable[])); |
320 | 320 | ||
321 | byte[] m_textureEntry_work = (byte[])info.GetValue("m_textureEntry", typeof(byte[])); | 321 | byte[] m_textureEntry_work = (byte[])info.GetValue("m_textureEntry", typeof(byte[])); |
322 | m_texture = new LLObject.TextureEntry(m_textureEntry_work, 0, m_textureEntry_work.Length); | 322 | m_texture = new Primitive.TextureEntry(m_textureEntry_work, 0, m_textureEntry_work.Length); |
323 | 323 | ||
324 | m_avatarHeight = (float)info.GetValue("m_avatarHeight", typeof(float)); | 324 | m_avatarHeight = (float)info.GetValue("m_avatarHeight", typeof(float)); |
325 | 325 | ||
@@ -371,10 +371,10 @@ namespace OpenSim.Framework | |||
371 | 371 | ||
372 | public AvatarAppearance(Hashtable h) | 372 | public AvatarAppearance(Hashtable h) |
373 | { | 373 | { |
374 | Owner = new LLUUID((string)h["owner"]); | 374 | Owner = new UUID((string)h["owner"]); |
375 | Serial = Convert.ToInt32((string)h["serial"]); | 375 | Serial = Convert.ToInt32((string)h["serial"]); |
376 | VisualParams = (byte[])h["visual_params"]; | 376 | VisualParams = (byte[])h["visual_params"]; |
377 | Texture = new LLObject.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length); | 377 | Texture = new Primitive.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length); |
378 | AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); | 378 | AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); |
379 | 379 | ||
380 | m_wearables = new AvatarWearable[MAX_WEARABLES]; | 380 | m_wearables = new AvatarWearable[MAX_WEARABLES]; |
@@ -384,32 +384,32 @@ namespace OpenSim.Framework | |||
384 | m_wearables[i] = new AvatarWearable(); | 384 | m_wearables[i] = new AvatarWearable(); |
385 | } | 385 | } |
386 | 386 | ||
387 | BodyItem = new LLUUID((string)h["body_item"]); | 387 | BodyItem = new UUID((string)h["body_item"]); |
388 | BodyAsset = new LLUUID((string)h["body_asset"]); | 388 | BodyAsset = new UUID((string)h["body_asset"]); |
389 | SkinItem = new LLUUID((string)h["skin_item"]); | 389 | SkinItem = new UUID((string)h["skin_item"]); |
390 | SkinAsset = new LLUUID((string)h["skin_asset"]); | 390 | SkinAsset = new UUID((string)h["skin_asset"]); |
391 | HairItem = new LLUUID((string)h["hair_item"]); | 391 | HairItem = new UUID((string)h["hair_item"]); |
392 | HairAsset = new LLUUID((string)h["hair_asset"]); | 392 | HairAsset = new UUID((string)h["hair_asset"]); |
393 | EyesItem = new LLUUID((string)h["eyes_item"]); | 393 | EyesItem = new UUID((string)h["eyes_item"]); |
394 | EyesAsset = new LLUUID((string)h["eyes_asset"]); | 394 | EyesAsset = new UUID((string)h["eyes_asset"]); |
395 | ShirtItem = new LLUUID((string)h["shirt_item"]); | 395 | ShirtItem = new UUID((string)h["shirt_item"]); |
396 | ShirtAsset = new LLUUID((string)h["shirt_asset"]); | 396 | ShirtAsset = new UUID((string)h["shirt_asset"]); |
397 | PantsItem = new LLUUID((string)h["pants_item"]); | 397 | PantsItem = new UUID((string)h["pants_item"]); |
398 | PantsAsset = new LLUUID((string)h["pants_asset"]); | 398 | PantsAsset = new UUID((string)h["pants_asset"]); |
399 | ShoesItem = new LLUUID((string)h["shoes_item"]); | 399 | ShoesItem = new UUID((string)h["shoes_item"]); |
400 | ShoesAsset = new LLUUID((string)h["shoes_asset"]); | 400 | ShoesAsset = new UUID((string)h["shoes_asset"]); |
401 | SocksItem = new LLUUID((string)h["socks_item"]); | 401 | SocksItem = new UUID((string)h["socks_item"]); |
402 | SocksAsset = new LLUUID((string)h["socks_asset"]); | 402 | SocksAsset = new UUID((string)h["socks_asset"]); |
403 | JacketItem = new LLUUID((string)h["jacket_item"]); | 403 | JacketItem = new UUID((string)h["jacket_item"]); |
404 | JacketAsset = new LLUUID((string)h["jacket_asset"]); | 404 | JacketAsset = new UUID((string)h["jacket_asset"]); |
405 | GlovesItem = new LLUUID((string)h["gloves_item"]); | 405 | GlovesItem = new UUID((string)h["gloves_item"]); |
406 | GlovesAsset = new LLUUID((string)h["gloves_asset"]); | 406 | GlovesAsset = new UUID((string)h["gloves_asset"]); |
407 | UnderShirtItem = new LLUUID((string)h["undershirt_item"]); | 407 | UnderShirtItem = new UUID((string)h["undershirt_item"]); |
408 | UnderShirtAsset = new LLUUID((string)h["undershirt_asset"]); | 408 | UnderShirtAsset = new UUID((string)h["undershirt_asset"]); |
409 | UnderPantsItem = new LLUUID((string)h["underpants_item"]); | 409 | UnderPantsItem = new UUID((string)h["underpants_item"]); |
410 | UnderPantsAsset = new LLUUID((string)h["underpants_asset"]); | 410 | UnderPantsAsset = new UUID((string)h["underpants_asset"]); |
411 | SkirtItem = new LLUUID((string)h["skirt_item"]); | 411 | SkirtItem = new UUID((string)h["skirt_item"]); |
412 | SkirtAsset = new LLUUID((string)h["skirt_asset"]); | 412 | SkirtAsset = new UUID((string)h["skirt_asset"]); |
413 | 413 | ||
414 | if (h.ContainsKey("attachments")) | 414 | if (h.ContainsKey("attachments")) |
415 | { | 415 | { |
@@ -427,7 +427,7 @@ namespace OpenSim.Framework | |||
427 | throw new ArgumentNullException("info"); | 427 | throw new ArgumentNullException("info"); |
428 | } | 428 | } |
429 | 429 | ||
430 | info.AddValue("m_scenePresenceID", m_owner.UUID); | 430 | info.AddValue("m_scenePresenceID", m_owner.Guid); |
431 | info.AddValue("m_wearablesSerial", m_serial); | 431 | info.AddValue("m_wearablesSerial", m_serial); |
432 | info.AddValue("m_visualParams", m_visualparams); | 432 | info.AddValue("m_visualParams", m_visualparams); |
433 | info.AddValue("m_wearables", m_wearables); | 433 | info.AddValue("m_wearables", m_wearables); |
@@ -435,7 +435,7 @@ namespace OpenSim.Framework | |||
435 | info.AddValue("m_avatarHeight", m_avatarHeight); | 435 | info.AddValue("m_avatarHeight", m_avatarHeight); |
436 | } | 436 | } |
437 | 437 | ||
438 | private Dictionary<int, LLUUID[]> m_attachments = new Dictionary<int, LLUUID[]>(); | 438 | private Dictionary<int, UUID[]> m_attachments = new Dictionary<int, UUID[]>(); |
439 | 439 | ||
440 | public void SetAttachments(Hashtable data) | 440 | public void SetAttachments(Hashtable data) |
441 | { | 441 | { |
@@ -451,14 +451,14 @@ namespace OpenSim.Framework | |||
451 | if (m_attachments.ContainsKey(attachpoint)) | 451 | if (m_attachments.ContainsKey(attachpoint)) |
452 | continue; | 452 | continue; |
453 | 453 | ||
454 | LLUUID item; | 454 | UUID item; |
455 | LLUUID asset; | 455 | UUID asset; |
456 | 456 | ||
457 | Hashtable uuids = (Hashtable) e.Value; | 457 | Hashtable uuids = (Hashtable) e.Value; |
458 | LLUUID.TryParse(uuids["item"].ToString(), out item); | 458 | UUID.TryParse(uuids["item"].ToString(), out item); |
459 | LLUUID.TryParse(uuids["asset"].ToString(), out asset); | 459 | UUID.TryParse(uuids["asset"].ToString(), out asset); |
460 | 460 | ||
461 | LLUUID[] attachment = new LLUUID[2]; | 461 | UUID[] attachment = new UUID[2]; |
462 | attachment[0] = item; | 462 | attachment[0] = item; |
463 | attachment[1] = asset; | 463 | attachment[1] = asset; |
464 | 464 | ||
@@ -473,10 +473,10 @@ namespace OpenSim.Framework | |||
473 | 473 | ||
474 | Hashtable ret = new Hashtable(); | 474 | Hashtable ret = new Hashtable(); |
475 | 475 | ||
476 | foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments) | 476 | foreach (KeyValuePair<int, UUID[]> kvp in m_attachments) |
477 | { | 477 | { |
478 | int attachpoint = kvp.Key; | 478 | int attachpoint = kvp.Key; |
479 | LLUUID[] uuids = kvp.Value; | 479 | UUID[] uuids = kvp.Value; |
480 | 480 | ||
481 | Hashtable data = new Hashtable(); | 481 | Hashtable data = new Hashtable(); |
482 | data["item"] = uuids[0].ToString(); | 482 | data["item"] = uuids[0].ToString(); |
@@ -493,28 +493,28 @@ namespace OpenSim.Framework | |||
493 | return new List<int>(m_attachments.Keys); | 493 | return new List<int>(m_attachments.Keys); |
494 | } | 494 | } |
495 | 495 | ||
496 | public LLUUID GetAttachedItem(int attachpoint) | 496 | public UUID GetAttachedItem(int attachpoint) |
497 | { | 497 | { |
498 | if (!m_attachments.ContainsKey(attachpoint)) | 498 | if (!m_attachments.ContainsKey(attachpoint)) |
499 | return LLUUID.Zero; | 499 | return UUID.Zero; |
500 | 500 | ||
501 | return m_attachments[attachpoint][0]; | 501 | return m_attachments[attachpoint][0]; |
502 | } | 502 | } |
503 | 503 | ||
504 | public LLUUID GetAttachedAsset(int attachpoint) | 504 | public UUID GetAttachedAsset(int attachpoint) |
505 | { | 505 | { |
506 | if (!m_attachments.ContainsKey(attachpoint)) | 506 | if (!m_attachments.ContainsKey(attachpoint)) |
507 | return LLUUID.Zero; | 507 | return UUID.Zero; |
508 | 508 | ||
509 | return m_attachments[attachpoint][1]; | 509 | return m_attachments[attachpoint][1]; |
510 | } | 510 | } |
511 | 511 | ||
512 | public void SetAttachment(int attachpoint, LLUUID item, LLUUID asset) | 512 | public void SetAttachment(int attachpoint, UUID item, UUID asset) |
513 | { | 513 | { |
514 | if (attachpoint == 0) | 514 | if (attachpoint == 0) |
515 | return; | 515 | return; |
516 | 516 | ||
517 | if (item == LLUUID.Zero) | 517 | if (item == UUID.Zero) |
518 | { | 518 | { |
519 | if (m_attachments.ContainsKey(attachpoint)) | 519 | if (m_attachments.ContainsKey(attachpoint)) |
520 | m_attachments.Remove(attachpoint); | 520 | m_attachments.Remove(attachpoint); |
@@ -522,15 +522,15 @@ namespace OpenSim.Framework | |||
522 | } | 522 | } |
523 | 523 | ||
524 | if (!m_attachments.ContainsKey(attachpoint)) | 524 | if (!m_attachments.ContainsKey(attachpoint)) |
525 | m_attachments[attachpoint] = new LLUUID[2]; | 525 | m_attachments[attachpoint] = new UUID[2]; |
526 | 526 | ||
527 | m_attachments[attachpoint][0] = item; | 527 | m_attachments[attachpoint][0] = item; |
528 | m_attachments[attachpoint][1] = asset; | 528 | m_attachments[attachpoint][1] = asset; |
529 | } | 529 | } |
530 | 530 | ||
531 | public int GetAttachpoint(LLUUID itemID) | 531 | public int GetAttachpoint(UUID itemID) |
532 | { | 532 | { |
533 | foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments) | 533 | foreach (KeyValuePair<int, UUID[]> kvp in m_attachments) |
534 | { | 534 | { |
535 | if (kvp.Value[0] == itemID) | 535 | if (kvp.Value[0] == itemID) |
536 | { | 536 | { |
@@ -540,7 +540,7 @@ namespace OpenSim.Framework | |||
540 | return 0; | 540 | return 0; |
541 | } | 541 | } |
542 | 542 | ||
543 | public void DetachAttachment(LLUUID itemID) | 543 | public void DetachAttachment(UUID itemID) |
544 | { | 544 | { |
545 | int attachpoint = GetAttachpoint(itemID); | 545 | int attachpoint = GetAttachpoint(itemID); |
546 | 546 | ||
@@ -552,7 +552,7 @@ namespace OpenSim.Framework | |||
552 | { | 552 | { |
553 | List<string> strings = new List<string>(); | 553 | List<string> strings = new List<string>(); |
554 | 554 | ||
555 | foreach (KeyValuePair<int, LLUUID[]> e in m_attachments) | 555 | foreach (KeyValuePair<int, UUID[]> e in m_attachments) |
556 | { | 556 | { |
557 | strings.Add(e.Key.ToString()); | 557 | strings.Add(e.Key.ToString()); |
558 | strings.Add(e.Value[0].ToString()); | 558 | strings.Add(e.Value[0].ToString()); |
@@ -572,13 +572,13 @@ namespace OpenSim.Framework | |||
572 | while (strings.Length - i > 2) | 572 | while (strings.Length - i > 2) |
573 | { | 573 | { |
574 | int attachpoint = Int32.Parse(strings[i]); | 574 | int attachpoint = Int32.Parse(strings[i]); |
575 | LLUUID item = new LLUUID(strings[i+1]); | 575 | UUID item = new UUID(strings[i+1]); |
576 | LLUUID asset = new LLUUID(strings[i+2]); | 576 | UUID asset = new UUID(strings[i+2]); |
577 | i += 3; | 577 | i += 3; |
578 | 578 | ||
579 | if (!m_attachments.ContainsKey(attachpoint)) | 579 | if (!m_attachments.ContainsKey(attachpoint)) |
580 | { | 580 | { |
581 | m_attachments[attachpoint] = new LLUUID[2]; | 581 | m_attachments[attachpoint] = new UUID[2]; |
582 | m_attachments[attachpoint][0] = item; | 582 | m_attachments[attachpoint][0] = item; |
583 | m_attachments[attachpoint][1] = asset; | 583 | m_attachments[attachpoint][1] = asset; |
584 | } | 584 | } |