Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
author: Melanie 2012-11-25 14:13:50 +0000
committer: Melanie 2012-11-25 14:13:50 +0000
commit: fd7a83f439132062d500471830eb26e7183d30bc (patch)
tree: db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
parent: Merge branch 'careminster' into avination (diff)
parent: Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download: opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.zip
opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz
opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2
opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 1193057..281c143 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1384,9 +1384,7 @@ namespace OpenSim.Region.CoreModules.World.Land
            }
            for (int i = 0; i < data.Count; i++)
-            {
                IncomingLandObjectFromStorage(data[i]);
-            }
        }
        public void IncomingLandObjectFromStorage(LandData data)
author	Melanie	2012-11-25 14:13:50 +0000
committer	Melanie	2012-11-25 14:13:50 +0000
commit	fd7a83f439132062d500471830eb26e7183d30bc (patch)
tree	db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
parent	Merge branch 'careminster' into avination (diff)
parent	Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download	opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.zip opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2 opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 1193057..281c143 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1384,9 +1384,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1384	}	1384	}
1385		1385
1386	for (int i = 0; i < data.Count; i++)	1386	for (int i = 0; i < data.Count; i++)
1387	{
1388	IncomingLandObjectFromStorage(data[i]);	1387	IncomingLandObjectFromStorage(data[i]);
1389	}
1390	}	1388	}
1391		1389
1392	public void IncomingLandObjectFromStorage(LandData data)	1390	public void IncomingLandObjectFromStorage(LandData data)