diff options
author | Jeff Ames | 2009-11-23 11:26:06 +0900 |
---|---|---|
committer | Jeff Ames | 2009-11-23 11:26:06 +0900 |
commit | 9f5c2acd128828d220bf7e47bd4fe13d7a2a910b (patch) | |
tree | bb1a273746c4b2a466dd705537a2457f0474faa2 /OpenSim/Region/Framework/Scenes | |
parent | * Added missing lock to m_forcelist when AddForce is called. When a user dr... (diff) | |
download | opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.zip opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.gz opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.bz2 opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
3 files changed, 18 insertions, 18 deletions
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 | |||
39 | /// Handle all animation duties for a scene presence | 39 | /// Handle all animation duties for a scene presence |
40 | /// </summary> | 40 | /// </summary> |
41 | public class ScenePresenceAnimator | 41 | public class ScenePresenceAnimator |
42 | { | 42 | { |
43 | public AnimationSet Animations | 43 | public AnimationSet Animations |
44 | { | 44 | { |
45 | get { return m_animations; } | 45 | get { return m_animations; } |
@@ -53,19 +53,19 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
53 | { | 53 | { |
54 | get { return m_movementAnimation; } | 54 | get { return m_movementAnimation; } |
55 | } | 55 | } |
56 | protected string m_movementAnimation = "DEFAULT"; | 56 | protected string m_movementAnimation = "DEFAULT"; |
57 | 57 | ||
58 | private int m_animTickFall; | 58 | private int m_animTickFall; |
59 | private int m_animTickJump; | 59 | private int m_animTickJump; |
60 | 60 | ||
61 | /// <value> | 61 | /// <value> |
62 | /// The scene presence that this animator applies to | 62 | /// The scene presence that this animator applies to |
63 | /// </value> | 63 | /// </value> |
64 | protected ScenePresence m_scenePresence; | 64 | protected ScenePresence m_scenePresence; |
65 | 65 | ||
66 | public ScenePresenceAnimator(ScenePresence sp) | 66 | public ScenePresenceAnimator(ScenePresence sp) |
67 | { | 67 | { |
68 | m_scenePresence = sp; | 68 | m_scenePresence = sp; |
69 | } | 69 | } |
70 | 70 | ||
71 | public void AddAnimation(UUID animID, UUID objectID) | 71 | public void AddAnimation(UUID animID, UUID objectID) |
@@ -110,11 +110,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
110 | return; | 110 | return; |
111 | 111 | ||
112 | RemoveAnimation(animID); | 112 | RemoveAnimation(animID); |
113 | } | 113 | } |
114 | 114 | ||
115 | public void ResetAnimations() | 115 | public void ResetAnimations() |
116 | { | 116 | { |
117 | m_animations.Clear(); | 117 | m_animations.Clear(); |
118 | } | 118 | } |
119 | 119 | ||
120 | /// <summary> | 120 | /// <summary> |
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
131 | anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero)) | 131 | anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero)) |
132 | { | 132 | { |
133 | // 16384 is CHANGED_ANIMATION | 133 | // 16384 is CHANGED_ANIMATION |
134 | m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 }); | 134 | m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 }); |
135 | SendAnimPack(); | 135 | SendAnimPack(); |
136 | } | 136 | } |
137 | } | 137 | } |
@@ -305,7 +305,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
305 | #endregion Ground Movement | 305 | #endregion Ground Movement |
306 | 306 | ||
307 | return m_movementAnimation; | 307 | return m_movementAnimation; |
308 | } | 308 | } |
309 | 309 | ||
310 | /// <summary> | 310 | /// <summary> |
311 | /// Update the movement animation of this avatar according to its current state | 311 | /// Update the movement animation of this avatar according to its current state |
@@ -391,7 +391,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
391 | m_scenePresence.Scene.AssetService.Store(Animasset); | 391 | m_scenePresence.Scene.AssetService.Store(Animasset); |
392 | AddAnimation(Animasset.FullID, m_scenePresence.UUID); | 392 | AddAnimation(Animasset.FullID, m_scenePresence.UUID); |
393 | return anim; | 393 | return anim; |
394 | } | 394 | } |
395 | 395 | ||
396 | /// <summary> | 396 | /// <summary> |
397 | /// | 397 | /// |
@@ -443,6 +443,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
443 | m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); | 443 | m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); |
444 | 444 | ||
445 | SendAnimPack(animIDs, sequenceNums, objectIDs); | 445 | SendAnimPack(animIDs, sequenceNums, objectIDs); |
446 | } | 446 | } |
447 | } | 447 | } |
448 | } \ No newline at end of file | 448 | } \ 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 | |||
247 | /// <value> | 247 | /// <value> |
248 | /// Script engines present in the scene | 248 | /// Script engines present in the scene |
249 | /// </value> | 249 | /// </value> |
250 | private IScriptModule[] m_scriptEngines; | 250 | private IScriptModule[] m_scriptEngines; |
251 | 251 | ||
252 | #region Properties | 252 | #region Properties |
253 | 253 | ||
@@ -674,7 +674,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
674 | AvatarWearable[] wearables) | 674 | AvatarWearable[] wearables) |
675 | : this(client, world, reginfo) | 675 | : this(client, world, reginfo) |
676 | { | 676 | { |
677 | m_appearance = new AvatarAppearance(m_uuid, wearables, visualParams); | 677 | m_appearance = new AvatarAppearance(m_uuid, wearables, visualParams); |
678 | } | 678 | } |
679 | 679 | ||
680 | public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance) | 680 | public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance) |
@@ -3052,7 +3052,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3052 | 3052 | ||
3053 | public ScenePresence() | 3053 | public ScenePresence() |
3054 | { | 3054 | { |
3055 | m_sendCourseLocationsMethod = SendCoarseLocationsDefault; | 3055 | m_sendCourseLocationsMethod = SendCoarseLocationsDefault; |
3056 | CreateSceneViewer(); | 3056 | CreateSceneViewer(); |
3057 | m_animator = new ScenePresenceAnimator(this); | 3057 | m_animator = new ScenePresenceAnimator(this); |
3058 | } | 3058 | } |
@@ -3140,8 +3140,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3140 | } | 3140 | } |
3141 | } | 3141 | } |
3142 | } | 3142 | } |
3143 | } | 3143 | } |
3144 | } | 3144 | } |
3145 | 3145 | ||
3146 | public bool CrossAttachmentsIntoNewRegion(ulong regionHandle, bool silent) | 3146 | public bool CrossAttachmentsIntoNewRegion(ulong regionHandle, bool silent) |
3147 | { | 3147 | { |
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 | |||
65 | m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, AssetType.Object, foundAssetUuids); | 65 | m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, AssetType.Object, foundAssetUuids); |
66 | 66 | ||
67 | // We count the uuid as gathered even if the asset itself is corrupt. | 67 | // We count the uuid as gathered even if the asset itself is corrupt. |
68 | Assert.That(foundAssetUuids.Count, Is.EqualTo(1)); | 68 | Assert.That(foundAssetUuids.Count, Is.EqualTo(1)); |
69 | } | 69 | } |
70 | 70 | ||
71 | /// <summary> | 71 | /// <summary> |
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
76 | { | 76 | { |
77 | TestHelper.InMethod(); | 77 | TestHelper.InMethod(); |
78 | 78 | ||
79 | UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); | 79 | UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); |
80 | IDictionary<UUID, int> foundAssetUuids = new Dictionary<UUID, int>(); | 80 | IDictionary<UUID, int> foundAssetUuids = new Dictionary<UUID, int>(); |
81 | 81 | ||
82 | m_uuidGatherer.GatherAssetUuids(missingAssetUuid, AssetType.Object, foundAssetUuids); | 82 | m_uuidGatherer.GatherAssetUuids(missingAssetUuid, AssetType.Object, foundAssetUuids); |