diff options
| author | Dan Lake | 2011-11-02 14:59:34 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-11-02 14:59:34 -0700 |
| commit | a724ebacd79de37823fe8a17be195509b15a2a33 (patch) | |
| tree | 8bb1bd5cb99222c92f4ce862cd512be6fb48052b /OpenSim/Region/Framework | |
| parent | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. (diff) | |
| parent | Get some hopefully more useful exception information when OpenJPEG.EncodeFrom... (diff) | |
| download | opensim-SC-a724ebacd79de37823fe8a17be195509b15a2a33.zip opensim-SC-a724ebacd79de37823fe8a17be195509b15a2a33.tar.gz opensim-SC-a724ebacd79de37823fe8a17be195509b15a2a33.tar.bz2 opensim-SC-a724ebacd79de37823fe8a17be195509b15a2a33.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 71c39b2..1d77b06 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2628,7 +2628,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2628 | /// </summary> | 2628 | /// </summary> |
| 2629 | public void SendAppearanceToAllOtherAgents() | 2629 | public void SendAppearanceToAllOtherAgents() |
| 2630 | { | 2630 | { |
| 2631 | //m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherAgents: {0} ({1})", Name, UUID); | 2631 | // m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherAgents: {0} {1}", Name, UUID); |
| 2632 | |||
| 2632 | // only send update from root agents to other clients; children are only "listening posts" | 2633 | // only send update from root agents to other clients; children are only "listening posts" |
| 2633 | if (IsChildAgent) | 2634 | if (IsChildAgent) |
| 2634 | { | 2635 | { |
| @@ -2656,7 +2657,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2656 | /// </summary> | 2657 | /// </summary> |
| 2657 | public void SendOtherAgentsAppearanceToMe() | 2658 | public void SendOtherAgentsAppearanceToMe() |
| 2658 | { | 2659 | { |
| 2659 | //m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID); | 2660 | // m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} {1}", Name, UUID); |
| 2660 | 2661 | ||
| 2661 | int count = 0; | 2662 | int count = 0; |
| 2662 | m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence) | 2663 | m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence) |