diff options
| author | Melanie | 2011-02-16 02:41:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-16 02:41:49 +0000 |
| commit | ccd6e5d07146b8dd033bd1af09594834e87a883b (patch) | |
| tree | e7ed9506d70d67c37ac8d40f9620cbaa24747305 /OpenSim/Region/Framework/Scenes | |
| parent | Add the country functions in the careminster API (diff) | |
| parent | Catch HttpServer exception: mantis #5381 (diff) | |
| download | opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.zip opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.gz opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.bz2 opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index d4f3dfe..9b9f280 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2142,7 +2142,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2142 | { | 2142 | { |
| 2143 | Quaternion newRot; | 2143 | Quaternion newRot; |
| 2144 | 2144 | ||
| 2145 | if (this.LinkNum < 2) //KF Single or root prim | 2145 | if (this.LinkNum == 0 || this.LinkNum == 1) |
| 2146 | { | 2146 | { |
| 2147 | newRot = RotationOffset; | 2147 | newRot = RotationOffset; |
| 2148 | } | 2148 | } |