diff options
| author | Justin Clark-Casey (justincc) | 2011-09-01 01:22:28 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-09-01 01:22:28 +0100 |
| commit | 095b3e5756bb3160b30c9c5670ba008fa13d2e66 (patch) | |
| tree | 0052b92cf46d42d714740bb4c7404edbdbaea0de /OpenSim/Region/Framework/Scenes/Prioritizer.cs | |
| parent | Fix a bug where the non-root parts of rezzed objects that had previously been... (diff) | |
| download | opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.zip opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.gz opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.bz2 opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.xz | |
Remove pointless cluttering SOP.ParentGroup != null checks.
The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database.
At all other times it's not possible for a SOP not to have a SOG parent.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Prioritizer.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs index 33407ec..1b10e3c 100644 --- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs +++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs | |||
| @@ -208,8 +208,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 208 | if (entity is SceneObjectPart) | 208 | if (entity is SceneObjectPart) |
| 209 | { | 209 | { |
| 210 | SceneObjectGroup group = (entity as SceneObjectPart).ParentGroup; | 210 | SceneObjectGroup group = (entity as SceneObjectPart).ParentGroup; |
| 211 | if (group != null) | 211 | entityPos = group.AbsolutePosition; |
| 212 | entityPos = group.AbsolutePosition; | ||
| 213 | } | 212 | } |
| 214 | 213 | ||
| 215 | // Use the camera position for local agents and avatar position for remote agents | 214 | // Use the camera position for local agents and avatar position for remote agents |