OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmerge

avinationmerge
Melanie 2011-10-25 02:56:30 +01:00
parent 3555987fe9 4cffdf15ba
commit 1b87a0c229
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
View File

@ -117,7 +117,6 @@ namespace OpenSim.Server.Handlers.UserAccounts
} }
return FailureResult(); return FailureResult();
} }
byte[] GetAccount(Dictionary<string, object> request) byte[] GetAccount(Dictionary<string, object> request)
@ -126,13 +125,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
UUID scopeID = UUID.Zero; UUID scopeID = UUID.Zero;
Dictionary<string, object> result = new Dictionary<string, object>(); Dictionary<string, object> result = new Dictionary<string, object>();
if (!request.ContainsKey("ScopeID")) if (request.ContainsKey("ScopeID") && !UUID.TryParse(request["ScopeID"].ToString(), out scopeID))
{
result["result"] = "null";
return ResultToBytes(result);
}
if (!UUID.TryParse(request["ScopeID"].ToString(), out scopeID))
{ {
result["result"] = "null"; result["result"] = "null";
return ResultToBytes(result); return ResultToBytes(result);
@ -174,11 +167,11 @@ namespace OpenSim.Server.Handlers.UserAccounts
byte[] GetAccounts(Dictionary<string, object> request) byte[] GetAccounts(Dictionary<string, object> request)
{ {
if (!request.ContainsKey("ScopeID") || !request.ContainsKey("query")) if (!request.ContainsKey("query"))
return FailureResult(); return FailureResult();
UUID scopeID = UUID.Zero; UUID scopeID = UUID.Zero;
if (!UUID.TryParse(request["ScopeID"].ToString(), out scopeID)) if (request.ContainsKey("ScopeID") && !UUID.TryParse(request["ScopeID"].ToString(), out scopeID))
return FailureResult(); return FailureResult();
string query = request["query"].ToString(); string query = request["query"].ToString();
@ -187,7 +180,9 @@ namespace OpenSim.Server.Handlers.UserAccounts
Dictionary<string, object> result = new Dictionary<string, object>(); Dictionary<string, object> result = new Dictionary<string, object>();
if ((accounts == null) || ((accounts != null) && (accounts.Count == 0))) if ((accounts == null) || ((accounts != null) && (accounts.Count == 0)))
{
result["result"] = "null"; result["result"] = "null";
}
else else
{ {
int i = 0; int i = 0;
@ -208,7 +203,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
byte[] StoreAccount(Dictionary<string, object> request) byte[] StoreAccount(Dictionary<string, object> request)
{ {
UUID principalID = UUID.Zero; UUID principalID = UUID.Zero;
if (!(request.ContainsKey("PrincipalID") && UUID.TryParse(request["PrincipalID"].ToString(), out principalID))) if (request.ContainsKey("PrincipalID") && !UUID.TryParse(request["PrincipalID"].ToString(), out principalID))
return FailureResult(); return FailureResult();
UUID scopeID = UUID.Zero; UUID scopeID = UUID.Zero;