ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2009-06-10 04:28:56 +00:00
parent ca52c3ef26
commit a23d64dec1
61 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
View File

@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info )
public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info)
{
regionInfo = region_info;
osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret);
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Scenes
private string Report()
{
OSDMap args = new OSDMap(30);
//int time = Util.ToUnixTime( DateTime.Now );
//int time = Util.ToUnixTime(DateTime.Now);
args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/");
args["TimeZoneName"] = OSD.FromString(localZone);
args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours);

2
OpenSim/Region/Framework/Scenes/SceneManager.cs
View File

@@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes
public IJ2KDecoder j2kdecode;
private System.Threading.Thread thisthread;
public void run( object o)
public void run(object o)
{
for (int i=0;i<arrassets.Length;i++)
{

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -3325,7 +3325,7 @@ if (m_shape != null) {
bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0);
bool wasVD = VolumeDetectActive;
if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD) )
if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD))
{
return;
}
@@ -3477,7 +3477,7 @@ if (m_shape != null) {
}
else
{ // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
// (mumbles, well, at least if you have infinte CPU powers :-) )
// (mumbles, well, at least if you have infinte CPU powers :-))
if (this.PhysActor != null)
{
PhysActor.SetVolumeDetect(0);

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -2032,7 +2032,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID[] animIDs;
int[] sequenceNums;
UUID[] objectIDs;
m_animations.GetArrays( out animIDs, out sequenceNums, out objectIDs);
m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs);
return animIDs;
}

8
OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
View File

@@ -68,13 +68,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
entman.Add(sog);
found = (SceneObjectGroup)entman[obj1];
Assert.That(found.UUID ,Is.EqualTo(obj1) );
Assert.That(found.UUID ,Is.EqualTo(obj1));
found = (SceneObjectGroup)entman[li1];
Assert.That(found.UUID ,Is.EqualTo(obj1) );
Assert.That(found.UUID ,Is.EqualTo(obj1));
found = (SceneObjectGroup)entman[obj2];
Assert.That(found.UUID ,Is.EqualTo(obj2) );
Assert.That(found.UUID ,Is.EqualTo(obj2));
found = (SceneObjectGroup)entman[li2];
Assert.That(found.UUID ,Is.EqualTo(obj2) );
Assert.That(found.UUID ,Is.EqualTo(obj2));
entman.Remove(obj1);
entman.Remove(li2);