diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 8 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index c5c0d02..9b9360d 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -246,10 +246,10 @@ namespace OpenSim.Grid.UserServer | |||
246 | } | 246 | } |
247 | TempHash = new Hashtable(); | 247 | TempHash = new Hashtable(); |
248 | TempHash["name"] = InvFolder.name; | 248 | TempHash["name"] = InvFolder.name; |
249 | TempHash["parent_id"] = InvFolder.parentID.ToStringHyphenated(); | 249 | TempHash["parent_id"] = InvFolder.parentID.ToString(); |
250 | TempHash["version"] = (Int32)InvFolder.version; | 250 | TempHash["version"] = (Int32)InvFolder.version; |
251 | TempHash["type_default"] = (Int32)InvFolder.type; | 251 | TempHash["type_default"] = (Int32)InvFolder.type; |
252 | TempHash["folder_id"] = InvFolder.folderID.ToStringHyphenated(); | 252 | TempHash["folder_id"] = InvFolder.folderID.ToString(); |
253 | AgentInventoryArray.Add(TempHash); | 253 | AgentInventoryArray.Add(TempHash); |
254 | } | 254 | } |
255 | return new InventoryData(AgentInventoryArray, rootID); | 255 | return new InventoryData(AgentInventoryArray, rootID); |
@@ -268,10 +268,10 @@ namespace OpenSim.Grid.UserServer | |||
268 | { | 268 | { |
269 | TempHash = new Hashtable(); | 269 | TempHash = new Hashtable(); |
270 | TempHash["name"] = InvFolder.FolderName; | 270 | TempHash["name"] = InvFolder.FolderName; |
271 | TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); | 271 | TempHash["parent_id"] = InvFolder.ParentID.ToString(); |
272 | TempHash["version"] = (Int32)InvFolder.Version; | 272 | TempHash["version"] = (Int32)InvFolder.Version; |
273 | TempHash["type_default"] = (Int32)InvFolder.DefaultType; | 273 | TempHash["type_default"] = (Int32)InvFolder.DefaultType; |
274 | TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); | 274 | TempHash["folder_id"] = InvFolder.FolderID.ToString(); |
275 | AgentInventoryArray.Add(TempHash); | 275 | AgentInventoryArray.Add(TempHash); |
276 | } | 276 | } |
277 | 277 | ||
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index a697e91..9b5af0f 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -76,12 +76,12 @@ namespace OpenSim.Grid.UserServer | |||
76 | XmlRpcResponse response = new XmlRpcResponse(); | 76 | XmlRpcResponse response = new XmlRpcResponse(); |
77 | Hashtable responseData = new Hashtable(); | 77 | Hashtable responseData = new Hashtable(); |
78 | // Query Result Information | 78 | // Query Result Information |
79 | responseData["queryid"] = (string)queryID.ToStringHyphenated(); | 79 | responseData["queryid"] = (string)queryID.ToString(); |
80 | responseData["avcount"] = (string)returnUsers.Count.ToString(); | 80 | responseData["avcount"] = (string)returnUsers.Count.ToString(); |
81 | 81 | ||
82 | for (int i = 0; i < returnUsers.Count; i++) | 82 | for (int i = 0; i < returnUsers.Count; i++) |
83 | { | 83 | { |
84 | responseData["avatarid" + i.ToString()] = returnUsers[i].AvatarID.ToStringHyphenated(); | 84 | responseData["avatarid" + i.ToString()] = returnUsers[i].AvatarID.ToString(); |
85 | responseData["firstname" + i.ToString()] = returnUsers[i].firstName; | 85 | responseData["firstname" + i.ToString()] = returnUsers[i].firstName; |
86 | responseData["lastname" + i.ToString()] = returnUsers[i].lastName; | 86 | responseData["lastname" + i.ToString()] = returnUsers[i].lastName; |
87 | } | 87 | } |
@@ -102,17 +102,17 @@ namespace OpenSim.Grid.UserServer | |||
102 | // Account information | 102 | // Account information |
103 | responseData["firstname"] = profile.username; | 103 | responseData["firstname"] = profile.username; |
104 | responseData["lastname"] = profile.surname; | 104 | responseData["lastname"] = profile.surname; |
105 | responseData["uuid"] = profile.UUID.ToStringHyphenated(); | 105 | responseData["uuid"] = profile.UUID.ToString(); |
106 | // Server Information | 106 | // Server Information |
107 | responseData["server_inventory"] = profile.userInventoryURI; | 107 | responseData["server_inventory"] = profile.userInventoryURI; |
108 | responseData["server_asset"] = profile.userAssetURI; | 108 | responseData["server_asset"] = profile.userAssetURI; |
109 | // Profile Information | 109 | // Profile Information |
110 | responseData["profile_about"] = profile.profileAboutText; | 110 | responseData["profile_about"] = profile.profileAboutText; |
111 | responseData["profile_firstlife_about"] = profile.profileFirstText; | 111 | responseData["profile_firstlife_about"] = profile.profileFirstText; |
112 | responseData["profile_firstlife_image"] = profile.profileFirstImage.ToStringHyphenated(); | 112 | responseData["profile_firstlife_image"] = profile.profileFirstImage.ToString(); |
113 | responseData["profile_can_do"] = profile.profileCanDoMask.ToString(); | 113 | responseData["profile_can_do"] = profile.profileCanDoMask.ToString(); |
114 | responseData["profile_want_do"] = profile.profileWantDoMask.ToString(); | 114 | responseData["profile_want_do"] = profile.profileWantDoMask.ToString(); |
115 | responseData["profile_image"] = profile.profileImage.ToStringHyphenated(); | 115 | responseData["profile_image"] = profile.profileImage.ToString(); |
116 | responseData["profile_created"] = profile.created.ToString(); | 116 | responseData["profile_created"] = profile.created.ToString(); |
117 | responseData["profile_lastlogin"] = profile.lastLogin.ToString(); | 117 | responseData["profile_lastlogin"] = profile.lastLogin.ToString(); |
118 | // Home region information | 118 | // Home region information |
@@ -137,7 +137,7 @@ namespace OpenSim.Grid.UserServer | |||
137 | XmlRpcResponse response = new XmlRpcResponse(); | 137 | XmlRpcResponse response = new XmlRpcResponse(); |
138 | Hashtable requestData = (Hashtable)request.Params[0]; | 138 | Hashtable requestData = (Hashtable)request.Params[0]; |
139 | List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>(); | 139 | List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>(); |
140 | LLUUID queryID = new LLUUID(LLUUID.Zero.ToStringHyphenated()); | 140 | LLUUID queryID = new LLUUID(LLUUID.Zero.ToString()); |
141 | 141 | ||
142 | if (requestData.Contains("avquery") && requestData.Contains("queryid")) | 142 | if (requestData.Contains("avquery") && requestData.Contains("queryid")) |
143 | { | 143 | { |