aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2010-03-01 00:02:14 +0000
committerMelanie2010-03-01 00:02:14 +0000
commitbfcc57c0712170e3431617bcb09999bfbb96b8dd (patch)
tree137f22b0e6eb5f57487c297bbf4be5d197bd60d5 /OpenSim/Services
parentMerge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff)
downloadopensim-SC_OLD-bfcc57c0712170e3431617bcb09999bfbb96b8dd.zip
opensim-SC_OLD-bfcc57c0712170e3431617bcb09999bfbb96b8dd.tar.gz
opensim-SC_OLD-bfcc57c0712170e3431617bcb09999bfbb96b8dd.tar.bz2
opensim-SC_OLD-bfcc57c0712170e3431617bcb09999bfbb96b8dd.tar.xz
Change friends to handle offers as it was originally designed. This may
need to be changed in SQLite & MSSQL as well
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 11a7473..05f5b4c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -230,7 +230,6 @@ namespace OpenSim.Services.LLLoginService
230 SessionID = aCircuit.SessionID; 230 SessionID = aCircuit.SessionID;
231 SecureSessionID = aCircuit.SecureSessionID; 231 SecureSessionID = aCircuit.SecureSessionID;
232 Message = message; 232 Message = message;
233 // While we don't have friends...
234 BuddList = ConvertFriendListItem(friendsList); 233 BuddList = ConvertFriendListItem(friendsList);
235 StartLocation = where; 234 StartLocation = where;
236 235
@@ -612,6 +611,8 @@ namespace OpenSim.Services.LLLoginService
612 LLLoginResponse.BuddyList buddylistreturn = new LLLoginResponse.BuddyList(); 611 LLLoginResponse.BuddyList buddylistreturn = new LLLoginResponse.BuddyList();
613 foreach (FriendInfo finfo in friendsList) 612 foreach (FriendInfo finfo in friendsList)
614 { 613 {
614 if (finfo.TheirFlags == -1)
615 continue;
615 LLLoginResponse.BuddyList.BuddyInfo buddyitem = new LLLoginResponse.BuddyList.BuddyInfo(finfo.Friend); 616 LLLoginResponse.BuddyList.BuddyInfo buddyitem = new LLLoginResponse.BuddyList.BuddyInfo(finfo.Friend);
616 buddyitem.BuddyID = finfo.Friend; 617 buddyitem.BuddyID = finfo.Friend;
617 buddyitem.BuddyRightsHave = (int)finfo.TheirFlags; 618 buddyitem.BuddyRightsHave = (int)finfo.TheirFlags;