diff options
| author | Justin Clark-Casey (justincc) | 2012-03-31 01:52:06 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-31 01:52:06 +0100 |
| commit | 32a953fed727fdadd65228b7c9282091da3521ac (patch) | |
| tree | 014a128df31336fddcb9be1243f3f255f7d30b6f /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing Con... (diff) | |
| download | opensim-SC-32a953fed727fdadd65228b7c9282091da3521ac.zip opensim-SC-32a953fed727fdadd65228b7c9282091da3521ac.tar.gz opensim-SC-32a953fed727fdadd65228b7c9282091da3521ac.tar.bz2 opensim-SC-32a953fed727fdadd65228b7c9282091da3521ac.tar.xz | |
refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fc61571..06f7c0f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1833,7 +1833,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1833 | { | 1833 | { |
| 1834 | AddRestoredSceneObject(group, true, true); | 1834 | AddRestoredSceneObject(group, true, true); |
| 1835 | EventManager.TriggerOnSceneObjectLoaded(group); | 1835 | EventManager.TriggerOnSceneObjectLoaded(group); |
| 1836 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 1836 | SceneObjectPart rootPart = group.GetPart(group.UUID); |
| 1837 | rootPart.Flags &= ~PrimFlags.Scripted; | 1837 | rootPart.Flags &= ~PrimFlags.Scripted; |
| 1838 | rootPart.TrimPermissions(); | 1838 | rootPart.TrimPermissions(); |
| 1839 | 1839 | ||
| @@ -4174,7 +4174,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4174 | { | 4174 | { |
| 4175 | if (ent is SceneObjectGroup) | 4175 | if (ent is SceneObjectGroup) |
| 4176 | { | 4176 | { |
| 4177 | SceneObjectPart part = ((SceneObjectGroup)ent).GetChildPart(((SceneObjectGroup)ent).UUID); | 4177 | SceneObjectPart part = ((SceneObjectGroup)ent).GetPart(((SceneObjectGroup)ent).UUID); |
| 4178 | if (part != null) | 4178 | if (part != null) |
| 4179 | { | 4179 | { |
| 4180 | if (part.Name == cmdparams[2]) | 4180 | if (part.Name == cmdparams[2]) |