Merge branch 'master' into vehicles

author: Melanie 2009-10-02 19:04:46 +0100
committer: Melanie 2009-10-02 19:04:46 +0100
commit: 46955f42608ceb2b76731432f536e04e85521a12 (patch)
tree: 37e8591bd95de33ad0c485626c6f40f7d4bd91b5 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parent: Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... (diff)
parent: Added a default for grid services in standalone. (diff)
download: opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.zip
opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.tar.gz
opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.tar.bz2
opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.tar.xz
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9f44f92..be8a6c9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1327,15 +1327,15 @@ namespace OpenSim.Region.Framework.Scenes
                    ILandObject parcel = m_scene.LandChannel.GetLandObject(
                            m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
-                    if (parcel != null && parcel.landData != null &&
+                    if (parcel != null && parcel.LandData != null &&
-                            parcel.landData.OtherCleanTime != 0)
+                            parcel.LandData.OtherCleanTime != 0)
                    {
-                        if (parcel.landData.OwnerID != OwnerID &&
+                        if (parcel.LandData.OwnerID != OwnerID &&
-                                (parcel.landData.GroupID != GroupID ||
+                                (parcel.LandData.GroupID != GroupID ||
-                                parcel.landData.GroupID == UUID.Zero))
+                                parcel.LandData.GroupID == UUID.Zero))
                        {
                            if ((DateTime.Now - RootPart.Rezzed).TotalMinutes >
-                                    parcel.landData.OtherCleanTime)
+                                    parcel.LandData.OtherCleanTime)
                            {
                                DetachFromBackup();
                                m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());
author	Melanie	2009-10-02 19:04:46 +0100
committer	Melanie	2009-10-02 19:04:46 +0100
commit	46955f42608ceb2b76731432f536e04e85521a12 (patch)
tree	37e8591bd95de33ad0c485626c6f40f7d4bd91b5 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parent	Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... (diff)
parent	Added a default for grid services in standalone. (diff)
download	opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.zip opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.tar.gz opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.tar.bz2 opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 9f44f92..be8a6c9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1327,15 +1327,15 @@ namespace OpenSim.Region.Framework.Scenes
1327	ILandObject parcel = m_scene.LandChannel.GetLandObject(	1327	ILandObject parcel = m_scene.LandChannel.GetLandObject(
1328	m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);	1328	m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
1329		1329
1330	if (parcel != null && parcel.landData != null &&	1330	if (parcel != null && parcel.LandData != null &&
1331	parcel.landData.OtherCleanTime != 0)	1331	parcel.LandData.OtherCleanTime != 0)
1332	{	1332	{
1333	if (parcel.landData.OwnerID != OwnerID &&	1333	if (parcel.LandData.OwnerID != OwnerID &&
1334	(parcel.landData.GroupID != GroupID \|\|	1334	(parcel.LandData.GroupID != GroupID \|\|
1335	parcel.landData.GroupID == UUID.Zero))	1335	parcel.LandData.GroupID == UUID.Zero))
1336	{	1336	{
1337	if ((DateTime.Now - RootPart.Rezzed).TotalMinutes >	1337	if ((DateTime.Now - RootPart.Rezzed).TotalMinutes >
1338	parcel.landData.OtherCleanTime)	1338	parcel.LandData.OtherCleanTime)
1339	{	1339	{
1340	DetachFromBackup();	1340	DetachFromBackup();
1341	m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());	1341	m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());