aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJeff Ames2008-06-04 09:59:27 +0000
committerJeff Ames2008-06-04 09:59:27 +0000
commit4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch)
treecfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Region/Environment/Scenes/Scene.cs
parent* If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff)
downloadopensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip
opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz
opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2
opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index c74dca4..e4fdc31 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1506,18 +1506,18 @@ namespace OpenSim.Region.Environment.Scenes
1506 1506
1507 CrossPrimGroupIntoNewRegion(newRegionHandle, grp); 1507 CrossPrimGroupIntoNewRegion(newRegionHandle, grp);
1508 } 1508 }
1509 1509
1510 public void CrossPrimGroupIntoNewRegion(ulong newRegionHandle, SceneObjectGroup grp) 1510 public void CrossPrimGroupIntoNewRegion(ulong newRegionHandle, SceneObjectGroup grp)
1511 { 1511 {
1512 int primcrossingXMLmethod = 0; 1512 int primcrossingXMLmethod = 0;
1513 if (newRegionHandle != 0) 1513 if (newRegionHandle != 0)
1514 { 1514 {
1515 bool successYN = false; 1515 bool successYN = false;
1516 1516
1517 successYN 1517 successYN
1518 = m_sceneGridService.PrimCrossToNeighboringRegion( 1518 = m_sceneGridService.PrimCrossToNeighboringRegion(
1519 newRegionHandle, grp.UUID, m_serialiser.SavePrimGroupToXML2String(grp), primcrossingXMLmethod); 1519 newRegionHandle, grp.UUID, m_serialiser.SavePrimGroupToXML2String(grp), primcrossingXMLmethod);
1520 1520
1521 if (successYN) 1521 if (successYN)
1522 { 1522 {
1523 // We remove the object here 1523 // We remove the object here
@@ -1550,7 +1550,7 @@ namespace OpenSim.Region.Environment.Scenes
1550 if (XMLMethod == 0) 1550 if (XMLMethod == 0)
1551 { 1551 {
1552 m_serialiser.LoadGroupFromXml2String(this, objXMLData); 1552 m_serialiser.LoadGroupFromXml2String(this, objXMLData);
1553 1553
1554 SceneObjectPart RootPrim = GetSceneObjectPart(primID); 1554 SceneObjectPart RootPrim = GetSceneObjectPart(primID);
1555 if (RootPrim != null) 1555 if (RootPrim != null)
1556 { 1556 {
@@ -2091,7 +2091,7 @@ namespace OpenSim.Region.Environment.Scenes
2091 m_log.InfoFormat("[USERLOGOFF]: Got a logoff request for {0} but the user isn't here. The user might already have been logged out", AvatarID.ToString()); 2091 m_log.InfoFormat("[USERLOGOFF]: Got a logoff request for {0} but the user isn't here. The user might already have been logged out", AvatarID.ToString());
2092 } 2092 }
2093 } 2093 }
2094 2094
2095 2095
2096 } 2096 }
2097 /// <summary> 2097 /// <summary>