Merge branch '0.6.9-post-fixes' into careminster

author: Melanie 2010-06-07 05:23:52 +0100
committer: Melanie 2010-06-07 05:23:52 +0100
commit: cc2622660bad93ef46844476e434b6640a3a3643 (patch)
tree: aa0b0f36bcbfb9bd44fe396e1cd98f8de26f2255 /OpenSim/Region/CoreModules
parent: Gosh, fixing another nullref issue in cmGetAvatarList. I deserve spanks. (diff)
parent: Revert "commit code which stops full updates being fired multiple times when ... (diff)
download: opensim-SC_OLD-cc2622660bad93ef46844476e434b6640a3a3643.zip
opensim-SC_OLD-cc2622660bad93ef46844476e434b6640a3a3643.tar.gz
opensim-SC_OLD-cc2622660bad93ef46844476e434b6640a3a3643.tar.bz2
opensim-SC_OLD-cc2622660bad93ef46844476e434b6640a3a3643.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
index 4abc215..d68c683 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
            {
                if (s.RegionInfo.RegionHandle == regionHandle)
                {
-                    m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
+                    //m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
                    if (isLocalCall)
                    {
                        // We need to make a local copy of the object
author	Melanie	2010-06-07 05:23:52 +0100
committer	Melanie	2010-06-07 05:23:52 +0100
commit	cc2622660bad93ef46844476e434b6640a3a3643 (patch)
tree	aa0b0f36bcbfb9bd44fe396e1cd98f8de26f2255 /OpenSim/Region/CoreModules
parent	Gosh, fixing another nullref issue in cmGetAvatarList. I deserve spanks. (diff)
parent	Revert "commit code which stops full updates being fired multiple times when ... (diff)
download	opensim-SC_OLD-cc2622660bad93ef46844476e434b6640a3a3643.zip opensim-SC_OLD-cc2622660bad93ef46844476e434b6640a3a3643.tar.gz opensim-SC_OLD-cc2622660bad93ef46844476e434b6640a3a3643.tar.bz2 opensim-SC_OLD-cc2622660bad93ef46844476e434b6640a3a3643.tar.xz

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs index 4abc215..d68c683 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
260	{	260	{
261	if (s.RegionInfo.RegionHandle == regionHandle)	261	if (s.RegionInfo.RegionHandle == regionHandle)
262	{	262	{
263	m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");	263	//m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
264	if (isLocalCall)	264	if (isLocalCall)
265	{	265	{
266	// We need to make a local copy of the object	266	// We need to make a local copy of the object