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

Merge branch 'master' into bigmerge

avinationmerge
Melanie 2011-11-02 00:07:59 +00:00
parent b69f679122 3bead3eb50
commit 9a8715ec9a
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/SceneViewer.cs
View File

@ -83,8 +83,6 @@ namespace OpenSim.Region.Framework.Scenes
public void SendPrimUpdates() public void SendPrimUpdates()
{ {
if (m_pendingObjects == null) if (m_pendingObjects == null)
{
if (!m_presence.IsChildAgent)
{ {
m_pendingObjects = new Queue<SceneObjectGroup>(); m_pendingObjects = new Queue<SceneObjectGroup>();
@ -98,7 +96,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}
lock (m_pendingObjects) lock (m_pendingObjects)
{ {