Merge branch 'master' into careminster

author: Melanie 2011-12-18 10:49:45 +0000
committer: Melanie 2011-12-18 10:49:45 +0000
commit: 759f1d2dbe0617786068195dfd695e0dfc2cc265 (patch)
tree: 8e6dcb6ba183abb16b4527376c5fd280693977bb /OpenSim/Region/RegionCombinerModule
parent: Make raycast more efficient by checking exclusion flags earlier (diff)
parent: Provide user feedback on execution of "backup" region console command (diff)
download: opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.zip
opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.gz
opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.bz2
opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index cf2f46a..3c36943 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Region.RegionCombinerModule
                    //xxy
                    //xxx
                    //xxx
-                    if ((((int)conn.X * (int)Constants.RegionSize) + conn.YEnd
+                    if ((((int)conn.X * (int)Constants.RegionSize) + conn.XEnd
                        >= (regionConnections.X * (int)Constants.RegionSize))
                        && (((int)conn.Y * (int)Constants.RegionSize) + conn.YEnd
                        >= (regionConnections.Y * (int)Constants.RegionSize)))
author	Melanie	2011-12-18 10:49:45 +0000
committer	Melanie	2011-12-18 10:49:45 +0000
commit	759f1d2dbe0617786068195dfd695e0dfc2cc265 (patch)
tree	8e6dcb6ba183abb16b4527376c5fd280693977bb /OpenSim/Region/RegionCombinerModule
parent	Make raycast more efficient by checking exclusion flags earlier (diff)
parent	Provide user feedback on execution of "backup" region console command (diff)
download	opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.zip opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.gz opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.bz2 opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.xz

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index cf2f46a..3c36943 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Region.RegionCombinerModule
333	//xxy	333	//xxy
334	//xxx	334	//xxx
335	//xxx	335	//xxx
336	if ((((int)conn.X * (int)Constants.RegionSize) + conn.YEnd	336	if ((((int)conn.X * (int)Constants.RegionSize) + conn.XEnd
337	>= (regionConnections.X * (int)Constants.RegionSize))	337	>= (regionConnections.X * (int)Constants.RegionSize))
338	&& (((int)conn.Y * (int)Constants.RegionSize) + conn.YEnd	338	&& (((int)conn.Y * (int)Constants.RegionSize) + conn.YEnd
339	>= (regionConnections.Y * (int)Constants.RegionSize)))	339	>= (regionConnections.Y * (int)Constants.RegionSize)))