diff options
author | Mike Mazur | 2009-02-16 02:27:17 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-16 02:27:17 +0000 |
commit | 07b8d51da8186e537da35c1d56d176b4843d8eaa (patch) | |
tree | 9ae3581af0ca34a4210b77ca304d9ba75440fb51 /OpenSim/Grid/AssetInventoryServer/Utils.cs | |
parent | Update to new generic DataPluginFactory calls. (diff) | |
download | opensim-SC-07b8d51da8186e537da35c1d56d176b4843d8eaa.zip opensim-SC-07b8d51da8186e537da35c1d56d176b4843d8eaa.tar.gz opensim-SC-07b8d51da8186e537da35c1d56d176b4843d8eaa.tar.bz2 opensim-SC-07b8d51da8186e537da35c1d56d176b4843d8eaa.tar.xz |
AssetInventoryServer now compiles while using the standard OpenSim
console and HttpServer. It doesn't work though.
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer/Utils.cs')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Utils.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Utils.cs b/OpenSim/Grid/AssetInventoryServer/Utils.cs index e1b62a4..52e2370 100644 --- a/OpenSim/Grid/AssetInventoryServer/Utils.cs +++ b/OpenSim/Grid/AssetInventoryServer/Utils.cs | |||
@@ -36,12 +36,13 @@ using System.Xml.Serialization; | |||
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenMetaverse.StructuredData; | 37 | using OpenMetaverse.StructuredData; |
38 | using HttpServer; | 38 | using HttpServer; |
39 | using OpenSim.Framework.Servers; | ||
39 | 40 | ||
40 | namespace OpenSim.Grid.AssetInventoryServer | 41 | namespace OpenSim.Grid.AssetInventoryServer |
41 | { | 42 | { |
42 | public static class Utils | 43 | public static class Utils |
43 | { | 44 | { |
44 | public static UUID GetAuthToken(IHttpRequest request) | 45 | public static UUID GetAuthToken(OSHttpRequest request) |
45 | { | 46 | { |
46 | UUID authToken = UUID.Zero; | 47 | UUID authToken = UUID.Zero; |
47 | 48 | ||
@@ -55,13 +56,13 @@ namespace OpenSim.Grid.AssetInventoryServer | |||
55 | UUID.TryParse(authHeaderParts[1], out authToken); | 56 | UUID.TryParse(authHeaderParts[1], out authToken); |
56 | } | 57 | } |
57 | 58 | ||
58 | if (authToken == UUID.Zero && request.Cookies != null) | 59 | //if (authToken == UUID.Zero && request.Cookies != null) |
59 | { | 60 | //{ |
60 | // Check for an authToken cookie to make logins browser-compatible | 61 | // // Check for an authToken cookie to make logins browser-compatible |
61 | RequestCookie authCookie = request.Cookies["authToken"]; | 62 | // RequestCookie authCookie = request.Cookies["authToken"]; |
62 | if (authCookie != null) | 63 | // if (authCookie != null) |
63 | UUID.TryParse(authCookie.Value, out authToken); | 64 | // UUID.TryParse(authCookie.Value, out authToken); |
64 | } | 65 | //} |
65 | 66 | ||
66 | return authToken; | 67 | return authToken; |
67 | } | 68 | } |