Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
author: Melanie 2011-10-11 21:21:44 +0100
committer: Melanie 2011-10-11 21:21:44 +0100
commit: cc1fe354d01f68add960944ea9ac3cd2feba4c7d (patch)
tree: e56f163d2ced85420137a811701c153c43f6a5e3 /OpenSim/Region/ClientStack/Linden
parent: Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge (diff)
parent: refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... (diff)
download: opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.zip
opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.gz
opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.bz2
opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index db81fea..37024fd 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4173,8 +4173,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            while (updatesThisCall < m_maxUpdates)
            {
                lock (m_entityProps.SyncRoot)
-                        if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue))
+                    if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue))
-                            break;
+                        break;
                ObjectPropertyUpdate update = (ObjectPropertyUpdate)iupdate;
                if (update.SendFamilyProps)
author	Melanie	2011-10-11 21:21:44 +0100
committer	Melanie	2011-10-11 21:21:44 +0100
commit	cc1fe354d01f68add960944ea9ac3cd2feba4c7d (patch)
tree	e56f163d2ced85420137a811701c153c43f6a5e3 /OpenSim/Region/ClientStack/Linden
parent	Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge (diff)
parent	refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... (diff)
download	opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.zip opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.gz opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.bz2 opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.xz

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index db81fea..37024fd 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4173,8 +4173,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4173	while (updatesThisCall < m_maxUpdates)	4173	while (updatesThisCall < m_maxUpdates)
4174	{	4174	{
4175	lock (m_entityProps.SyncRoot)	4175	lock (m_entityProps.SyncRoot)
4176	if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue))	4176	if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue))
4177	break;	4177	break;
4178		4178
4179	ObjectPropertyUpdate update = (ObjectPropertyUpdate)iupdate;	4179	ObjectPropertyUpdate update = (ObjectPropertyUpdate)iupdate;
4180	if (update.SendFamilyProps)	4180	if (update.SendFamilyProps)