aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorUbitUmarov2015-11-18 17:45:56 +0000
committerUbitUmarov2015-11-18 17:45:56 +0000
commita4ed111de1d86091cc4d151ec18191b175b6a6f4 (patch)
tree318190a3080b5ea2a2f024320d7e573d2337e395 /OpenSim/Region/CoreModules/Avatar
parent fix another variable number of wearable types issue (diff)
downloadopensim-SC_OLD-a4ed111de1d86091cc4d151ec18191b175b6a6f4.zip
opensim-SC_OLD-a4ed111de1d86091cc4d151ec18191b175b6a6f4.tar.gz
opensim-SC_OLD-a4ed111de1d86091cc4d151ec18191b175b6a6f4.tar.bz2
opensim-SC_OLD-a4ed111de1d86091cc4d151ec18191b175b6a6f4.tar.xz
cleanup indentation
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs100
1 files changed, 30 insertions, 70 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 21b6789..bbea181 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -1086,85 +1086,45 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
1086 { 1086 {
1087 UUID newInvItem = UUID.Random(); 1087 UUID newInvItem = UUID.Random();
1088 InventoryItemBase itembase = new InventoryItemBase(newInvItem, userID) 1088 InventoryItemBase itembase = new InventoryItemBase(newInvItem, userID)
1089 { 1089 {
1090 AssetID = 1090 AssetID = defaultwearable,
1091 defaultwearable, 1091 AssetType = (int)FolderType.BodyPart,
1092 AssetType 1092 CreatorId = userID.ToString(),
1093 = 1093 //InvType = (int)InventoryType.Wearable,
1094 (int) 1094 Description = "Failed Wearable Replacement",
1095 FolderType 1095 Folder = invService.GetFolderForType(userID, FolderType.BodyPart).ID,
1096 .BodyPart, 1096 Flags = (uint) type, Name = Enum.GetName(typeof (WearableType), type),
1097 CreatorId 1097 BasePermissions = (uint) PermissionMask.Copy,
1098 = 1098 CurrentPermissions = (uint) PermissionMask.Copy,
1099 userID 1099 EveryOnePermissions = (uint) PermissionMask.Copy,
1100 .ToString 1100 GroupPermissions = (uint) PermissionMask.Copy,
1101 (), 1101 NextPermissions = (uint) PermissionMask.Copy
1102 //InvType = (int)InventoryType.Wearable, 1102 };
1103
1104 Description
1105 =
1106 "Failed Wearable Replacement",
1107 Folder =
1108 invService
1109 .GetFolderForType
1110 (userID,
1111 FolderType
1112 .BodyPart)
1113 .ID,
1114 Flags = (uint) type,
1115 Name = Enum.GetName(typeof (WearableType), type),
1116 BasePermissions = (uint) PermissionMask.Copy,
1117 CurrentPermissions = (uint) PermissionMask.Copy,
1118 EveryOnePermissions = (uint) PermissionMask.Copy,
1119 GroupPermissions = (uint) PermissionMask.Copy,
1120 NextPermissions = (uint) PermissionMask.Copy
1121 };
1122 invService.AddItem(itembase); 1103 invService.AddItem(itembase);
1123 UUID LinkInvItem = UUID.Random(); 1104 UUID LinkInvItem = UUID.Random();
1124 itembase = new InventoryItemBase(LinkInvItem, userID) 1105 itembase = new InventoryItemBase(LinkInvItem, userID)
1125 { 1106 {
1126 AssetID = 1107 AssetID = newInvItem,
1127 newInvItem, 1108 AssetType = (int)AssetType.Link,
1128 AssetType 1109 CreatorId = userID.ToString(),
1129 = 1110 InvType = (int) InventoryType.Wearable,
1130 (int) 1111 Description = "Failed Wearable Replacement",
1131 AssetType 1112 Folder = invService.GetFolderForType(userID, FolderType.CurrentOutfit).ID,
1132 .Link, 1113 Flags = (uint) type,
1133 CreatorId 1114 Name = Enum.GetName(typeof (WearableType), type),
1134 = 1115 BasePermissions = (uint) PermissionMask.Copy,
1135 userID 1116 CurrentPermissions = (uint) PermissionMask.Copy,
1136 .ToString 1117 EveryOnePermissions = (uint) PermissionMask.Copy,
1137 (), 1118 GroupPermissions = (uint) PermissionMask.Copy,
1138 InvType = (int) InventoryType.Wearable, 1119 NextPermissions = (uint) PermissionMask.Copy
1139 1120 };
1140 Description
1141 =
1142 "Failed Wearable Replacement",
1143 Folder =
1144 invService
1145 .GetFolderForType
1146 (userID,
1147 FolderType
1148 .CurrentOutfit)
1149 .ID,
1150 Flags = (uint) type,
1151 Name = Enum.GetName(typeof (WearableType), type),
1152 BasePermissions = (uint) PermissionMask.Copy,
1153 CurrentPermissions = (uint) PermissionMask.Copy,
1154 EveryOnePermissions = (uint) PermissionMask.Copy,
1155 GroupPermissions = (uint) PermissionMask.Copy,
1156 NextPermissions = (uint) PermissionMask.Copy
1157 };
1158 invService.AddItem(itembase); 1121 invService.AddItem(itembase);
1159 appearance.Wearables[(int)type] = new AvatarWearable(newInvItem, GetDefaultItem(type)); 1122 appearance.Wearables[(int)type] = new AvatarWearable(newInvItem, GetDefaultItem(type));
1160 ScenePresence presence = null; 1123 ScenePresence presence = null;
1161 if (m_scene.TryGetScenePresence(userID, out presence)) 1124 if (m_scene.TryGetScenePresence(userID, out presence))
1162 { 1125 {
1163 m_scene.SendInventoryUpdate(presence.ControllingClient, 1126 m_scene.SendInventoryUpdate(presence.ControllingClient,
1164 invService.GetFolderForType(userID, 1127 invService.GetFolderForType(userID, FolderType.CurrentOutfit), false, true);
1165 FolderType
1166 .CurrentOutfit),
1167 false, true);
1168 } 1128 }
1169 } 1129 }
1170 } 1130 }