diff options
author | Justin Clark-Casey (justincc) | 2013-08-14 23:21:51 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-08-14 23:21:51 +0100 |
commit | 73e3ca670d7369d02f2cab71ec734b47ec50c428 (patch) | |
tree | 3d0d24ec0d2de6f011392615855939547a9e07bc /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
parent | minor: remove unused entity transfer config in teleport v2 attachments test (diff) | |
parent | BulletSim: include check for volume detect in check for zeroing avatar motion. (diff) | |
download | opensim-SC_OLD-73e3ca670d7369d02f2cab71ec734b47ec50c428.zip opensim-SC_OLD-73e3ca670d7369d02f2cab71ec734b47ec50c428.tar.gz opensim-SC_OLD-73e3ca670d7369d02f2cab71ec734b47ec50c428.tar.bz2 opensim-SC_OLD-73e3ca670d7369d02f2cab71ec734b47ec50c428.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 502f85f..291dfcd 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -107,6 +107,8 @@ public sealed class BSCharacter : BSPhysObject | |||
107 | PhysicalActors.Add(AvatarMoveActorName, m_moveActor); | 107 | PhysicalActors.Add(AvatarMoveActorName, m_moveActor); |
108 | 108 | ||
109 | SetPhysicalProperties(); | 109 | SetPhysicalProperties(); |
110 | |||
111 | IsInitialized = true; | ||
110 | }); | 112 | }); |
111 | return; | 113 | return; |
112 | } | 114 | } |
@@ -114,6 +116,8 @@ public sealed class BSCharacter : BSPhysObject | |||
114 | // called when this character is being destroyed and the resources should be released | 116 | // called when this character is being destroyed and the resources should be released |
115 | public override void Destroy() | 117 | public override void Destroy() |
116 | { | 118 | { |
119 | IsInitialized = false; | ||
120 | |||
117 | base.Destroy(); | 121 | base.Destroy(); |
118 | 122 | ||
119 | DetailLog("{0},BSCharacter.Destroy", LocalID); | 123 | DetailLog("{0},BSCharacter.Destroy", LocalID); |