aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2010-01-13 09:17:30 -0800
committerDiva Canto2010-01-13 09:17:30 -0800
commit7356860b487febd12c2e0de2f009a6df9ea0aeec (patch)
tree801eaa0c90483cca8a07f2b4f9f30bf16be84f62 /OpenSim/Services
parentMore appearance woes fixed, this time for child agents. Tested on a grid with... (diff)
downloadopensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.zip
opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.gz
opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.bz2
opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.xz
Several more buglets removed.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs4
-rw-r--r--OpenSim/Services/Interfaces/IUserAccountService.cs8
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs2
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs4
5 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
index 6d9fc60..82ceaaf 100644
--- a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Services.Connectors
148 148
149 149
150 string reqString = ServerUtils.BuildQueryString(sendData); 150 string reqString = ServerUtils.BuildQueryString(sendData);
151 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString); 151 m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
152 try 152 try
153 { 153 {
154 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 154 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index bd72570..6d588de 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Simulation
231 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message); 231 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message);
232 return false; 232 return false;
233 } 233 }
234 Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); 234 //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri);
235 235
236 HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); 236 HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri);
237 ChildUpdateRequest.Method = "PUT"; 237 ChildUpdateRequest.Method = "PUT";
@@ -478,7 +478,7 @@ namespace OpenSim.Services.Connectors.Simulation
478 { 478 {
479 string uri 479 string uri
480 = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + "/object/" + sog.UUID + "/"; 480 = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + "/object/" + sog.UUID + "/";
481 //m_log.Debug(" >>> DoCreateChildAgentCall <<< " + uri); 481 //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri);
482 482
483 WebRequest ObjectCreateRequest = WebRequest.Create(uri); 483 WebRequest ObjectCreateRequest = WebRequest.Create(uri);
484 ObjectCreateRequest.Method = "POST"; 484 ObjectCreateRequest.Method = "POST";
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 942174c..3dacf53 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -98,11 +98,11 @@ namespace OpenSim.Services.Interfaces
98 string str = kvp["ServiceURLs"].ToString(); 98 string str = kvp["ServiceURLs"].ToString();
99 if (str != string.Empty) 99 if (str != string.Empty)
100 { 100 {
101 string[] parts = str.Split(new char[] { '#' }); 101 string[] parts = str.Split(new char[] { ';' });
102 Dictionary<string, object> dic = new Dictionary<string, object>(); 102 Dictionary<string, object> dic = new Dictionary<string, object>();
103 foreach (string s in parts) 103 foreach (string s in parts)
104 { 104 {
105 string[] parts2 = s.Split(new char[] { '=' }); 105 string[] parts2 = s.Split(new char[] { '*' });
106 if (parts2.Length == 2) 106 if (parts2.Length == 2)
107 ServiceURLs[parts2[0]] = parts2[1]; 107 ServiceURLs[parts2[0]] = parts2[1];
108 } 108 }
@@ -119,14 +119,14 @@ namespace OpenSim.Services.Interfaces
119 result["PrincipalID"] = PrincipalID.ToString(); 119 result["PrincipalID"] = PrincipalID.ToString();
120 result["ScopeID"] = ScopeID.ToString(); 120 result["ScopeID"] = ScopeID.ToString();
121 result["Created"] = Created.ToString(); 121 result["Created"] = Created.ToString();
122 result["UserLavel"] = UserLevel.ToString(); 122 result["UserLevel"] = UserLevel.ToString();
123 result["UserFlags"] = UserFlags.ToString(); 123 result["UserFlags"] = UserFlags.ToString();
124 result["UserTitle"] = UserTitle; 124 result["UserTitle"] = UserTitle;
125 125
126 string str = string.Empty; 126 string str = string.Empty;
127 foreach (KeyValuePair<string, object> kvp in ServiceURLs) 127 foreach (KeyValuePair<string, object> kvp in ServiceURLs)
128 { 128 {
129 str += kvp.Key + "=" + kvp.Value + "#"; 129 str += kvp.Key + "*" + (kvp.Value == null ? "" : kvp.Value) + ";";
130 } 130 }
131 result["ServiceURLs"] = str; 131 result["ServiceURLs"] = str;
132 132
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 34a3154..350eac8 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Services.PresenceService
121 121
122 public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt) 122 public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
123 { 123 {
124 //m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID); 124 m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
125 try 125 try
126 { 126 {
127 PresenceData pdata = m_Database.Get(sessionID); 127 PresenceData pdata = m_Database.Get(sessionID);
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 90077d8..a1dbb1e 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -119,6 +119,10 @@ namespace OpenSim.Services.UserAccountService
119 u.ScopeID = d.ScopeID; 119 u.ScopeID = d.ScopeID;
120 u.Email = d.Data["Email"].ToString(); 120 u.Email = d.Data["Email"].ToString();
121 u.Created = Convert.ToInt32(d.Data["Created"].ToString()); 121 u.Created = Convert.ToInt32(d.Data["Created"].ToString());
122 if (d.Data["UserTitle"] != null)
123 u.UserTitle = d.Data["UserTitle"].ToString();
124 else
125 u.UserTitle = string.Empty;
122 126
123 string[] URLs = d.Data["ServiceURLs"].ToString().Split(new char[] { ' ' }); 127 string[] URLs = d.Data["ServiceURLs"].ToString().Split(new char[] { ' ' });
124 u.ServiceURLs = new Dictionary<string, object>(); 128 u.ServiceURLs = new Dictionary<string, object>();