aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorKitto Flora2010-02-12 14:08:32 -0500
committerKitto Flora2010-02-12 14:08:32 -0500
commit6a70349512a612948918db2f2f485e87b0bc87e6 (patch)
treebdbb11f3ec840c7a14402f0acdc302b04d5a0692 /OpenSim/Region/CoreModules/Avatar
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentResolve a merge issue (diff)
downloadopensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.zip
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.gz
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.bz2
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs6
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 35c59aa..144c8d1 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -115,7 +115,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
115 // client.OnAvatarNowWearing -= AvatarIsWearing; 115 // client.OnAvatarNowWearing -= AvatarIsWearing;
116 } 116 }
117 117
118
119 public void SetAppearanceAssets(UUID userID, ref AvatarAppearance appearance) 118 public void SetAppearanceAssets(UUID userID, ref AvatarAppearance appearance)
120 { 119 {
121 IInventoryService invService = m_scene.InventoryService; 120 IInventoryService invService = m_scene.InventoryService;
@@ -139,7 +138,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
139 } 138 }
140 else 139 else
141 { 140 {
142 m_log.ErrorFormat("[APPEARANCE]: Can't find inventory item {0}, setting to default", appearance.Wearables[i].ItemID); 141 m_log.ErrorFormat(
142 "[APPEARANCE]: Can't find inventory item {0} for {1}, setting to default",
143 appearance.Wearables[i].ItemID, (WearableType)i);
144
143 appearance.Wearables[i].AssetID = def.Wearables[i].AssetID; 145 appearance.Wearables[i].AssetID = def.Wearables[i].AssetID;
144 } 146 }
145 } 147 }