diff options
| author | Melanie | 2012-03-31 02:18:02 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-31 02:18:02 +0100 |
| commit | f3132c45d98af7bb38251ad95013c433b5eda9e5 (patch) | |
| tree | efc3d6c0529678c0a56f5a505a52944012ea607a /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the... (diff) | |
| download | opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.zip opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.gz opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.bz2 opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 4d7c40e..edfc0ef 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4214,7 +4214,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4214 | World.ForEachRootScenePresence(delegate(ScenePresence presence) | 4214 | World.ForEachRootScenePresence(delegate(ScenePresence presence) |
| 4215 | { | 4215 | { |
| 4216 | SceneObjectPart sitPart = presence.ParentPart; | 4216 | SceneObjectPart sitPart = presence.ParentPart; |
| 4217 | if (sitPart != null && m_host.ParentGroup.HasChildPrim(sitPart.LocalId)) | 4217 | if (sitPart != null && m_host.ParentGroup.ContainsPart(sitPart.LocalId)) |
| 4218 | nametable.Add(presence.ControllingClient.Name); | 4218 | nametable.Add(presence.ControllingClient.Name); |
| 4219 | }); | 4219 | }); |
| 4220 | 4220 | ||