diff options
| author | Tom Grimshaw | 2010-05-10 05:51:49 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-05-10 05:51:49 -0700 |
| commit | ab716125d7aa80efe2b3904490f10fd045da94c7 (patch) | |
| tree | 07363c13747d4969dd3adae15582c0939dc1069b /OpenSim | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| download | opensim-SC-ab716125d7aa80efe2b3904490f10fd045da94c7.zip opensim-SC-ab716125d7aa80efe2b3904490f10fd045da94c7.tar.gz opensim-SC-ab716125d7aa80efe2b3904490f10fd045da94c7.tar.bz2 opensim-SC-ab716125d7aa80efe2b3904490f10fd045da94c7.tar.xz | |
Correct an odd merge anomaly
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 8f84d81..5dc9c44 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
| @@ -471,7 +471,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 471 | 471 | ||
| 472 | for (int x = 0; x < friendSessions.GetLength(0); x++) | 472 | for (int x = 0; x < friendSessions.GetLength(0); x++) |
| 473 | { | 473 | { |
| 474 | PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions); | 474 | PresenceInfo friendSession = friendSessions[x]; |
| 475 | if (friendSession != null) | 475 | if (friendSession != null) |
| 476 | { | 476 | { |
| 477 | GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); | 477 | GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); |