diff options
| author | Melanie | 2011-11-01 23:54:09 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-01 23:54:09 +0000 |
| commit | b69f679122fb7fdc0f77fc198e148f42797a2eef (patch) | |
| tree | e06d4f4572a91a58c79c03c60b0fca5574467834 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Removed see_into_this_sim_from_neighbor configuration option. (diff) | |
| download | opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.zip opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.gz opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.bz2 opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d8939fc..bba746f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2927,7 +2927,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2927 | // only send update from root agents to other clients; children are only "listening posts" | 2927 | // only send update from root agents to other clients; children are only "listening posts" |
| 2928 | if (IsChildAgent) | 2928 | if (IsChildAgent) |
| 2929 | { | 2929 | { |
| 2930 | m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); | 2930 | m_log.Warn("[SCENE PRESENCE]: Attempt to send avatar data from a child agent"); |
| 2931 | return; | 2931 | return; |
| 2932 | } | 2932 | } |
| 2933 | 2933 | ||
| @@ -2984,10 +2984,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2984 | // only send update from root agents to other clients; children are only "listening posts" | 2984 | // only send update from root agents to other clients; children are only "listening posts" |
| 2985 | if (IsChildAgent) | 2985 | if (IsChildAgent) |
| 2986 | { | 2986 | { |
| 2987 | m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); | 2987 | m_log.Warn("[SCENE PRESENCE]: Attempt to send avatar data from a child agent"); |
| 2988 | return; | 2988 | return; |
| 2989 | } | 2989 | } |
| 2990 | 2990 | ||
| 2991 | int count = 0; | 2991 | int count = 0; |
| 2992 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) | 2992 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) |
| 2993 | { | 2993 | { |