aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/AvatarFactory
diff options
context:
space:
mode:
authorMelanie2013-01-31 20:36:20 +0000
committerMelanie2013-01-31 20:36:20 +0000
commitcfa8e9cfa7a5896de07dde5516c0f3120cfe3227 (patch)
tree9a4db20385243426c480405f98deb9aaf0edc033 /OpenSim/Region/CoreModules/Avatar/AvatarFactory
parentMerge branch 'master' into careminster (diff)
parentChange keyframe motion to use a single timer for all objects. This is required (diff)
downloadopensim-SC_OLD-cfa8e9cfa7a5896de07dde5516c0f3120cfe3227.zip
opensim-SC_OLD-cfa8e9cfa7a5896de07dde5516c0f3120cfe3227.tar.gz
opensim-SC_OLD-cfa8e9cfa7a5896de07dde5516c0f3120cfe3227.tar.bz2
opensim-SC_OLD-cfa8e9cfa7a5896de07dde5516c0f3120cfe3227.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs23
1 files changed, 10 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 691326c..3c6bbe6 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -935,36 +935,33 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
935 } 935 }
936 private UUID GetDefaultItem(WearableType wearable) 936 private UUID GetDefaultItem(WearableType wearable)
937 { 937 {
938 // These are Urban male.. but it doesn't matter as long as the assets exist. 938 // These are ruth
939 UUID ret = UUID.Zero; 939 UUID ret = UUID.Zero;
940 switch (wearable) 940 switch (wearable)
941 { 941 {
942 case WearableType.Eyes: 942 case WearableType.Eyes:
943 ret = new UUID("46d7f979-c060-0ad6-5d3c-8de38c941c8d"); 943 ret = new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7");
944 break; 944 break;
945 case WearableType.Hair: 945 case WearableType.Hair:
946 ret = new UUID("21ae002d-57af-441a-81ff-86f5f674b9b9"); 946 ret = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
947 break; 947 break;
948 case WearableType.Pants: 948 case WearableType.Pants:
949 ret = new UUID("e3440698-48fd-41ac-af9b-f680547cbef2"); 949 ret = new UUID("00000000-38f9-1111-024e-222222111120");
950 break; 950 break;
951 case WearableType.Shape: 951 case WearableType.Shape:
952 ret = new UUID("7c1f1354-2aba-4e55-8357-1545c2c003ce"); 952 ret = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
953 break; 953 break;
954 case WearableType.Shirt: 954 case WearableType.Shirt:
955 ret = new UUID("f8fefa00-b019-4072-9c04-ff79c65348b9"); 955 ret = new UUID("00000000-38f9-1111-024e-222222111110");
956 break;
957 case WearableType.Shoes:
958 ret = new UUID("6455d2cf-0ee1-4c9a-9812-da03371bf719");
959 break; 956 break;
960 case WearableType.Skin: 957 case WearableType.Skin:
961 ret = new UUID("29c99e80-cf59-4fa0-9f8e-e4a1ccaf2fa3"); 958 ret = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb");
962 break; 959 break;
963 case WearableType.Socks: 960 case WearableType.Undershirt:
964 ret = new UUID("96472ac3-1e18-49e5-b2e4-17c03791ea96"); 961 ret = new UUID("16499ebb-3208-ec27-2def-481881728f47");
965 break; 962 break;
966 case WearableType.Underpants: 963 case WearableType.Underpants:
967 ret = new UUID("d6c7b174-8a2d-473f-a80f-3b7d7b7b3a96"); 964 ret = new UUID("4ac2e9c7-3671-d229-316a-67717730841d");
968 break; 965 break;
969 } 966 }
970 967