aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Capabilities/Caps.cs33
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs46
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs40
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs6
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs6
-rw-r--r--OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs12
7 files changed, 116 insertions, 31 deletions
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index 110ba6f..ab2b3a6 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Caches;
38 38
39namespace OpenSim.Region.Capabilities 39namespace OpenSim.Region.Capabilities
40{ 40{
41 public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data); 41 public delegate void UpLoadedTexture(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data);
42 42
43 public class Caps 43 public class Caps
44 { 44 {
@@ -223,12 +223,14 @@ namespace OpenSim.Region.Capabilities
223 /// <returns></returns> 223 /// <returns></returns>
224 public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest) 224 public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest)
225 { 225 {
226 // Console.WriteLine("asset upload request via CAPS");
227 string assetName = llsdRequest.name;
226 string capsBase = "/CAPS/" + m_capsObjectPath; 228 string capsBase = "/CAPS/" + m_capsObjectPath;
227 LLUUID newAsset = LLUUID.Random(); 229 LLUUID newAsset = LLUUID.Random();
228 LLUUID newInvItem = LLUUID.Random(); 230 LLUUID newInvItem = LLUUID.Random();
229 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); 231 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
230 232
231 AssetUploader uploader = new AssetUploader(newAsset, newInvItem, capsBase + uploaderPath, this.httpListener); 233 AssetUploader uploader = new AssetUploader(assetName, newAsset, newInvItem, capsBase + uploaderPath, this.httpListener);
232 httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps)); 234 httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
233 string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath; 235 string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;
234 236
@@ -245,14 +247,14 @@ namespace OpenSim.Region.Capabilities
245 /// <param name="assetID"></param> 247 /// <param name="assetID"></param>
246 /// <param name="inventoryItem"></param> 248 /// <param name="inventoryItem"></param>
247 /// <param name="data"></param> 249 /// <param name="data"></param>
248 public void UploadCompleteHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data) 250 public void UploadCompleteHandler(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data)
249 { 251 {
250 AssetBase asset; 252 AssetBase asset;
251 asset = new AssetBase(); 253 asset = new AssetBase();
252 asset.FullID = assetID; 254 asset.FullID = assetID;
253 asset.Type = 0; 255 asset.Type = 0;
254 asset.InvType = 0; 256 asset.InvType = 0;
255 asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000"); 257 asset.Name = assetName; //"UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
256 asset.Data = data; 258 asset.Data = data;
257 this.assetCache.AddAsset(asset); 259 this.assetCache.AddAsset(asset);
258 } 260 }
@@ -265,6 +267,8 @@ namespace OpenSim.Region.Capabilities
265 private LLUUID newAssetID; 267 private LLUUID newAssetID;
266 private LLUUID inventoryItemID; 268 private LLUUID inventoryItemID;
267 private BaseHttpServer httpListener; 269 private BaseHttpServer httpListener;
270 private bool SaveImages = true;
271 private string m_assetName = "";
268 272
269 /// <summary> 273 /// <summary>
270 /// 274 ///
@@ -273,8 +277,9 @@ namespace OpenSim.Region.Capabilities
273 /// <param name="inventoryItem"></param> 277 /// <param name="inventoryItem"></param>
274 /// <param name="path"></param> 278 /// <param name="path"></param>
275 /// <param name="httpServer"></param> 279 /// <param name="httpServer"></param>
276 public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer) 280 public AssetUploader(string assetName, LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
277 { 281 {
282 m_assetName = assetName;
278 newAssetID = assetID; 283 newAssetID = assetID;
279 inventoryItemID = inventoryItem; 284 inventoryItemID = inventoryItem;
280 uploaderPath = path; 285 uploaderPath = path;
@@ -299,13 +304,27 @@ namespace OpenSim.Region.Capabilities
299 res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); 304 res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
300 305
301 httpListener.RemoveStreamHandler("POST", uploaderPath); 306 httpListener.RemoveStreamHandler("POST", uploaderPath);
302 307
308 if(this.SaveImages)
309 this.SaveImageToFile(m_assetName + ".jp2", data);
310
303 if (OnUpLoad != null) 311 if (OnUpLoad != null)
304 { 312 {
305 OnUpLoad(newAssetID, inv, data); 313 OnUpLoad(m_assetName, newAssetID, inv, data);
306 } 314 }
315
307 return res; 316 return res;
308 } 317 }
318
319 private void SaveImageToFile(string filename, byte[] data)
320 {
321
322 FileStream fs = File.Create(filename);
323 BinaryWriter bw = new BinaryWriter(fs);
324 bw.Write(data);
325 bw.Close();
326 fs.Close();
327 }
309 } 328 }
310 } 329 }
311} 330}
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 8a5e631..084f7e0 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -81,6 +81,10 @@ namespace OpenSim.Region.ClientStack
81 public event RequestMapBlocks OnRequestMapBlocks; 81 public event RequestMapBlocks OnRequestMapBlocks;
82 public event TeleportLocationRequest OnTeleportLocationRequest; 82 public event TeleportLocationRequest OnTeleportLocationRequest;
83 83
84 public event CreateInventoryFolder OnCreateNewInventoryFolder;
85 public event FetchInventoryDescendents OnFetchInventoryDescendents;
86 public event RequestTaskInventory OnRequestTaskInventory;
87
84 public event UUIDNameRequest OnNameFromUUIDRequest; 88 public event UUIDNameRequest OnNameFromUUIDRequest;
85 89
86 public event ParcelPropertiesRequest OnParcelPropertiesRequest; 90 public event ParcelPropertiesRequest OnParcelPropertiesRequest;
@@ -577,6 +581,48 @@ namespace OpenSim.Region.ClientStack
577 this.OutPacket(inventoryReply); 581 this.OutPacket(inventoryReply);
578 } 582 }
579 583
584 public void SendInventoryItemUpdate(InventoryItemBase Item)
585 {
586 Encoding enc = Encoding.ASCII;
587 uint FULL_MASK_PERMISSIONS = 2147483647;
588 UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();
589 InventoryReply.AgentData.AgentID = this.AgentID;
590 InventoryReply.AgentData.SimApproved = true;
591 InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
592 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
593 InventoryReply.InventoryData[0].ItemID = Item.inventoryID;
594 InventoryReply.InventoryData[0].AssetID = Item.assetID;
595 InventoryReply.InventoryData[0].CreatorID = Item.creatorsID;
596 InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
597 InventoryReply.InventoryData[0].CreationDate = 1000;
598 InventoryReply.InventoryData[0].Description = enc.GetBytes(Item.inventoryDescription + "\0");
599 InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
600 InventoryReply.InventoryData[0].Flags = 0;
601 InventoryReply.InventoryData[0].FolderID = Item.parentFolderID;
602 InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
603 InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
604 InventoryReply.InventoryData[0].InvType =(sbyte) Item.type;
605 InventoryReply.InventoryData[0].Name = enc.GetBytes(Item.inventoryName + "\0");
606 InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
607 InventoryReply.InventoryData[0].OwnerID = Item.avatarID;
608 InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
609 InventoryReply.InventoryData[0].SalePrice = 100;
610 InventoryReply.InventoryData[0].SaleType = 0;
611 InventoryReply.InventoryData[0].Type =(sbyte) Item.type;
612 InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
613
614 OutPacket(InventoryReply);
615 }
616
617 public void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName)
618 {
619 ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
620 replytask.InventoryData.TaskID = taskID;
621 replytask.InventoryData.Serial = serial;
622 replytask.InventoryData.Filename = fileName;
623 OutPacket(replytask);
624 }
625
580 /// <summary> 626 /// <summary>
581 /// 627 ///
582 /// </summary> 628 /// </summary>
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index c248b29..267e7ee 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -373,7 +373,8 @@ namespace OpenSim.Region.ClientStack
373 break; 373 break;
374 case PacketType.AssetUploadRequest: 374 case PacketType.AssetUploadRequest:
375 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; 375 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
376 this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID)); 376 // Console.WriteLine(request.ToString());
377 //this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
377 break; 378 break;
378 case PacketType.RequestXfer: 379 case PacketType.RequestXfer:
379 //Console.WriteLine(Pack.ToString()); 380 //Console.WriteLine(Pack.ToString());
@@ -382,9 +383,12 @@ namespace OpenSim.Region.ClientStack
382 this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack); 383 this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
383 break; 384 break;
384 case PacketType.CreateInventoryFolder: 385 case PacketType.CreateInventoryFolder:
385 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; 386 if (this.OnCreateNewInventoryFolder != null)
386 m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID); 387 {
387 //Console.WriteLine(Pack.ToString()); 388 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
389 this.OnCreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
390 //m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
391 }
388 break; 392 break;
389 case PacketType.CreateInventoryItem: 393 case PacketType.CreateInventoryItem:
390 //Console.WriteLine(Pack.ToString()); 394 //Console.WriteLine(Pack.ToString());
@@ -405,8 +409,12 @@ namespace OpenSim.Region.ClientStack
405 m_inventoryCache.FetchInventory(this, FetchInventory); 409 m_inventoryCache.FetchInventory(this, FetchInventory);
406 break; 410 break;
407 case PacketType.FetchInventoryDescendents: 411 case PacketType.FetchInventoryDescendents:
408 FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; 412 if (this.OnFetchInventoryDescendents != null)
409 m_inventoryCache.FetchInventoryDescendents(this, Fetch); 413 {
414 FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
415 // m_inventoryCache.FetchInventoryDescendents(this, Fetch);
416 this.OnFetchInventoryDescendents(this, Fetch.InventoryData.FolderID, Fetch.InventoryData.OwnerID, Fetch.InventoryData.FetchFolders, Fetch.InventoryData.FetchItems, Fetch.InventoryData.SortOrder);
417 }
410 break; 418 break;
411 case PacketType.UpdateInventoryItem: 419 case PacketType.UpdateInventoryItem:
412 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; 420 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
@@ -444,22 +452,10 @@ namespace OpenSim.Region.ClientStack
444 case PacketType.RequestTaskInventory: 452 case PacketType.RequestTaskInventory:
445 // Console.WriteLine(Pack.ToString()); 453 // Console.WriteLine(Pack.ToString());
446 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; 454 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
447 ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); 455 if (this.OnRequestTaskInventory != null)
448 //bool foundent = false; 456 {
449 /* foreach (Entity ent in m_world.Entities.Values) 457 this.OnRequestTaskInventory(this, requesttask.InventoryData.LocalID);
450 { 458 }
451 if (ent.localid == requesttask.InventoryData.LocalID)
452 {
453 replytask.InventoryData.TaskID = ent.uuid;
454 replytask.InventoryData.Serial = 0;
455 replytask.InventoryData.Filename = new byte[0];
456 foundent = true;
457 }
458 }
459 if (foundent)
460 {
461 this.OutPacket(replytask);
462 }*/
463 break; 459 break;
464 case PacketType.UpdateTaskInventory: 460 case PacketType.UpdateTaskInventory:
465 // Console.WriteLine(Pack.ToString()); 461 // Console.WriteLine(Pack.ToString());
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f435681..3e7b820 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -529,6 +529,7 @@ namespace OpenSim.Region.Environment.Scenes
529 m_estateManager.sendRegionHandshake(client); 529 m_estateManager.sendRegionHandshake(client);
530 CreateAndAddScenePresence(client); 530 CreateAndAddScenePresence(client);
531 m_LandManager.sendParcelOverlay(client); 531 m_LandManager.sendParcelOverlay(client);
532 //commsManager.UserProfilesCache.AddNewUser(client.AgentId);
532 } 533 }
533 534
534 protected virtual void SubscribeToClientEvents(IClientAPI client) 535 protected virtual void SubscribeToClientEvents(IClientAPI client)
@@ -569,6 +570,9 @@ namespace OpenSim.Region.Environment.Scenes
569 new ParcelObjectOwnerRequest(m_LandManager.handleParcelObjectOwnersRequest); 570 new ParcelObjectOwnerRequest(m_LandManager.handleParcelObjectOwnersRequest);
570 571
571 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); 572 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
573
574 //client.OnCreateNewInventoryFolder += commsManager.UserProfilesCache.HandleCreateInventoryFolder;
575 // client.OnFetchInventoryDescendents += commsManager.UserProfilesCache.HandleFecthInventoryDescendents;
572 } 576 }
573 577
574 protected ScenePresence CreateAndAddScenePresence(IClientAPI client) 578 protected ScenePresence CreateAndAddScenePresence(IClientAPI client)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 3bfc70f..473dae9 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Scenes
53 private List<NewForce> forcesList = new List<NewForce>(); 53 private List<NewForce> forcesList = new List<NewForce>();
54 private short _updateCount = 0; 54 private short _updateCount = 0;
55 private Quaternion bodyRot; 55 private Quaternion bodyRot;
56 private LLObject.TextureEntry avatarAppearanceTexture = null; 56 // private LLObject.TextureEntry avatarAppearanceTexture = null;
57 private byte[] visualParams; 57 private byte[] visualParams;
58 private AvatarWearable[] Wearables; 58 private AvatarWearable[] Wearables;
59 private ulong m_regionHandle; 59 private ulong m_regionHandle;
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Scenes
140 Animations = new ScenePresence.AvatarAnimations(); 140 Animations = new ScenePresence.AvatarAnimations();
141 Animations.LoadAnims(); 141 Animations.LoadAnims();
142 142
143 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); 143 // this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
144 144
145 //register for events 145 //register for events
146 ControllingClient.OnRequestWearables += this.SendOurAppearance; 146 ControllingClient.OnRequestWearables += this.SendOurAppearance;
@@ -605,6 +605,8 @@ namespace OpenSim.Region.Environment.Scenes
605 br.Close(); 605 br.Close();
606 fStream.Close(); 606 fStream.Close();
607 DefaultTexture = data1; 607 DefaultTexture = data1;
608 // LLObject.TextureEntry textu = new LLObject.TextureEntry(data1, 0, data1.Length);
609 // Console.WriteLine("default texture entry: " + textu.ToString());
608 } 610 }
609 611
610 public class NewForce 612 public class NewForce
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index 7acef97..e64d9f0 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -66,6 +66,10 @@ namespace SimpleApp
66 public event NewAvatar OnNewAvatar; 66 public event NewAvatar OnNewAvatar;
67 public event GenericCall6 OnRemoveAvatar; 67 public event GenericCall6 OnRemoveAvatar;
68 68
69 public event CreateInventoryFolder OnCreateNewInventoryFolder;
70 public event FetchInventoryDescendents OnFetchInventoryDescendents;
71 public event RequestTaskInventory OnRequestTaskInventory;
72
69 public event UUIDNameRequest OnNameFromUUIDRequest; 73 public event UUIDNameRequest OnNameFromUUIDRequest;
70 74
71 public event ParcelPropertiesRequest OnParcelPropertiesRequest; 75 public event ParcelPropertiesRequest OnParcelPropertiesRequest;
@@ -139,6 +143,8 @@ namespace SimpleApp
139 143
140 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items) { } 144 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items) { }
141 public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item) { } 145 public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item) { }
146 public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { }
147 public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { }
142 public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname) { } 148 public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname) { }
143 149
144 public void SendAlertMessage(string message) { } 150 public void SendAlertMessage(string message) { }
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index 2f827cf..7de9d55 100644
--- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -246,6 +246,18 @@ namespace OpenSim.Region.GridInterfaces.Local
246 db.Set(store); 246 db.Set(store);
247 db.Commit(); 247 db.Commit();
248 248
249 /*
250 Image = new AssetBase();
251 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000008");
252 Image.Name = "Default Avatar Face";
253 this.LoadAsset(Image, true, "femaleface.j2c");
254 store = new AssetStorage();
255 store.Data = Image.Data;
256 store.Name = Image.Name;
257 store.UUID = Image.FullID;
258 db.Set(store);
259 db.Commit();*/
260
249 Image = new AssetBase(); 261 Image = new AssetBase();
250 Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); 262 Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
251 Image.Name = "Shape"; 263 Image.Name = "Shape";