diff options
| author | UbitUmarov | 2019-01-04 01:12:59 +0000 |
|---|---|---|
| committer | UbitUmarov | 2019-01-04 01:12:59 +0000 |
| commit | dd5717f7aee756f386aac8fc9b9672a99ed10950 (patch) | |
| tree | bc706f4a42b09f3359427df4a23a917555960101 /OpenSim | |
| parent | some viewers now also seem to need time bf closing child regions on TP (diff) | |
| download | opensim-SC-dd5717f7aee756f386aac8fc9b9672a99ed10950.zip opensim-SC-dd5717f7aee756f386aac8fc9b9672a99ed10950.tar.gz opensim-SC-dd5717f7aee756f386aac8fc9b9672a99ed10950.tar.bz2 opensim-SC-dd5717f7aee756f386aac8fc9b9672a99ed10950.tar.xz | |
change cancel kill update flags
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 4715326..9ab1092 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -609,7 +609,9 @@ namespace OpenSim.Framework | |||
| 609 | // we are on the new one | 609 | // we are on the new one |
| 610 | PrimUpdateFlags updateFlags = oldupdate.Flags; | 610 | PrimUpdateFlags updateFlags = oldupdate.Flags; |
| 611 | if(m_flags.HasFlag(PrimUpdateFlags.CancelKill)) | 611 | if(m_flags.HasFlag(PrimUpdateFlags.CancelKill)) |
| 612 | m_flags = PrimUpdateFlags.FullUpdate; | 612 | { |
| 613 | m_flags = PrimUpdateFlags.FullUpdatewithAnim; | ||
| 614 | } | ||
| 613 | else if(updateFlags.HasFlag(PrimUpdateFlags.Kill)) | 615 | else if(updateFlags.HasFlag(PrimUpdateFlags.Kill)) |
| 614 | return; | 616 | return; |
| 615 | else // kill case will just merge in | 617 | else // kill case will just merge in |