diff options
author | Melanie | 2011-12-08 03:37:48 +0100 |
---|---|---|
committer | Melanie | 2011-12-08 03:37:48 +0100 |
commit | 7c7dd6269a0efff5b4619028825a46fcab84de63 (patch) | |
tree | cbe6c622fc1c069f3a33636fd1174d314dec074a /OpenSim/Framework/IScene.cs | |
parent | Recover from an internal mess-up in the outgoing packet queues by creating (diff) | |
parent | Merge branch 'master' into bigmerge (diff) | |
download | opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.zip opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.gz opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.bz2 opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.xz |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Framework/IScene.cs')
-rw-r--r-- | OpenSim/Framework/IScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 76b731f..7b0fe37 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
@@ -90,9 +90,9 @@ namespace OpenSim.Framework | |||
90 | /// <summary> | 90 | /// <summary> |
91 | /// Is the agent denoted by the given agentID a child presence in this scene? | 91 | /// Is the agent denoted by the given agentID a child presence in this scene? |
92 | /// </summary> | 92 | /// </summary> |
93 | /// | 93 | /// <remarks> |
94 | /// Used by ClientView when a 'kick everyone' or 'estate message' occurs | 94 | /// Used by ClientView when a 'kick everyone' or 'estate message' occurs |
95 | /// | 95 | /// </remarks> |
96 | /// <param name="avatarID">AvatarID to lookup</param> | 96 | /// <param name="avatarID">AvatarID to lookup</param> |
97 | /// <returns>true if the presence is a child agent, false if the presence is a root exception</returns> | 97 | /// <returns>true if the presence is a child agent, false if the presence is a root exception</returns> |
98 | /// <exception cref="System.NullReferenceException"> | 98 | /// <exception cref="System.NullReferenceException"> |