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

Merge branch 'master' of /home/opensim/src/OpenSim/Core

bulletsim
BlueWall 2011-02-14 12:54:51 -05:00
parent 6601771f81 c75e916ccf
commit c9d2194ecb
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Framework/WebUtil.cs
View File

@ -29,6 +29,7 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Globalization;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Net.Security; using System.Net.Security;
@ -557,34 +558,27 @@ namespace OpenSim.Framework
{ {
float qx = GetQ(x); float qx = GetQ(x);
float qy = GetQ(y); float qy = GetQ(y);
if (qx < qy) return qy.CompareTo(qx); // descending order
return -1;
if (qx == qy)
return 0;
return 1;
} }
private float GetQ(Object o) private float GetQ(Object o)
{ {
// Example: image/png;q=0.9 // Example: image/png;q=0.9
float qvalue = 1F;
if (o is String) if (o is String)
{ {
string mime = (string)o; string mime = (string)o;
string[] parts = mime.Split(new char[] { ';' }); string[] parts = mime.Split(';');
if (parts.Length > 1) if (parts.Length > 1)
{ {
string[] kvp = parts[1].Split(new char[] { '=' }); string[] kvp = parts[1].Split('=');
if (kvp.Length == 2 && kvp[0] == "q") if (kvp.Length == 2 && kvp[0] == "q")
{ float.TryParse(kvp[1], NumberStyles.Number, CultureInfo.InvariantCulture, out qvalue);
float qvalue = 1F;
float.TryParse(kvp[1], out qvalue);
return qvalue;
}
} }
} }
return 1F; return qvalue;
} }
} }

2
OpenSim/Services/AssetService/AssetService.cs
View File

@ -93,7 +93,7 @@ namespace OpenSim.Services.AssetService
if (!UUID.TryParse(id, out assetID)) if (!UUID.TryParse(id, out assetID))
{ {
m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested sset id {0}", id); m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested asset id {0}", id);
return null; return null;
} }