diff options
author | Justin Clarke Casey | 2008-10-28 15:46:30 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-28 15:46:30 +0000 |
commit | baa29fcbff05c37a1a9192999bc55cee81cfe511 (patch) | |
tree | 466fc4d4f09d8a681115bb2acbdee13ba0fad5a5 /OpenSim/Region/Environment/Scenes | |
parent | * Apply http://opensimulator.org/mantis/view.php?id=2482 (diff) | |
download | opensim-SC-baa29fcbff05c37a1a9192999bc55cee81cfe511.zip opensim-SC-baa29fcbff05c37a1a9192999bc55cee81cfe511.tar.gz opensim-SC-baa29fcbff05c37a1a9192999bc55cee81cfe511.tar.bz2 opensim-SC-baa29fcbff05c37a1a9192999bc55cee81cfe511.tar.xz |
* minor: Doc and log message tidy up
* reinstate debug level log message indicating when a child agent is made a root for future debugging purposes
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 0f96cf2..8d94c68 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2486,6 +2486,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
2486 | } | 2486 | } |
2487 | } | 2487 | } |
2488 | 2488 | ||
2489 | /// <summary> | ||
2490 | /// Create a scene presence and add it to this scene. | ||
2491 | /// </summary> | ||
2492 | /// <param name="client"></param> | ||
2493 | /// <param name="child"></param> | ||
2494 | /// <returns></returns> | ||
2489 | protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) | 2495 | protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) |
2490 | { | 2496 | { |
2491 | AvatarAppearance appearance = null; | 2497 | AvatarAppearance appearance = null; |
@@ -2515,11 +2521,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
2515 | } | 2521 | } |
2516 | catch (Exception e) | 2522 | catch (Exception e) |
2517 | { | 2523 | { |
2518 | m_log.ErrorFormat("[APPEARANCE]: Problem fetching appearance for avatar {0}, {1}, {2}", | 2524 | m_log.ErrorFormat("[APPEARANCE]: Problem fetching appearance for avatar {0}, {1}", |
2519 | client.Name, client.AgentId, e.ToString()); | 2525 | client.Name, e); |
2520 | } | 2526 | } |
2527 | |||
2521 | m_log.Warn("[APPEARANCE]: Appearance not found, returning default"); | 2528 | m_log.Warn("[APPEARANCE]: Appearance not found, returning default"); |
2522 | |||
2523 | } | 2529 | } |
2524 | 2530 | ||
2525 | /// <summary> | 2531 | /// <summary> |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 3313524..ccc4be7 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -715,9 +715,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
715 | ava.TryGetAvatarAppearance(m_uuid, out m_appearance); | 715 | ava.TryGetAvatarAppearance(m_uuid, out m_appearance); |
716 | } | 716 | } |
717 | 717 | ||
718 | // m_log.DebugFormat( | 718 | m_log.DebugFormat( |
719 | // "[SCENE PRESENCE]: Upgrading child agent {0}, {1} to a root agent in {2} at pos {3}", | 719 | "[SCENE]: Upgrading child to root agent for {0} in {1}", |
720 | // Name, UUID, m_scene.RegionInfo.RegionName, pos); | 720 | Name, m_scene.RegionInfo.RegionName); |
721 | 721 | ||
722 | if (pos.X < 0 || pos.X > Constants.RegionSize || pos.Y < 0 || pos.Y > Constants.RegionSize || pos.Z < 0) | 722 | if (pos.X < 0 || pos.X > Constants.RegionSize || pos.Y < 0 || pos.Y > Constants.RegionSize || pos.Z < 0) |
723 | { | 723 | { |