aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2014-07-21 12:42:16 -0400
committerJustin Clark-Casey2014-08-02 00:57:29 +0100
commit7e0d0282c4a589e67d71543300ea57a976cb8c1c (patch)
treeae4ffcdc8dbbe7e71d493f70aac30fa565c9ca66
parentFixed: after a Hypergrid teleport, attachments often either disappear, or app... (diff)
downloadopensim-SC_OLD-7e0d0282c4a589e67d71543300ea57a976cb8c1c.zip
opensim-SC_OLD-7e0d0282c4a589e67d71543300ea57a976cb8c1c.tar.gz
opensim-SC_OLD-7e0d0282c4a589e67d71543300ea57a976cb8c1c.tar.bz2
opensim-SC_OLD-7e0d0282c4a589e67d71543300ea57a976cb8c1c.tar.xz
Add missing parts to profiles - classified delete
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs10
-rw-r--r--OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs14
2 files changed, 10 insertions, 14 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index e301bbe..adb75d6 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -250,7 +250,7 @@ namespace OpenSim.Data.MySQL
250 string query = string.Empty; 250 string query = string.Empty;
251 251
252 query += "DELETE FROM classifieds WHERE "; 252 query += "DELETE FROM classifieds WHERE ";
253 query += "classifieduuid = ?ClasifiedId"; 253 query += "classifieduuid = ?recordId";
254 254
255 try 255 try
256 { 256 {
@@ -260,12 +260,8 @@ namespace OpenSim.Data.MySQL
260 260
261 using (MySqlCommand cmd = new MySqlCommand(query, dbcon)) 261 using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
262 { 262 {
263 cmd.Parameters.AddWithValue("?ClassifiedId", recordId.ToString()); 263 cmd.Parameters.AddWithValue("?recordId", recordId.ToString());
264 264 cmd.ExecuteNonQuery();
265 lock(Lock)
266 {
267 cmd.ExecuteNonQuery();
268 }
269 } 265 }
270 } 266 }
271 } 267 }
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
index d55142e..6721b08 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -126,14 +126,14 @@ namespace OpenSim.Server.Handlers
126 } 126 }
127 127
128 OSDMap request = (OSDMap)json["params"]; 128 OSDMap request = (OSDMap)json["params"];
129 UUID classifiedId = new UUID(request["classifiedID"].AsString()); 129 UUID classifiedId = new UUID(request["classifiedId"].AsString());
130
131 OSDMap res = new OSDMap();
132 res["result"] = OSD.FromString("success");
133 response.Result = res;
134
135 return true;
136 130
131 if(Service.ClassifiedDelete(classifiedId))
132 return true;
133
134 response.Error.Code = ErrorCode.InternalError;
135 response.Error.Message = "data error removing record";
136 return false;
137 } 137 }
138 138
139 public bool ClassifiedInfoRequest(OSDMap json, ref JsonRpcResponse response) 139 public bool ClassifiedInfoRequest(OSDMap json, ref JsonRpcResponse response)