diff options
Diffstat (limited to 'OpenSim/Region/Framework')
5 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs index d26385d..7c02f9a 100644 --- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs +++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
63 | 63 | ||
64 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 64 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
65 | 65 | ||
66 | public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info ) | 66 | public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info) |
67 | { | 67 | { |
68 | regionInfo = region_info; | 68 | regionInfo = region_info; |
69 | osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); | 69 | osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); |
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
95 | private string Report() | 95 | private string Report() |
96 | { | 96 | { |
97 | OSDMap args = new OSDMap(30); | 97 | OSDMap args = new OSDMap(30); |
98 | //int time = Util.ToUnixTime( DateTime.Now ); | 98 | //int time = Util.ToUnixTime(DateTime.Now); |
99 | args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); | 99 | args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); |
100 | args["TimeZoneName"] = OSD.FromString(localZone); | 100 | args["TimeZoneName"] = OSD.FromString(localZone); |
101 | args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours); | 101 | args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 72ed646..0019b23 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
645 | public IJ2KDecoder j2kdecode; | 645 | public IJ2KDecoder j2kdecode; |
646 | private System.Threading.Thread thisthread; | 646 | private System.Threading.Thread thisthread; |
647 | 647 | ||
648 | public void run( object o) | 648 | public void run(object o) |
649 | { | 649 | { |
650 | for (int i=0;i<arrassets.Length;i++) | 650 | for (int i=0;i<arrassets.Length;i++) |
651 | { | 651 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 4171d17..a9a150a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -3325,7 +3325,7 @@ if (m_shape != null) { | |||
3325 | bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0); | 3325 | bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0); |
3326 | bool wasVD = VolumeDetectActive; | 3326 | bool wasVD = VolumeDetectActive; |
3327 | 3327 | ||
3328 | if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD) ) | 3328 | if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD)) |
3329 | { | 3329 | { |
3330 | return; | 3330 | return; |
3331 | } | 3331 | } |
@@ -3477,7 +3477,7 @@ if (m_shape != null) { | |||
3477 | } | 3477 | } |
3478 | else | 3478 | else |
3479 | { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like | 3479 | { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like |
3480 | // (mumbles, well, at least if you have infinte CPU powers :-) ) | 3480 | // (mumbles, well, at least if you have infinte CPU powers :-)) |
3481 | if (this.PhysActor != null) | 3481 | if (this.PhysActor != null) |
3482 | { | 3482 | { |
3483 | PhysActor.SetVolumeDetect(0); | 3483 | PhysActor.SetVolumeDetect(0); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c3af40f..f4776e3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2032,7 +2032,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2032 | UUID[] animIDs; | 2032 | UUID[] animIDs; |
2033 | int[] sequenceNums; | 2033 | int[] sequenceNums; |
2034 | UUID[] objectIDs; | 2034 | UUID[] objectIDs; |
2035 | m_animations.GetArrays( out animIDs, out sequenceNums, out objectIDs); | 2035 | m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); |
2036 | return animIDs; | 2036 | return animIDs; |
2037 | } | 2037 | } |
2038 | 2038 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs index dae095f..bb8f27d 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs | |||
@@ -68,13 +68,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
68 | entman.Add(sog); | 68 | entman.Add(sog); |
69 | 69 | ||
70 | found = (SceneObjectGroup)entman[obj1]; | 70 | found = (SceneObjectGroup)entman[obj1]; |
71 | Assert.That(found.UUID ,Is.EqualTo(obj1) ); | 71 | Assert.That(found.UUID ,Is.EqualTo(obj1)); |
72 | found = (SceneObjectGroup)entman[li1]; | 72 | found = (SceneObjectGroup)entman[li1]; |
73 | Assert.That(found.UUID ,Is.EqualTo(obj1) ); | 73 | Assert.That(found.UUID ,Is.EqualTo(obj1)); |
74 | found = (SceneObjectGroup)entman[obj2]; | 74 | found = (SceneObjectGroup)entman[obj2]; |
75 | Assert.That(found.UUID ,Is.EqualTo(obj2) ); | 75 | Assert.That(found.UUID ,Is.EqualTo(obj2)); |
76 | found = (SceneObjectGroup)entman[li2]; | 76 | found = (SceneObjectGroup)entman[li2]; |
77 | Assert.That(found.UUID ,Is.EqualTo(obj2) ); | 77 | Assert.That(found.UUID ,Is.EqualTo(obj2)); |
78 | 78 | ||
79 | entman.Remove(obj1); | 79 | entman.Remove(obj1); |
80 | entman.Remove(li2); | 80 | entman.Remove(li2); |