diff options
author | root | 2010-09-17 01:50:48 +0200 |
---|---|---|
committer | Melanie | 2010-09-17 01:57:26 +0100 |
commit | 7762301cea99215df4068cca71b78335df5a4a40 (patch) | |
tree | 4423c7a47e4305881f1c1aa9472d965027336314 /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
parent | Fixed a regression in SOG.Copy() (diff) | |
download | opensim-SC_OLD-7762301cea99215df4068cca71b78335df5a4a40.zip opensim-SC_OLD-7762301cea99215df4068cca71b78335df5a4a40.tar.gz opensim-SC_OLD-7762301cea99215df4068cca71b78335df5a4a40.tar.bz2 opensim-SC_OLD-7762301cea99215df4068cca71b78335df5a4a40.tar.xz |
Revert "* Changed 11 calls for session info to the more optimized API method"
This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2.
Also makes online indicators and IM more robust
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 43bbf0d..9b1222b 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -498,7 +498,18 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
498 | if (lookupAgent) | 498 | if (lookupAgent) |
499 | { | 499 | { |
500 | // Non-cached user agent lookup. | 500 | // Non-cached user agent lookup. |
501 | upd = PresenceService.GetAgent(toAgentID); | 501 | PresenceInfo[] presences = PresenceService.GetAgents(new string[] { toAgentID.ToString() }); |
502 | if (presences != null && presences.Length > 0) | ||
503 | { | ||
504 | foreach (PresenceInfo p in presences) | ||
505 | { | ||
506 | if (p.RegionID != UUID.Zero) | ||
507 | { | ||
508 | upd = p; | ||
509 | break; | ||
510 | } | ||
511 | } | ||
512 | } | ||
502 | 513 | ||
503 | if (upd != null) | 514 | if (upd != null) |
504 | { | 515 | { |