diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneGraph.cs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs index aed01df..b373c09 100644 --- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs | |||
| @@ -911,17 +911,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 911 | ScenePresence presence; | 911 | ScenePresence presence; |
| 912 | if (ScenePresences.TryGetValue(avatarId, out presence)) | 912 | if (ScenePresences.TryGetValue(avatarId, out presence)) |
| 913 | { | 913 | { |
| 914 | if (!presence.IsChildAgent) | 914 | avatar = presence; |
| 915 | { | 915 | return true; |
| 916 | avatar = presence; | 916 | |
| 917 | return true; | 917 | //if (!presence.IsChildAgent) |
| 918 | } | 918 | //{ |
| 919 | else | 919 | // avatar = presence; |
| 920 | { | 920 | // return true; |
| 921 | m_log.WarnFormat( | 921 | //} |
| 922 | "[INNER SCENE]: Requested avatar {0} could not be found in scene {1} since it is only registered as a child agent!", | 922 | //else |
| 923 | avatarId, m_parentScene.RegionInfo.RegionName); | 923 | //{ |
| 924 | } | 924 | // m_log.WarnFormat( |
| 925 | // "[INNER SCENE]: Requested avatar {0} could not be found in scene {1} since it is only registered as a child agent!", | ||
| 926 | // avatarId, m_parentScene.RegionInfo.RegionName); | ||
| 927 | //} | ||
| 925 | } | 928 | } |
| 926 | 929 | ||
| 927 | avatar = null; | 930 | avatar = null; |