diff options
| author | UbitUmarov | 2014-09-23 23:20:28 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-09-23 23:20:28 +0100 |
| commit | f37364b56fb4a3998b290864feec4544e6632b80 (patch) | |
| tree | b0378637dfc393932629a712792e98d0f8a61463 /OpenSim/Framework/ColliderData.cs | |
| parent | fix building state logic... (diff) | |
| parent | Add a link number field to ColliderArgs (diff) | |
| download | opensim-SC-f37364b56fb4a3998b290864feec4544e6632b80.zip opensim-SC-f37364b56fb4a3998b290864feec4544e6632b80.tar.gz opensim-SC-f37364b56fb4a3998b290864feec4544e6632b80.tar.bz2 opensim-SC-f37364b56fb4a3998b290864feec4544e6632b80.tar.xz | |
Merge branch 'master' into ubitworkmaster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/ColliderData.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/ColliderData.cs b/OpenSim/Framework/ColliderData.cs index 1b7b682..00013e1 100644 --- a/OpenSim/Framework/ColliderData.cs +++ b/OpenSim/Framework/ColliderData.cs | |||
| @@ -42,6 +42,7 @@ namespace OpenSim.Framework | |||
| 42 | public Vector3 velVector = Vector3.Zero; | 42 | public Vector3 velVector = Vector3.Zero; |
| 43 | public string nameStr = String.Empty; | 43 | public string nameStr = String.Empty; |
| 44 | public int colliderType = 0; | 44 | public int colliderType = 0; |
| 45 | public int linkNumber; | ||
| 45 | } | 46 | } |
| 46 | 47 | ||
| 47 | public class ColliderArgs : EventArgs | 48 | public class ColliderArgs : EventArgs |