diff options
author | Jeff Ames | 2008-06-04 09:59:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-06-04 09:59:27 +0000 |
commit | 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch) | |
tree | cfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Region/Environment/Scenes | |
parent | * If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff) | |
download | opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2 opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz |
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneManager.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 3ed4eb2..4c9257d 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -627,7 +627,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
627 | #region Get Methods | 627 | #region Get Methods |
628 | 628 | ||
629 | /// <summary> | 629 | /// <summary> |
630 | /// Request a List of all scene presences in this scene. This is a new list, so no | 630 | /// Request a List of all scene presences in this scene. This is a new list, so no |
631 | /// locking is required to iterate over it. | 631 | /// locking is required to iterate over it. |
632 | /// </summary> | 632 | /// </summary> |
633 | /// <returns></returns> | 633 | /// <returns></returns> |
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> |
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index dc9ac37..8fee27f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs | |||
@@ -83,8 +83,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
83 | Dictionary<string, IRegionModule> sharedModules = new Dictionary<string, IRegionModule>(); | 83 | Dictionary<string, IRegionModule> sharedModules = new Dictionary<string, IRegionModule>(); |
84 | for (int i = 0; i < m_localScenes.Count; i++) | 84 | for (int i = 0; i < m_localScenes.Count; i++) |
85 | { | 85 | { |
86 | // extract known shared modules from scene | 86 | // extract known shared modules from scene |
87 | foreach(string k in m_localScenes[i].Modules.Keys) | 87 | foreach (string k in m_localScenes[i].Modules.Keys) |
88 | { | 88 | { |
89 | if (m_localScenes[i].Modules[k].IsSharedModule && | 89 | if (m_localScenes[i].Modules[k].IsSharedModule && |
90 | !sharedModules.ContainsKey(k)) | 90 | !sharedModules.ContainsKey(k)) |
@@ -96,7 +96,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
96 | 96 | ||
97 | // all regions/scenes are now closed, we can now safely | 97 | // all regions/scenes are now closed, we can now safely |
98 | // close all shared modules | 98 | // close all shared modules |
99 | foreach(IRegionModule mod in sharedModules.Values) | 99 | foreach (IRegionModule mod in sharedModules.Values) |
100 | { | 100 | { |
101 | mod.Close(); | 101 | mod.Close(); |
102 | } | 102 | } |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index de5da40..ce7497d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1048,7 +1048,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1048 | Vector3 normalpart = ipoint - vAbsolutePosition; | 1048 | Vector3 normalpart = ipoint - vAbsolutePosition; |
1049 | returnresult.normal = normalpart / normalpart.Length; | 1049 | returnresult.normal = normalpart / normalpart.Length; |
1050 | 1050 | ||
1051 | // It's funny how the LLVector3 object has a Distance function, but the Axiom.Math object doesnt. | 1051 | // It's funny how the LLVector3 object has a Distance function, but the Axiom.Math object doesn't. |
1052 | // I can write a function to do it.. but I like the fact that this one is Static. | 1052 | // I can write a function to do it.. but I like the fact that this one is Static. |
1053 | 1053 | ||
1054 | LLVector3 distanceConvert1 = new LLVector3(iray.Origin.x, iray.Origin.y, iray.Origin.z); | 1054 | LLVector3 distanceConvert1 = new LLVector3(iray.Origin.x, iray.Origin.y, iray.Origin.z); |