diff options
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index a0ff151..22c8937 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -110,7 +110,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
110 | // client.OnAvatarNowWearing -= AvatarIsWearing; | 110 | // client.OnAvatarNowWearing -= AvatarIsWearing; |
111 | } | 111 | } |
112 | 112 | ||
113 | |||
114 | public void SetAppearanceAssets(UUID userID, ref AvatarAppearance appearance) | 113 | public void SetAppearanceAssets(UUID userID, ref AvatarAppearance appearance) |
115 | { | 114 | { |
116 | IInventoryService invService = m_scene.InventoryService; | 115 | IInventoryService invService = m_scene.InventoryService; |
@@ -134,7 +133,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
134 | } | 133 | } |
135 | else | 134 | else |
136 | { | 135 | { |
137 | m_log.ErrorFormat("[APPEARANCE]: Can't find inventory item {0}, setting to default", appearance.Wearables[i].ItemID); | 136 | m_log.ErrorFormat( |
137 | "[APPEARANCE]: Can't find inventory item {0} for {1}, setting to default", | ||
138 | appearance.Wearables[i].ItemID, (WearableType)i); | ||
139 | |||
138 | appearance.Wearables[i].AssetID = def.Wearables[i].AssetID; | 140 | appearance.Wearables[i].AssetID = def.Wearables[i].AssetID; |
139 | } | 141 | } |
140 | } | 142 | } |