diff options
Diffstat (limited to 'OpenSim/Region/Modules/AvatarFactory')
-rw-r--r-- | OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index 4c933d6..bac2252 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -101,7 +101,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
101 | else | 101 | else |
102 | { | 102 | { |
103 | // BUG: !? (Reduced from 5000 to 500 by Adam) | 103 | // BUG: !? (Reduced from 5000 to 500 by Adam) |
104 | Thread.Sleep(500); //why is this here? | 104 | Thread.Sleep(500); //why is this here? |
105 | 105 | ||
106 | //this is the first thread to request this appearance | 106 | //this is the first thread to request this appearance |
107 | //so let it check the db and if not found then create a default appearance | 107 | //so let it check the db and if not found then create a default appearance |
@@ -279,7 +279,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
279 | { | 279 | { |
280 | if (profile.RootFolder != null) | 280 | if (profile.RootFolder != null) |
281 | { | 281 | { |
282 | 282 | ||
283 | foreach (AvatarWearingArgs.Wearable wear in e.NowWearing) | 283 | foreach (AvatarWearingArgs.Wearable wear in e.NowWearing) |
284 | { | 284 | { |
285 | if (wear.Type < 13) | 285 | if (wear.Type < 13) |
@@ -292,9 +292,9 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
292 | else | 292 | else |
293 | { | 293 | { |
294 | LLUUID assetId; | 294 | LLUUID assetId; |
295 | 295 | ||
296 | InventoryItemBase baseItem = profile.RootFolder.FindItem(wear.ItemID); | 296 | InventoryItemBase baseItem = profile.RootFolder.FindItem(wear.ItemID); |
297 | 297 | ||
298 | if (baseItem != null) | 298 | if (baseItem != null) |
299 | { | 299 | { |
300 | assetId = baseItem.AssetID; | 300 | assetId = baseItem.AssetID; |
diff --git a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs index a9fe53e..640b0b0 100644 --- a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Runtime.InteropServices; | 29 | using System.Runtime.InteropServices; |
30 | 30 | ||
31 | // General Information about an assembly is controlled through the following | 31 | // General information about an assembly is controlled through the following |
32 | // set of attributes. Change these attribute values to modify the information | 32 | // set of attributes. Change these attribute values to modify the information |
33 | // associated with an assembly. | 33 | // associated with an assembly. |
34 | [assembly: AssemblyTitle("OpenSim.Region.Modules.AvatarFactory")] | 34 | [assembly: AssemblyTitle("OpenSim.Region.Modules.AvatarFactory")] |
@@ -40,8 +40,8 @@ using System.Runtime.InteropServices; | |||
40 | [assembly: AssemblyTrademark("")] | 40 | [assembly: AssemblyTrademark("")] |
41 | [assembly: AssemblyCulture("")] | 41 | [assembly: AssemblyCulture("")] |
42 | 42 | ||
43 | // Setting ComVisible to false makes the types in this assembly not visible | 43 | // Setting ComVisible to false makes the types in this assembly not visible |
44 | // to COM components. If you need to access a type in this assembly from | 44 | // to COM components. If you need to access a type in this assembly from |
45 | // COM, set the ComVisible attribute to true on that type. | 45 | // COM, set the ComVisible attribute to true on that type. |
46 | [assembly: ComVisible(false)] | 46 | [assembly: ComVisible(false)] |
47 | 47 | ||
@@ -51,11 +51,11 @@ using System.Runtime.InteropServices; | |||
51 | // Version information for an assembly consists of the following four values: | 51 | // Version information for an assembly consists of the following four values: |
52 | // | 52 | // |
53 | // Major Version | 53 | // Major Version |
54 | // Minor Version | 54 | // Minor Version |
55 | // Build Number | 55 | // Build Number |
56 | // Revision | 56 | // Revision |
57 | // | 57 | // |
58 | // You can specify all the values or you can default the Build and Revision Numbers | 58 | // You can specify all the values or you can default the Build and Revision Numbers |
59 | // by using the '*' as shown below: | 59 | // by using the '*' as shown below: |
60 | // [assembly: AssemblyVersion("1.0.*")] | 60 | // [assembly: AssemblyVersion("1.0.*")] |
61 | [assembly: AssemblyVersion("1.0.0.0")] | 61 | [assembly: AssemblyVersion("1.0.0.0")] |