Merge branch 'ticket/53'

Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp

@@ -1414,7 +1414,7 @@ hsBool plArmatureMod::MsgReceive(plMessage* msg)
 		if (fController)
 		{
 			fController->SetSubworld(subMsg->fWorldKey);
-			DirtySynchState(kSDLAvatar, plSynchedObject::kBCastToClients);
+			DirtyPhysicalSynchState(plSynchedObject::kBCastToClients);
 		}
 		return true;
 	}

Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp

@@ -217,6 +217,8 @@ bool plResponderModifier::IIsLocalOnlyCmd(plMessage* cmd)
 		return true;
 	if (plCameraMsg::ConvertNoRef(cmd))		// don't want to change our camera
 		return true;
+	if (plSubWorldMsg::ConvertNoRef(cmd))   // don't want to enter a subworld (changes the avatar SDL)
+		return true;
 
 	plSoundMsg *snd = plSoundMsg::ConvertNoRef( cmd );
 	if( snd != nil && snd->Cmd( plSoundMsg::kIsLocalOnly ) )
@@ -362,6 +364,7 @@ bool plResponderModifier::IContinueSending()
 					plArmatureMod *avatar = plAvatarMgr::GetInstance()->GetLocalAvatar();
 					if(avatar)
 					{
+						swMsg->ClearReceivers();
 						swMsg->AddReceiver(avatar->GetKey());
 					}
 				}