diff options
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/world/Avatar.cs')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/world/Avatar.cs | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.cs index a95b65d..cca266b 100644 --- a/OpenSim/OpenSim.RegionServer/world/Avatar.cs +++ b/OpenSim/OpenSim.RegionServer/world/Avatar.cs | |||
@@ -90,21 +90,7 @@ namespace OpenSim.world | |||
90 | 90 | ||
91 | public void ChildStatusChange(bool status) | 91 | public void ChildStatusChange(bool status) |
92 | { | 92 | { |
93 | Console.WriteLine("child agent status change"); | 93 | |
94 | this.childAvatar = status; | ||
95 | |||
96 | if (this.childAvatar == true) | ||
97 | { | ||
98 | this.StopMovement(); | ||
99 | } | ||
100 | else | ||
101 | { | ||
102 | LLVector3 startp = ControllingClient.StartPos; | ||
103 | lock (m_world.LockPhysicsEngine) | ||
104 | { | ||
105 | this._physActor.Position = new PhysicsVector(startp.X, startp.Y, startp.Z); | ||
106 | } | ||
107 | } | ||
108 | } | 94 | } |
109 | 95 | ||
110 | public override void addForces() | 96 | public override void addForces() |
@@ -147,13 +133,12 @@ namespace OpenSim.world | |||
147 | 133 | ||
148 | public static void LoadAnims() | 134 | public static void LoadAnims() |
149 | { | 135 | { |
150 | Avatar.Animations = new AvatarAnimations(); | 136 | |
151 | Avatar.Animations.LoadAnims(); | ||
152 | } | 137 | } |
153 | 138 | ||
154 | public override void LandRenegerated() | 139 | public override void LandRenegerated() |
155 | { | 140 | { |
156 | Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain[(int)Pos.X, (int)Pos.Y] + 50.0f); | 141 | |
157 | } | 142 | } |
158 | } | 143 | } |
159 | 144 | ||