aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-04-15 10:46:18 +0100
committerUbitUmarov2017-04-15 10:46:18 +0100
commit0f7ffc56cee22aa95af58d19d3ea2193cea07340 (patch)
tree52ce76df16017d5adb3e1c8d1fa788ab90d26c65 /OpenSim/Framework
parentstill issues with volume detectors and sleeping bodies (diff)
downloadopensim-SC_OLD-0f7ffc56cee22aa95af58d19d3ea2193cea07340.zip
opensim-SC_OLD-0f7ffc56cee22aa95af58d19d3ea2193cea07340.tar.gz
opensim-SC_OLD-0f7ffc56cee22aa95af58d19d3ea2193cea07340.tar.bz2
opensim-SC_OLD-0f7ffc56cee22aa95af58d19d3ea2193cea07340.tar.xz
several changes for osTeleportObject
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 6cb37b2..5ca8c88 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -685,10 +685,10 @@ namespace OpenSim.Framework
685 ExtraData = 1 << 20, 685 ExtraData = 1 << 20,
686 Sound = 1 << 21, 686 Sound = 1 << 21,
687 Joint = 1 << 22, 687 Joint = 1 << 22,
688 FullUpdate = 0x0fffffff, 688 FullUpdate = 0x0fffffff,
689 SendInTransit = 1 << 30, 689 SendInTransit = 0x20000000,
690 CancelKill = 0x4fffffff, // 1 << 31 690 CancelKill = 0x4fffffff, // 1 << 30
691 Kill = 0x80000000 // 1 << 32 691 Kill = 0x80000000 // 1 << 31
692 } 692 }
693 693
694/* included in .net 4.0 694/* included in .net 4.0