OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
UbitUmarov 2012-02-25 17:51:12 +00:00
parent efbfa832bb 5eb1679367
commit 7b6649177e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -551,12 +551,17 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
/// <param name="client"></param> /// <param name="client"></param>
private void Client_OnRequestWearables(IClientAPI client) private void Client_OnRequestWearables(IClientAPI client)
{ {
Util.FireAndForget(delegate(object x)
{
Thread.Sleep(2000);
// m_log.DebugFormat("[AVFACTORY]: Client_OnRequestWearables called for {0} ({1})", client.Name, client.AgentId); // m_log.DebugFormat("[AVFACTORY]: Client_OnRequestWearables called for {0} ({1})", client.Name, client.AgentId);
ScenePresence sp = m_scene.GetScenePresence(client.AgentId); ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
if (sp != null) if (sp != null)
client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++); client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
else else
m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId); m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
});
} }
/// <summary> /// <summary>

1
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1000,7 +1000,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
if (wasChild)
SendAvatarDataToAllAgents(); SendAvatarDataToAllAgents();
// send the animations of the other presences to me // send the animations of the other presences to me