ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2010-06-04 20:44:01 +01:00
parent 75878c8f43 281eb0c626
commit f319d2ef5e
9 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
View File

@@ -196,7 +196,7 @@ namespace OpenSim.Services.Connectors
{
Dictionary<string, object> sendData = new Dictionary<string, object>();
sendData["PRINCIPALID"] = PrincipalID.ToString();
sendData["FRIENDS"] = Friend;
sendData["FRIEND"] = Friend;
sendData["METHOD"] = "deletefriend";
string reqString = ServerUtils.BuildQueryString(sendData);

9
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
View File

@@ -74,6 +74,9 @@ namespace OpenSim.Services.Connectors.Friends
public bool FriendshipDenied(GridRegion region, UUID userID, string userName, UUID friendID)
{
if (region == null)
return false;
Dictionary<string, object> sendData = new Dictionary<string, object>();
//sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
//sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
@@ -131,7 +134,11 @@ namespace OpenSim.Services.Connectors.Friends
private bool Call(GridRegion region, Dictionary<string, object> sendData)
{
string reqString = ServerUtils.BuildQueryString(sendData);
// m_log.DebugFormat("[FRIENDS CONNECTOR]: queryString = {0}", reqString);
//m_log.DebugFormat("[FRIENDS CONNECTOR]: queryString = {0}", reqString);
if (region == null)
return false;
m_log.DebugFormat("[FRIENDS CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort);
try
{
string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;

2
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@@ -209,6 +209,8 @@ namespace OpenSim.Services.LLLoginService
bool success = false;
UUID session = UUID.Random();
m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} from {2} with user agent {3} starting in {4}",
firstName, lastName, clientIP.Address.ToString(), clientVersion, startLocation);
try
{
//

2
OpenSim/Services/PresenceService/PresenceService.cs
View File

@@ -55,7 +55,7 @@ namespace OpenSim.Services.PresenceService
UUID secureSessionID)
{
//PresenceData[] d = m_Database.Get("UserID", userID);
m_Database.Get("UserID", userID);
//m_Database.Get("UserID", userID);
PresenceData data = new PresenceData();