aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs2
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs2
-rw-r--r--OpenSim/Framework/IScene.cs13
-rw-r--r--OpenSim/Framework/ISceneAgent.cs7
4 files changed, 9 insertions, 15 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 12c8ac0..54e1bf7 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -311,7 +311,7 @@ namespace OpenSim.Framework
311 if (args.ContainsKey("packed_appearance") && (args["packed_appearance"].Type == OSDType.Map)) 311 if (args.ContainsKey("packed_appearance") && (args["packed_appearance"].Type == OSDType.Map))
312 { 312 {
313 Appearance.Unpack((OSDMap)args["packed_appearance"]); 313 Appearance.Unpack((OSDMap)args["packed_appearance"]);
314 m_log.InfoFormat("[AGENTCIRCUITDATA] unpacked appearance"); 314// m_log.InfoFormat("[AGENTCIRCUITDATA] unpacked appearance");
315 } 315 }
316 else 316 else
317 { 317 {
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 5a4811e..1f22136 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -335,7 +335,7 @@ namespace OpenSim.Framework
335 335
336 public virtual OSDMap Pack() 336 public virtual OSDMap Pack()
337 { 337 {
338 m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Pack data"); 338// m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Pack data");
339 339
340 OSDMap args = new OSDMap(); 340 OSDMap args = new OSDMap();
341 args["message_type"] = OSD.FromString("AgentData"); 341 args["message_type"] = OSD.FromString("AgentData");
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index e0e023d..b2604f4 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -89,19 +89,6 @@ namespace OpenSim.Framework
89 89
90 string GetSimulatorVersion(); 90 string GetSimulatorVersion();
91 91
92 /// <summary>
93 /// Is the agent denoted by the given agentID a child presence in this scene?
94 /// </summary>
95 /// <remarks>
96 /// Used by ClientView when a 'kick everyone' or 'estate message' occurs
97 /// </remarks>
98 /// <param name="avatarID">AvatarID to lookup</param>
99 /// <returns>true if the presence is a child agent, false if the presence is a root exception</returns>
100 /// <exception cref="System.NullReferenceException">
101 /// Thrown if the agent does not exist.
102 /// </exception>
103 bool PresenceChildStatus(UUID agentId);
104
105 bool TryGetScenePresence(UUID agentID, out object scenePresence); 92 bool TryGetScenePresence(UUID agentID, out object scenePresence);
106 93
107 /// <summary> 94 /// <summary>
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs
index 69e91ed..824172d 100644
--- a/OpenSim/Framework/ISceneAgent.cs
+++ b/OpenSim/Framework/ISceneAgent.cs
@@ -48,6 +48,13 @@ namespace OpenSim.Framework
48 PresenceType PresenceType { get; } 48 PresenceType PresenceType { get; }
49 49
50 /// <summary> 50 /// <summary>
51 /// If true, then the agent has no avatar in the scene.
52 /// The agent exists to relay data from a region that neighbours the current position of the user's avatar.
53 /// Occasionally data is relayed, such as which a user clicks an item in a neighbouring region.
54 /// </summary>
55 bool IsChildAgent { get; }
56
57 /// <summary>
51 /// Avatar appearance data. 58 /// Avatar appearance data.
52 /// </summary> 59 /// </summary>
53 /// <remarks> 60 /// <remarks>