ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Several more buglets removed.

Browse Source
This commit is contained in:
Diva Canto
2010-01-13 09:17:30 -08:00
parent 011a1b3798
commit 7356860b48
15 changed files with 75 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
View File

@@ -148,7 +148,7 @@ namespace OpenSim.Services.Connectors
string reqString = ServerUtils.BuildQueryString(sendData);
// m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
try
{
string reply = SynchronousRestFormsRequester.MakeRequest("POST",

4
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Simulation
m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message);
return false;
}
Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri);
//Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri);
HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri);
ChildUpdateRequest.Method = "PUT";
@@ -478,7 +478,7 @@ namespace OpenSim.Services.Connectors.Simulation
{
string uri
= "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + "/object/" + sog.UUID + "/";
//m_log.Debug(" >>> DoCreateChildAgentCall <<< " + uri);
//m_log.Debug(" >>> DoCreateObjectCall <<< " + uri);
WebRequest ObjectCreateRequest = WebRequest.Create(uri);
ObjectCreateRequest.Method = "POST";

8
OpenSim/Services/Interfaces/IUserAccountService.cs
View File

@@ -98,11 +98,11 @@ namespace OpenSim.Services.Interfaces
string str = kvp["ServiceURLs"].ToString();
if (str != string.Empty)
{
string[] parts = str.Split(new char[] { '#' });
string[] parts = str.Split(new char[] { ';' });
Dictionary<string, object> dic = new Dictionary<string, object>();
foreach (string s in parts)
{
string[] parts2 = s.Split(new char[] { '=' });
string[] parts2 = s.Split(new char[] { '*' });
if (parts2.Length == 2)
ServiceURLs[parts2[0]] = parts2[1];
}
@@ -119,14 +119,14 @@ namespace OpenSim.Services.Interfaces
result["PrincipalID"] = PrincipalID.ToString();
result["ScopeID"] = ScopeID.ToString();
result["Created"] = Created.ToString();
result["UserLavel"] = UserLevel.ToString();
result["UserLevel"] = UserLevel.ToString();
result["UserFlags"] = UserFlags.ToString();
result["UserTitle"] = UserTitle;
string str = string.Empty;
foreach (KeyValuePair<string, object> kvp in ServiceURLs)
{
str += kvp.Key + "=" + kvp.Value + "#";
str += kvp.Key + "*" + (kvp.Value == null ? "" : kvp.Value) + ";";
}
result["ServiceURLs"] = str;

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

@@ -121,7 +121,7 @@ namespace OpenSim.Services.PresenceService
public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
{
//m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
try
{
PresenceData pdata = m_Database.Get(sessionID);

4
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@@ -119,6 +119,10 @@ namespace OpenSim.Services.UserAccountService
u.ScopeID = d.ScopeID;
u.Email = d.Data["Email"].ToString();
u.Created = Convert.ToInt32(d.Data["Created"].ToString());
if (d.Data["UserTitle"] != null)
u.UserTitle = d.Data["UserTitle"].ToString();
else
u.UserTitle = string.Empty;
string[] URLs = d.Data["ServiceURLs"].ToString().Split(new char[] { ' ' });
u.ServiceURLs = new Dictionary<string, object>();