diff options
author | Sean Dague | 2008-05-22 20:07:31 +0000 |
---|---|---|
committer | Sean Dague | 2008-05-22 20:07:31 +0000 |
commit | 1c49752a44e3ee251cf1422072088e27d0cc8408 (patch) | |
tree | 5d8821407409b314f806da9fb50429625fb6f538 /OpenSim/Region/Environment | |
parent | change to how initial terrain data is sent. Instead of sending the 64 packets... (diff) | |
download | opensim-SC_OLD-1c49752a44e3ee251cf1422072088e27d0cc8408.zip opensim-SC_OLD-1c49752a44e3ee251cf1422072088e27d0cc8408.tar.gz opensim-SC_OLD-1c49752a44e3ee251cf1422072088e27d0cc8408.tar.bz2 opensim-SC_OLD-1c49752a44e3ee251cf1422072088e27d0cc8408.tar.xz |
don't trust appearance assetid, instead do an inventory
lookup any time we get it from the server. This should
preventent unwearable appearance.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 231c0dc..729fd9a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1801,8 +1801,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1801 | !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) | 1801 | !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) |
1802 | { | 1802 | { |
1803 | // not found Appearance | 1803 | // not found Appearance |
1804 | m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis"); | 1804 | m_log.Warn("[APPEARANCE]: Appearance not found, creating default"); |
1805 | appearance = new AvatarAppearance(); | ||
1806 | } | 1805 | } |
1807 | } | 1806 | } |
1808 | 1807 | ||
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 1aa800a..0dbd6dd 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1466,11 +1466,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
1466 | { | 1466 | { |
1467 | m_log.Info("[APPEARANCE] Sending Own Appearance"); | 1467 | m_log.Info("[APPEARANCE] Sending Own Appearance"); |
1468 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); | 1468 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
1469 | ControllingClient.SendAppearance( | 1469 | // ControllingClient.SendAppearance( |
1470 | m_appearance.Owner, | 1470 | // m_appearance.Owner, |
1471 | m_appearance.VisualParams, | 1471 | // m_appearance.VisualParams, |
1472 | m_appearance.Texture.ToBytes() | 1472 | // m_appearance.Texture.ToBytes() |
1473 | ); | 1473 | // ); |
1474 | } | 1474 | } |
1475 | 1475 | ||
1476 | /// <summary> | 1476 | /// <summary> |