diff options
| author | CasperW | 2009-12-26 22:55:18 +0100 |
|---|---|---|
| committer | CasperW | 2009-12-26 22:55:18 +0100 |
| commit | a6c93ce875c9e563de791002b309a3285266d597 (patch) | |
| tree | e16f03d9dfde86b9b7eaef21f00427ece804ae58 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into casper (diff) | |
| download | opensim-SC-a6c93ce875c9e563de791002b309a3285266d597.zip opensim-SC-a6c93ce875c9e563de791002b309a3285266d597.tar.gz opensim-SC-a6c93ce875c9e563de791002b309a3285266d597.tar.bz2 opensim-SC-a6c93ce875c9e563de791002b309a3285266d597.tar.xz | |
Make sure that we're not bounds checking attachments. 'Cos otherwise your hair will end up on your bum. Seen that before?
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 998d598..34a92fe 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -226,9 +226,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 226 | Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X, | 226 | Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X, |
| 227 | sceneObject.RootPart.GroupPosition.Y, | 227 | sceneObject.RootPart.GroupPosition.Y, |
| 228 | sceneObject.RootPart.GroupPosition.Z); | 228 | sceneObject.RootPart.GroupPosition.Z); |
| 229 | if (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 || | 229 | if (!(((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0))) && (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 || |
| 230 | npos.X > Constants.RegionSize || | 230 | npos.X > Constants.RegionSize || |
| 231 | npos.Y > Constants.RegionSize) | 231 | npos.Y > Constants.RegionSize)) |
| 232 | { | 232 | { |
| 233 | if (npos.X < 0.0) npos.X = 1.0f; | 233 | if (npos.X < 0.0) npos.X = 1.0f; |
| 234 | if (npos.Y < 0.0) npos.Y = 1.0f; | 234 | if (npos.Y < 0.0) npos.Y = 1.0f; |