diff options
| author | Kitto Flora | 2009-12-22 00:33:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2009-12-22 00:33:31 -0500 |
| commit | 93b930b9370b1439c4416c08a45fe7f23a5862c7 (patch) | |
| tree | e3546d86b64e9e2c13c4fba40a364857bfb0a8e7 /OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |
| parent | Include ChOdePlugin (diff) | |
| parent | Should not commit without compiling (diff) | |
| download | opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.zip opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.gz opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.bz2 opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.xz | |
Fix conflicts
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSPrim.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs index 847b634..edccf47 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |||
| @@ -299,6 +299,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
| 299 | { | 299 | { |
| 300 | set { return; } | 300 | set { return; } |
| 301 | } | 301 | } |
| 302 | |||
| 302 | public override Quaternion APIDTarget | 303 | public override Quaternion APIDTarget |
| 303 | { | 304 | { |
| 304 | set { return; } | 305 | set { return; } |