From 9f5c2acd128828d220bf7e47bd4fe13d7a2a910b Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 23 Nov 2009 11:26:06 +0900
Subject: Formatting cleanup.
---
.../Scenes/Animation/ScenePresenceAnimator.cs | 22 +++++++++++-----------
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 +++++-----
.../Framework/Scenes/Tests/UuidGathererTests.cs | 4 ++--
3 files changed, 18 insertions(+), 18 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index cbe4118..2e4c260 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
/// Handle all animation duties for a scene presence
///
public class ScenePresenceAnimator
- {
+ {
public AnimationSet Animations
{
get { return m_animations; }
@@ -53,19 +53,19 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{
get { return m_movementAnimation; }
}
- protected string m_movementAnimation = "DEFAULT";
+ protected string m_movementAnimation = "DEFAULT";
private int m_animTickFall;
- private int m_animTickJump;
+ private int m_animTickJump;
///
/// The scene presence that this animator applies to
///
- protected ScenePresence m_scenePresence;
+ protected ScenePresence m_scenePresence;
public ScenePresenceAnimator(ScenePresence sp)
{
- m_scenePresence = sp;
+ m_scenePresence = sp;
}
public void AddAnimation(UUID animID, UUID objectID)
@@ -110,11 +110,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
return;
RemoveAnimation(animID);
- }
+ }
public void ResetAnimations()
{
- m_animations.Clear();
+ m_animations.Clear();
}
///
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero))
{
// 16384 is CHANGED_ANIMATION
- m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 });
+ m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 });
SendAnimPack();
}
}
@@ -305,7 +305,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
#endregion Ground Movement
return m_movementAnimation;
- }
+ }
///
/// Update the movement animation of this avatar according to its current state
@@ -391,7 +391,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
m_scenePresence.Scene.AssetService.Store(Animasset);
AddAnimation(Animasset.FullID, m_scenePresence.UUID);
return anim;
- }
+ }
///
///
@@ -443,6 +443,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation
m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs);
SendAnimPack(animIDs, sequenceNums, objectIDs);
- }
+ }
}
}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d23d303..5604e3d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -247,7 +247,7 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Script engines present in the scene
///
- private IScriptModule[] m_scriptEngines;
+ private IScriptModule[] m_scriptEngines;
#region Properties
@@ -674,7 +674,7 @@ namespace OpenSim.Region.Framework.Scenes
AvatarWearable[] wearables)
: this(client, world, reginfo)
{
- m_appearance = new AvatarAppearance(m_uuid, wearables, visualParams);
+ m_appearance = new AvatarAppearance(m_uuid, wearables, visualParams);
}
public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance)
@@ -3052,7 +3052,7 @@ namespace OpenSim.Region.Framework.Scenes
public ScenePresence()
{
- m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
+ m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
CreateSceneViewer();
m_animator = new ScenePresenceAnimator(this);
}
@@ -3140,8 +3140,8 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
- }
- }
+ }
+ }
public bool CrossAttachmentsIntoNewRegion(ulong regionHandle, bool silent)
{
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index b68a044..a36c4db 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, AssetType.Object, foundAssetUuids);
// We count the uuid as gathered even if the asset itself is corrupt.
- Assert.That(foundAssetUuids.Count, Is.EqualTo(1));
+ Assert.That(foundAssetUuids.Count, Is.EqualTo(1));
}
///
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
TestHelper.InMethod();
- UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
+ UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
IDictionary foundAssetUuids = new Dictionary();
m_uuidGatherer.GatherAssetUuids(missingAssetUuid, AssetType.Object, foundAssetUuids);
--
cgit v1.1