aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorJeff Ames2008-05-25 23:27:38 +0000
committerJeff Ames2008-05-25 23:27:38 +0000
commit5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch)
treeb010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Grid/UserServer
parent* A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff)
downloadopensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs4
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs9
2 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 3c9d650..628c471 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -119,7 +119,9 @@ namespace OpenSim.Grid.UserServer
119 RegionProfileData.RequestSimProfileData( 119 RegionProfileData.RequestSimProfileData(
120 theUser.HomeRegion, m_config.GridServerURL, 120 theUser.HomeRegion, m_config.GridServerURL,
121 m_config.GridSendKey, m_config.GridRecvKey); 121 m_config.GridSendKey, m_config.GridRecvKey);
122 } else { 122 }
123 else
124 {
123 start_x = Convert.ToInt32(startLocationRequestParsed[1]); 125 start_x = Convert.ToInt32(startLocationRequestParsed[1]);
124 start_y = Convert.ToInt32(startLocationRequestParsed[2]); 126 start_y = Convert.ToInt32(startLocationRequestParsed[2]);
125 start_z = Convert.ToInt32(startLocationRequestParsed[3]); 127 start_z = Convert.ToInt32(startLocationRequestParsed[3]);
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 706f461..a82505d 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Grid.UserServer
57 /// <param name="httpRequest">HTTP request header object</param> 57 /// <param name="httpRequest">HTTP request header object</param>
58 /// <param name="httpResponse">HTTP response header object</param> 58 /// <param name="httpResponse">HTTP response header object</param>
59 /// <returns>Success "OK" else error</returns> 59 /// <returns>Success "OK" else error</returns>
60 public string RestDeleteUserSessionMethod(string request, string path, string param, 60 public string RestDeleteUserSessionMethod(string request, string path, string param,
61 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 61 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
62 { 62 {
63 // TODO! Important! 63 // TODO! Important!
@@ -260,11 +260,14 @@ namespace OpenSim.Grid.UserServer
260 if (requestData.Contains("owner")) 260 if (requestData.Contains("owner"))
261 { 261 {
262 appearance = GetUserAppearance(new LLUUID((string)requestData["owner"])); 262 appearance = GetUserAppearance(new LLUUID((string)requestData["owner"]));
263 if (appearance == null) { 263 if (appearance == null)
264 {
264 responseData = new Hashtable(); 265 responseData = new Hashtable();
265 responseData["error_type"] = "no appearance"; 266 responseData["error_type"] = "no appearance";
266 responseData["error_desc"] = "There was no appearance found for this avatar"; 267 responseData["error_desc"] = "There was no appearance found for this avatar";
267 } else { 268 }
269 else
270 {
268 responseData = appearance.ToHashTable(); 271 responseData = appearance.ToHashTable();
269 } 272 }
270 } 273 }