diff options
Diffstat (limited to 'OpenSim/Region/Modules/AvatarFactory')
-rw-r--r-- | OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index 671b854..ab86d10 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | 31 | ||
32 | using System.Threading; | 32 | using System.Threading; |
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | using Nini.Config; | 35 | using Nini.Config; |
36 | using OpenSim.Data.Base; | 36 | using OpenSim.Data.Base; |
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
48 | private Scene m_scene = null; | 48 | private Scene m_scene = null; |
49 | private static readonly AvatarAppearance def = new AvatarAppearance(); | 49 | private static readonly AvatarAppearance def = new AvatarAppearance(); |
50 | 50 | ||
51 | public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance) | 51 | public bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance) |
52 | { | 52 | { |
53 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); | 53 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); |
54 | //if ((profile != null) && (profile.RootFolder != null)) | 54 | //if ((profile != null) && (profile.RootFolder != null)) |
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
69 | 69 | ||
70 | } | 70 | } |
71 | 71 | ||
72 | private AvatarAppearance CreateDefault(LLUUID avatarId) | 72 | private AvatarAppearance CreateDefault(UUID avatarId) |
73 | { | 73 | { |
74 | AvatarAppearance appearance = null; | 74 | AvatarAppearance appearance = null; |
75 | AvatarWearable[] wearables; | 75 | AvatarWearable[] wearables; |
@@ -127,13 +127,13 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
127 | { | 127 | { |
128 | for (int i = 0; i < 13; i++) | 128 | for (int i = 0; i < 13; i++) |
129 | { | 129 | { |
130 | if (appearance.Wearables[i].ItemID == LLUUID.Zero) | 130 | if (appearance.Wearables[i].ItemID == UUID.Zero) |
131 | { | 131 | { |
132 | appearance.Wearables[i].AssetID = LLUUID.Zero; | 132 | appearance.Wearables[i].AssetID = UUID.Zero; |
133 | } | 133 | } |
134 | else | 134 | else |
135 | { | 135 | { |
136 | // LLUUID assetId; | 136 | // UUID assetId; |
137 | 137 | ||
138 | InventoryItemBase baseItem = profile.RootFolder.FindItem(appearance.Wearables[i].ItemID); | 138 | InventoryItemBase baseItem = profile.RootFolder.FindItem(appearance.Wearables[i].ItemID); |
139 | 139 | ||
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
201 | wearables = AvatarWearable.DefaultWearables; | 201 | wearables = AvatarWearable.DefaultWearables; |
202 | } | 202 | } |
203 | 203 | ||
204 | public void UpdateDatabase(LLUUID user, AvatarAppearance appearance) | 204 | public void UpdateDatabase(UUID user, AvatarAppearance appearance) |
205 | { | 205 | { |
206 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance); | 206 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance); |
207 | } | 207 | } |