diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
2 files changed, 6 insertions, 5 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 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index bcf22c3..e960d51 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3184,8 +3184,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3184 | m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; | 3184 | m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; |
3185 | m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong | 3185 | m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong |
3186 | m_physicsActor.SubscribeEvents(500); | 3186 | m_physicsActor.SubscribeEvents(500); |
3187 | m_physicsActor.LocalID = LocalId; | 3187 | m_physicsActor.LocalID = LocalId; |
3188 | |||
3189 | } | 3188 | } |
3190 | 3189 | ||
3191 | private void OutOfBoundsCall(Vector3 pos) | 3190 | private void OutOfBoundsCall(Vector3 pos) |
@@ -3195,7 +3194,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3195 | 3194 | ||
3196 | //AddToPhysicalScene(flying); | 3195 | //AddToPhysicalScene(flying); |
3197 | if (ControllingClient != null) | 3196 | if (ControllingClient != null) |
3198 | ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.",true); | 3197 | ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true); |
3199 | } | 3198 | } |
3200 | 3199 | ||
3201 | // Event called by the physics plugin to tell the avatar about a collision. | 3200 | // Event called by the physics plugin to tell the avatar about a collision. |