diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs index eb1a970..4d350dd 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | |||
@@ -48,16 +48,16 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
48 | private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation(); | 48 | private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation(); |
49 | private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>(); | 49 | private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>(); |
50 | 50 | ||
51 | public OpenSim.Framework.Animation DefaultAnimation | 51 | public OpenSim.Framework.Animation DefaultAnimation |
52 | { | 52 | { |
53 | get { return m_defaultAnimation; } | 53 | get { return m_defaultAnimation; } |
54 | } | 54 | } |
55 | 55 | ||
56 | public OpenSim.Framework.Animation ImplicitDefaultAnimation | 56 | public OpenSim.Framework.Animation ImplicitDefaultAnimation |
57 | { | 57 | { |
58 | get { return m_implicitDefaultAnimation; } | 58 | get { return m_implicitDefaultAnimation; } |
59 | } | 59 | } |
60 | 60 | ||
61 | public AnimationSet() | 61 | public AnimationSet() |
62 | { | 62 | { |
63 | ResetDefaultAnimation(); | 63 | ResetDefaultAnimation(); |
@@ -101,7 +101,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
101 | /// </summary> | 101 | /// </summary> |
102 | /// <param name='animID'></param> | 102 | /// <param name='animID'></param> |
103 | /// <param name='allowNoDefault'> | 103 | /// <param name='allowNoDefault'> |
104 | /// If true, then the default animation can be entirely removed. | 104 | /// If true, then the default animation can be entirely removed. |
105 | /// If false, then removing the default animation will reset it to the simulator default (currently STAND). | 105 | /// If false, then removing the default animation will reset it to the simulator default (currently STAND). |
106 | /// </param> | 106 | /// </param> |
107 | public bool Remove(UUID animID, bool allowNoDefault) | 107 | public bool Remove(UUID animID, bool allowNoDefault) |
@@ -215,9 +215,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
215 | foreach (OpenSim.Framework.Animation anim in m_animations) | 215 | foreach (OpenSim.Framework.Animation anim in m_animations) |
216 | theArray[i++] = anim; | 216 | theArray[i++] = anim; |
217 | } | 217 | } |
218 | catch | 218 | catch |
219 | { | 219 | { |
220 | /* S%^t happens. Ignore. */ | 220 | /* S%^t happens. Ignore. */ |
221 | } | 221 | } |
222 | return theArray; | 222 | return theArray; |
223 | } | 223 | } |