aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2010-06-04 10:59:59 -0700
committerDiva Canto2010-06-04 10:59:59 -0700
commit952029380a6a038e382dd3b2c312b3e16ff08625 (patch)
tree400586c159859d0ff437685d4c37179e8cba89f1 /OpenSim/Services
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-952029380a6a038e382dd3b2c312b3e16ff08625.zip
opensim-SC_OLD-952029380a6a038e382dd3b2c312b3e16ff08625.tar.gz
opensim-SC_OLD-952029380a6a038e382dd3b2c312b3e16ff08625.tar.bz2
opensim-SC_OLD-952029380a6a038e382dd3b2c312b3e16ff08625.tar.xz
Fixed a couple of buglets in Friendship offers / acceptance / decline when avies are in different sims.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs9
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs2
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs2
4 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
index baefebd..d7a5731 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Services.Connectors
196 { 196 {
197 Dictionary<string, object> sendData = new Dictionary<string, object>(); 197 Dictionary<string, object> sendData = new Dictionary<string, object>();
198 sendData["PRINCIPALID"] = PrincipalID.ToString(); 198 sendData["PRINCIPALID"] = PrincipalID.ToString();
199 sendData["FRIENDS"] = Friend; 199 sendData["FRIEND"] = Friend;
200 sendData["METHOD"] = "deletefriend"; 200 sendData["METHOD"] = "deletefriend";
201 201
202 string reqString = ServerUtils.BuildQueryString(sendData); 202 string reqString = ServerUtils.BuildQueryString(sendData);
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index d7cb015..0a7b277 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -74,6 +74,9 @@ namespace OpenSim.Services.Connectors.Friends
74 74
75 public bool FriendshipDenied(GridRegion region, UUID userID, string userName, UUID friendID) 75 public bool FriendshipDenied(GridRegion region, UUID userID, string userName, UUID friendID)
76 { 76 {
77 if (region == null)
78 return false;
79
77 Dictionary<string, object> sendData = new Dictionary<string, object>(); 80 Dictionary<string, object> sendData = new Dictionary<string, object>();
78 //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); 81 //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
79 //sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString(); 82 //sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
@@ -131,7 +134,11 @@ namespace OpenSim.Services.Connectors.Friends
131 private bool Call(GridRegion region, Dictionary<string, object> sendData) 134 private bool Call(GridRegion region, Dictionary<string, object> sendData)
132 { 135 {
133 string reqString = ServerUtils.BuildQueryString(sendData); 136 string reqString = ServerUtils.BuildQueryString(sendData);
134 // m_log.DebugFormat("[FRIENDS CONNECTOR]: queryString = {0}", reqString); 137 //m_log.DebugFormat("[FRIENDS CONNECTOR]: queryString = {0}", reqString);
138 if (region == null)
139 return false;
140
141 m_log.DebugFormat("[FRIENDS CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort);
135 try 142 try
136 { 143 {
137 string url = "http://" + region.ExternalHostName + ":" + region.HttpPort; 144 string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 6319cc4..00fffff 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -209,6 +209,8 @@ namespace OpenSim.Services.LLLoginService
209 bool success = false; 209 bool success = false;
210 UUID session = UUID.Random(); 210 UUID session = UUID.Random();
211 211
212 m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} from {2} with user agent {3} starting in {4}",
213 firstName, lastName, clientIP.Address.ToString(), clientVersion, startLocation);
212 try 214 try
213 { 215 {
214 // 216 //
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 601a69f..976153f 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.PresenceService
55 UUID secureSessionID) 55 UUID secureSessionID)
56 { 56 {
57 //PresenceData[] d = m_Database.Get("UserID", userID); 57 //PresenceData[] d = m_Database.Get("UserID", userID);
58 m_Database.Get("UserID", userID); 58 //m_Database.Get("UserID", userID);
59 59
60 PresenceData data = new PresenceData(); 60 PresenceData data = new PresenceData();
61 61