aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2010-02-08 21:54:26 +0000
committerMelanie2010-02-08 21:54:26 +0000
commit1d75ad9fd55ad11134ef55aa3b8bebb3206cc1a5 (patch)
tree01060376fedc86f605d0a41cd70a270979da3e6f /OpenSim/Region/CoreModules
parentConvert null presence data to a singleton as well. Standalone logins now work (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-1d75ad9fd55ad11134ef55aa3b8bebb3206cc1a5.zip
opensim-SC_OLD-1d75ad9fd55ad11134ef55aa3b8bebb3206cc1a5.tar.gz
opensim-SC_OLD-1d75ad9fd55ad11134ef55aa3b8bebb3206cc1a5.tar.bz2
opensim-SC_OLD-1d75ad9fd55ad11134ef55aa3b8bebb3206cc1a5.tar.xz
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules')
-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 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 }