From 5910a49da6e16d6e3718fffad73c8a24efcec80d Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Tue, 10 Jun 2008 08:35:46 +0000
Subject: Update svn properties. Formatting cleanup.
---
.../Modules/World/Archiver/AssetsArchiver.cs | 13 +++----
.../Modules/World/Archiver/AssetsDearchiver.cs | 12 +++---
.../Region/Environment/Scenes/SceneObjectPart.cs | 44 ++++++----------------
3 files changed, 23 insertions(+), 46 deletions(-)
(limited to 'OpenSim/Region/Environment')
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
index 2a041dd..4f4a3c3 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
public class AssetsArchiver
{
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
///
/// Archive assets
@@ -99,15 +99,14 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
xtw.WriteElementString("inventory-type", asset.InvType.ToString());
xtw.WriteEndElement();
- }
-
+ }
}
xtw.WriteEndElement();
xtw.WriteEndDocument();
- archive.AddFile("assets.xml", sw.ToString());
+ archive.AddFile("assets.xml", sw.ToString());
}
///
@@ -118,7 +117,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{
// It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
//archive.AddDir("assets");
-
+
foreach (LLUUID uuid in m_assets.Keys)
{
AssetBase asset = m_assets[uuid];
@@ -140,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{
m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid);
}
- }
+ }
}
}
}
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
index 15a92e5..98364d3 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{
///
/// Dearchives assets
- ///
+ ///
public class AssetsDearchiver
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
protected AssetCache m_cache;
- public AssetsDearchiver(AssetCache cache)
+ public AssetsDearchiver(AssetCache cache)
{
m_cache = cache;
}
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
ResolveAssetData(assetFilename, data);
}
}
-
+
///
/// Add asset metadata xml
///
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
m_metadata = new Dictionary();
StringReader sr = new StringReader(xml);
- XmlTextReader reader = new XmlTextReader(sr);
+ XmlTextReader reader = new XmlTextReader(sr);
reader.ReadStartElement("assets");
reader.Read();
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
metadata.Name = reader.ReadElementString("name");
metadata.Description = reader.ReadElementString("description");
metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type"));
- metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type"));
+ metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type"));
m_metadata[filename] = metadata;
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{
foreach (string filename in m_assetDataAwaitingMetadata.Keys)
{
- ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]);
+ ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]);
}
}
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 2515122..42df746 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1391,7 +1391,6 @@ namespace OpenSim.Region.Environment.Scenes
// distance2 = (float)GetDistanceTo(q, iray.Origin);
//}
-
if (distance2 < returnresult.distance)
{
returnresult.distance = distance2;
@@ -1410,8 +1409,8 @@ namespace OpenSim.Region.Environment.Scenes
if (scaleComponent.y != 0) ScaleOffset = AXscale.y;
if (scaleComponent.z != 0) ScaleOffset = AXscale.z;
ScaleOffset = Math.Abs(ScaleOffset);
- Vector3 offset = (returnresult.normal * ScaleOffset);
- returnresult.ipoint = (AXpos + offset );
+ Vector3 offset = returnresult.normal * ScaleOffset;
+ returnresult.ipoint = AXpos + offset;
///pos = (intersectionpoint + offset);
}
@@ -1420,10 +1419,8 @@ namespace OpenSim.Region.Environment.Scenes
returnresult.normal = normals[i];
}
returnresult.AAfaceNormal = AAfacenormals[i];
-
}
}
-
}
return returnresult;
}
@@ -1443,8 +1440,8 @@ namespace OpenSim.Region.Environment.Scenes
//{
m_shape.State = (byte)AttachmentPoint;
//}
-
}
+
///
///
///
@@ -1472,7 +1469,6 @@ namespace OpenSim.Region.Environment.Scenes
if (m_parentGroup != null)
{
m_parentGroup.SetAxisRotation(axis, rotate);
-
}
}
@@ -1494,11 +1490,9 @@ namespace OpenSim.Region.Environment.Scenes
{
PhysActor.FloatOnWater = false;
}
-
}
}
-
public LLVector3 GetSitTargetPositionLL()
{
return new LLVector3(m_sitTargetPosition.x, m_sitTargetPosition.y, m_sitTargetPosition.z);
@@ -1544,7 +1538,6 @@ namespace OpenSim.Region.Environment.Scenes
return m_sitTargetAvatar;
}
-
public LLUUID GetRootPartUUID()
{
if (m_parentGroup != null)
@@ -1797,8 +1790,6 @@ namespace OpenSim.Region.Environment.Scenes
public void UpdatePrimFlags(ushort type, bool inUse, byte[] data)
{
-
-
//m_log.Info("TSomething1:" + ((type & (ushort)ExtraParamType.Something1) == (ushort)ExtraParamType.Something1));
//m_log.Info("TSomething2:" + ((type & (ushort)ExtraParamType.Something2) == (ushort)ExtraParamType.Something2));
//m_log.Info("TSomething3:" + ((type & (ushort)ExtraParamType.Something3) == (ushort)ExtraParamType.Something3));
@@ -1814,7 +1805,6 @@ namespace OpenSim.Region.Environment.Scenes
//bool IsLocked = false;
int i = 0;
-
try
{
i += 46;
@@ -1858,7 +1848,6 @@ namespace OpenSim.Region.Environment.Scenes
}
}
-
if (IsPhantom)
{
AddFlag(LLObject.ObjectFlags.Phantom);
@@ -1927,6 +1916,7 @@ namespace OpenSim.Region.Environment.Scenes
// System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
ScheduleFullUpdate();
}
+
public void ScriptSetPhysicsStatus(bool UsePhysics)
{
if (m_parentGroup != null)
@@ -1934,6 +1924,7 @@ namespace OpenSim.Region.Environment.Scenes
m_parentGroup.ScriptSetPhysicsStatus(UsePhysics);
}
}
+
public void ScriptSetPhantomStatus(bool Phantom)
{
if (m_parentGroup != null)
@@ -1941,6 +1932,7 @@ namespace OpenSim.Region.Environment.Scenes
m_parentGroup.ScriptSetPhantomStatus(Phantom);
}
}
+
public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
{
if (PhysActor != null)
@@ -1965,7 +1957,6 @@ namespace OpenSim.Region.Environment.Scenes
/// that's not wholesome. Had to make Scene public
//PhysActor = null;
-
if ((ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
{
//PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
@@ -1989,7 +1980,6 @@ namespace OpenSim.Region.Environment.Scenes
PhysActor.link(ParentGroup.RootPart.PhysActor);
}
}
-
}
}
}
@@ -2029,7 +2019,6 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
-
}
#endregion
@@ -2394,7 +2383,6 @@ namespace OpenSim.Region.Environment.Scenes
}
}
-
public void AddFullUpdateToAvatar(ScenePresence presence)
{
presence.QueuePartForUpdate(this);
@@ -2454,13 +2442,11 @@ namespace OpenSim.Region.Environment.Scenes
}
}
-
byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
- remoteClient.SendPrimitiveToClient(
- m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
- lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid,
- OwnerID,
- m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
+ remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
+ lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, OwnerID,
+ m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment,
+ m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
}
/// Terse updates
@@ -2557,7 +2543,6 @@ namespace OpenSim.Region.Environment.Scenes
m_parentGroup.AbsolutePosition = newpos;
return;
}
-
}
ScheduleTerseUpdate();
@@ -2578,7 +2563,6 @@ namespace OpenSim.Region.Environment.Scenes
{
}
-
public void SetText(string text)
{
Text = text;
@@ -2724,7 +2708,6 @@ namespace OpenSim.Region.Environment.Scenes
info.AddValue("PayPrice", PayPrice);
}
-
public void Undo()
{
if (m_undo.Count > 0)
@@ -2837,10 +2820,9 @@ namespace OpenSim.Region.Environment.Scenes
else
ScheduleFullUpdate();
}
+
public void PhysicsCollision(EventArgs e)
{
- //return;
-
// single threaded here
if (e == null)
{
@@ -2865,7 +2847,6 @@ namespace OpenSim.Region.Environment.Scenes
startedColliders.Add(localid);
}
-
//m_log.Debug("[OBJECT]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
}
}
@@ -2878,7 +2859,6 @@ namespace OpenSim.Region.Environment.Scenes
endedColliders.Add(localID);
}
}
-
//add the items that started colliding this time to the last colliders list.
foreach (uint localID in startedColliders)
@@ -2944,7 +2924,6 @@ namespace OpenSim.Region.Environment.Scenes
colliding.Add(detobj);
}
}
-
}
}
}
@@ -2958,7 +2937,6 @@ namespace OpenSim.Region.Environment.Scenes
return;
m_parentGroup.Scene.EventManager.TriggerScriptCollidingStart(LocalId, StartCollidingMessage);
}
-
}
}
if ((m_parentGroup.RootPart.ScriptEvents & scriptEvents.collision) != 0)
--
cgit v1.1