diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/Examples | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Region/Examples')
| -rw-r--r-- | OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index 3809749..66f4da0 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | |||
| @@ -68,7 +68,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 68 | 68 | ||
| 69 | public override void UpdateMovement() | 69 | public override void UpdateMovement() |
| 70 | { | 70 | { |
| 71 | UpdateGroupRotation(GroupRotation * m_rotationDirection); | 71 | UpdateGroupRotation(Rotation * m_rotationDirection); |
| 72 | 72 | ||
| 73 | base.UpdateMovement(); | 73 | base.UpdateMovement(); |
| 74 | } | 74 | } |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index e9c35e9..f4526ae 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
| @@ -789,7 +789,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 789 | 789 | ||
| 790 | public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks) | 790 | public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks) |
| 791 | { | 791 | { |
| 792 | } | 792 | } |
| 793 | 793 | ||
| 794 | public void SendViewerTime(int phase) | 794 | public void SendViewerTime(int phase) |
| 795 | { | 795 | { |