diff options
| author | Melanie | 2012-03-31 02:18:02 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-31 02:18:02 +0100 |
| commit | f3132c45d98af7bb38251ad95013c433b5eda9e5 (patch) | |
| tree | efc3d6c0529678c0a56f5a505a52944012ea607a /OpenSim/Services/PresenceService/PresenceService.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the... (diff) | |
| download | opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.zip opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.gz opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.bz2 opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/PresenceService/PresenceService.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index c8ac38e..ed2703e 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs | |||
| @@ -151,11 +151,12 @@ namespace OpenSim.Services.PresenceService | |||
| 151 | 151 | ||
| 152 | info.Add(ret); | 152 | info.Add(ret); |
| 153 | } | 153 | } |
| 154 | |||
| 155 | // m_log.DebugFormat( | ||
| 156 | // "[PRESENCE SERVICE]: GetAgents for {0} found {1} presences", userIDStr, data.Length); | ||
| 154 | } | 157 | } |
| 155 | 158 | ||
| 156 | // m_log.DebugFormat("[PRESENCE SERVICE]: GetAgents for {0} userIDs found {1} presences", userIDs.Length, info.Count); | ||
| 157 | return info.ToArray(); | 159 | return info.ToArray(); |
| 158 | } | 160 | } |
| 159 | |||
| 160 | } | 161 | } |
| 161 | } | 162 | } \ No newline at end of file |