OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get a new avatar to wear the 'default' eyes by default. 

This now means that new avatars start off with all the body parts and clothing required to have an appearance in viewer 2.
However, clothing and body part creation is hardcoded, this stuff needs to be made optional.
Or even better, integrated with the existing 'default' avatar creation stuff hanging off the XMLRPC functions.
Also, some sanity tweaking is required (e.g. creator is currently the zero ID)
viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2011-01-08 01:46:52 +00:00
parent 298cf1ae67
commit 45f658890b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/AvatarWearable.cs
View File

@ -81,6 +81,11 @@ namespace OpenSim.Framework
public static readonly UUID DEFAULT_PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111"); public static readonly UUID DEFAULT_PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111");
public static readonly UUID DEFAULT_PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120"); public static readonly UUID DEFAULT_PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120");
// No obvious external default appears for eyes, so these are specific to OpenSim!
// Does this matter?
public static readonly UUID DEFAULT_EYES_ITEM = new UUID("3a8d1e5c-998a-4c81-bdfb-89cd301e795e");
public static readonly UUID DEFAULT_EYES_ASSET = new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77");
// public static readonly UUID DEFAULT_ALPHA_ITEM = new UUID("bfb9923c-4838-4d2d-bf07-608c5b1165c8"); // public static readonly UUID DEFAULT_ALPHA_ITEM = new UUID("bfb9923c-4838-4d2d-bf07-608c5b1165c8");
// public static readonly UUID DEFAULT_ALPHA_ASSET = new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594"); // public static readonly UUID DEFAULT_ALPHA_ASSET = new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594");
@ -240,6 +245,9 @@ namespace OpenSim.Framework
// Pants // Pants
defaultWearables[PANTS].Add(DEFAULT_PANTS_ITEM, DEFAULT_PANTS_ASSET); defaultWearables[PANTS].Add(DEFAULT_PANTS_ITEM, DEFAULT_PANTS_ASSET);
// Eyes
defaultWearables[EYES].Add(DEFAULT_EYES_ITEM, DEFAULT_EYES_ASSET);
// // Alpha // // Alpha
// defaultWearables[ALPHA].Add(DEFAULT_ALPHA_ITEM, DEFAULT_ALPHA_ASSET); // defaultWearables[ALPHA].Add(DEFAULT_ALPHA_ITEM, DEFAULT_ALPHA_ASSET);

4
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@ -182,8 +182,8 @@ namespace OpenSim.Services.InventoryService
defaultEyes.AssetType = (int)AssetType.Bodypart; defaultEyes.AssetType = (int)AssetType.Bodypart;
defaultEyes.InvType = (int)InventoryType.Wearable; defaultEyes.InvType = (int)InventoryType.Wearable;
defaultEyes.Flags = (uint)WearableType.Eyes; defaultEyes.Flags = (uint)WearableType.Eyes;
defaultEyes.ID = UUID.Random(); defaultEyes.ID = AvatarWearable.DEFAULT_EYES_ITEM;
defaultEyes.AssetID = UUID.Parse("6522e74d-1660-4e7f-b601-6f48c1659a77"); defaultEyes.AssetID = AvatarWearable.DEFAULT_EYES_ASSET;
defaultEyes.Folder = bodypartFolder.ID; defaultEyes.Folder = bodypartFolder.ID;
defaultEyes.CreatorId = UUID.Zero.ToString(); defaultEyes.CreatorId = UUID.Zero.ToString();
AddItem(defaultEyes); AddItem(defaultEyes);