diff options
| author | Melanie | 2013-02-07 21:26:55 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-07 21:26:55 +0000 |
| commit | 8b78b9429d049d1b18a15d3f558e241c785ae5b3 (patch) | |
| tree | 7b0c8fec3c6fbb04ab60f9402df8013333155cb3 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Rename Bounciness to Restitution (diff) | |
| download | opensim-SC-8b78b9429d049d1b18a15d3f558e241c785ae5b3.zip opensim-SC-8b78b9429d049d1b18a15d3f558e241c785ae5b3.tar.gz opensim-SC-8b78b9429d049d1b18a15d3f558e241c785ae5b3.tar.bz2 opensim-SC-8b78b9429d049d1b18a15d3f558e241c785ae5b3.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c352465..0bcf480 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -441,6 +441,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 441 | get { return (IClientCore)ControllingClient; } | 441 | get { return (IClientCore)ControllingClient; } |
| 442 | } | 442 | } |
| 443 | 443 | ||
| 444 | public UUID COF { get; set; } | ||
| 445 | |||
| 444 | // public Vector3 ParentPosition { get; set; } | 446 | // public Vector3 ParentPosition { get; set; } |
| 445 | 447 | ||
| 446 | /// <summary> | 448 | /// <summary> |