aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2010-01-12 09:22:58 -0800
committerDiva Canto2010-01-12 09:22:58 -0800
commit66920a9047b54db947d02f252e17409b7fc32ef0 (patch)
tree8e5b34a510885183e400796616f224faceb4a142 /OpenSim/Region/Framework
parentFixed a couple of bugs with Appearance. Appearance is all good now. (diff)
downloadopensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.zip
opensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.tar.gz
opensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.tar.bz2
opensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.tar.xz
Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index db7b3ff..6c8068c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3708,8 +3708,8 @@ namespace OpenSim.Region.Framework.Scenes
3708 /// <returns>true if we handled it.</returns> 3708 /// <returns>true if we handled it.</returns>
3709 public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) 3709 public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData)
3710 { 3710 {
3711// m_log.DebugFormat( 3711 m_log.DebugFormat(
3712// "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); 3712 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
3713 3713
3714 // We have to wait until the viewer contacts this region after receiving EAC. 3714 // We have to wait until the viewer contacts this region after receiving EAC.
3715 // That calls AddNewClient, which finally creates the ScenePresence 3715 // That calls AddNewClient, which finally creates the ScenePresence
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ae586a1..c7a457e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2575,9 +2575,9 @@ namespace OpenSim.Region.Framework.Scenes
2575 if (m_appearance.AvatarHeight > 0) 2575 if (m_appearance.AvatarHeight > 0)
2576 SetHeight(m_appearance.AvatarHeight); 2576 SetHeight(m_appearance.AvatarHeight);
2577 2577
2578 AvatarData adata = new AvatarData(m_appearance); 2578 // This is not needed, because only the transient data changed
2579 2579 //AvatarData adata = new AvatarData(m_appearance);
2580 m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata); 2580 //m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata);
2581 2581
2582 SendAppearanceToAllOtherAgents(); 2582 SendAppearanceToAllOtherAgents();
2583 if (!m_startAnimationSet) 2583 if (!m_startAnimationSet)