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

Merge branch 'prephysics' into dev

dsg
Dan Lake 2011-01-19 13:06:28 -08:00
parent 7a1a21cd15 b02d3090b3
commit e9e36e2964
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,16 +282,21 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
m_log.DebugFormat("[AVFACTORY]: FireAndForget called for RefreshAppearance on agentid {0}", agentid); m_log.DebugFormat("[AVFACTORY]: FireAndForget called for RefreshAppearance on agentid {0}", agentid);
Util.FireAndForget(delegate(object o) Util.FireAndForget(delegate(object o)
{ {
int trycount = 20; int maxtries = 10;
int trycount = maxtries;
int interval = 5000;
ScenePresence sp; ScenePresence sp;
while (!m_scene.TryGetScenePresence(agentid, out sp)) while (!m_scene.TryGetScenePresence(agentid, out sp))
{ {
m_log.WarnFormat("[AVFACTORY]: RefreshAppearance unable to find presence for {0}", agentid); //m_log.WarnFormat("[AVFACTORY]: RefreshAppearance unable to find presence for {0}", agentid);
Thread.Sleep(500); Thread.Sleep(interval);
if (trycount-- <= 0) if (trycount-- <= 0)
{
m_log.ErrorFormat("[AVFACTORY]: RefreshAppearance unable to find presence for {0} after {1} attempts at {2}ms intervals", agentid, maxtries, interval);
return; return;
}
} }
trycount = 5; trycount = maxtries;
AvatarAppearance appearance = null; AvatarAppearance appearance = null;
while (appearance == null) while (appearance == null)
{ {
@ -303,11 +308,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
{ {
if (trycount-- <= 0) if (trycount-- <= 0)
{ {
m_log.WarnFormat("[AVFACTORY]: RefreshAppearance failed to get appearance from AvatarService: {0}", e.Message); m_log.WarnFormat("[AVFACTORY]: RefreshAppearance unable to get appearance from AvatarService for {0} after {1} attempts at {2}ms intervals: {3}", agentid, maxtries, interval, e.Message);
return; return;
} }
} }
Thread.Sleep(500); Thread.Sleep(interval);
} }
if (appearance.Texture != null && appearance.VisualParams != null) if (appearance.Texture != null && appearance.VisualParams != null)

2
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@ -253,7 +253,7 @@ namespace OpenSim.Services.Connectors.Simulation
public bool UpdateAgent(GridRegion destination, AgentPosition data) public bool UpdateAgent(GridRegion destination, AgentPosition data)
{ {
return UpdateAgent(destination, (IAgentData)data); return false; //UpdateAgent(destination, (IAgentData)data);
} }
private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) private bool UpdateAgent(GridRegion destination, IAgentData cAgentData)