aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-02-12 21:32:03 +0000
committerJustin Clark-Casey (justincc)2010-02-12 21:32:03 +0000
commit802a969267da9ed2780ea66c736c3d531e336dfa (patch)
tree85b088d4e9b4cf3dbb800845a27cf8f42e6e4094 /OpenSim/Region/Framework/Scenes
parentAdd missing refernce to prebuild (backport from presence-refactor) (diff)
downloadopensim-SC_OLD-802a969267da9ed2780ea66c736c3d531e336dfa.zip
opensim-SC_OLD-802a969267da9ed2780ea66c736c3d531e336dfa.tar.gz
opensim-SC_OLD-802a969267da9ed2780ea66c736c3d531e336dfa.tar.bz2
opensim-SC_OLD-802a969267da9ed2780ea66c736c3d531e336dfa.tar.xz
Fix http://opensimulator.org/mantis/view.php?id=4224
This resolves the problem where eyes and hair would turn white on standalone configurations When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it. This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white. This bug did not affect grids since they use a different service connector.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ddebd0b..2909311 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3120,7 +3120,6 @@ namespace OpenSim.Region.Framework.Scenes
3120 m_log.DebugFormat("[APPEARANCE]: Appearance not found in {0}, returning default", RegionInfo.RegionName); 3120 m_log.DebugFormat("[APPEARANCE]: Appearance not found in {0}, returning default", RegionInfo.RegionName);
3121 appearance = new AvatarAppearance(client.AgentId); 3121 appearance = new AvatarAppearance(client.AgentId);
3122 } 3122 }
3123
3124 } 3123 }
3125 3124
3126 /// <summary> 3125 /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6b95624..9c7559b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2505,6 +2505,8 @@ namespace OpenSim.Region.Framework.Scenes
2505 /// </summary> 2505 /// </summary>
2506 public void SendWearables() 2506 public void SendWearables()
2507 { 2507 {
2508 m_log.DebugFormat("[SCENE]: Received request for wearables of {0}", Name);
2509
2508 ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); 2510 ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
2509 } 2511 }
2510 2512