Added checks for null circuit data in AddNewClient2. In the case of RegionSyncAvatars being added to the scene, there will be no circuit data, no appearance data, and no teleport flags.
parent
e709b55f01
commit
a7d4c974dd
|
@ -3036,10 +3036,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
m_clientManager.Add(client);
|
||||
SubscribeToClientEvents(client);
|
||||
|
||||
ScenePresence sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance);
|
||||
ScenePresence sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit == null ? null : aCircuit.Appearance);
|
||||
m_eventManager.TriggerOnNewPresence(sp);
|
||||
|
||||
//presence.initializeScenePresence(client, RegionInfo, this);
|
||||
if(aCircuit != null)
|
||||
sp.TeleportFlags = (TeleportFlags)aCircuit.teleportFlags;
|
||||
|
||||
// HERE!!! Do the initial attachments right here
|
||||
|
|
Loading…
Reference in New Issue