diff options
author | Jeff Ames | 2008-10-21 14:08:30 +0000 |
---|---|---|
committer | Jeff Ames | 2008-10-21 14:08:30 +0000 |
commit | 0d4e391f75a8c7f50075245fc57fe78269865efe (patch) | |
tree | c2d9f3a7bc6cadda7af60902712dfc4ffce8f69f /OpenSim/ApplicationPlugins/Rest/Inventory | |
parent | fixing real cause of #2445 & #2449: Position was <0, 0, 0> for (diff) | |
download | opensim-SC_OLD-0d4e391f75a8c7f50075245fc57fe78269865efe.zip opensim-SC_OLD-0d4e391f75a8c7f50075245fc57fe78269865efe.tar.gz opensim-SC_OLD-0d4e391f75a8c7f50075245fc57fe78269865efe.tar.bz2 opensim-SC_OLD-0d4e391f75a8c7f50075245fc57fe78269865efe.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to '')
4 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs index badbb08..643361a 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | |||
@@ -49,16 +49,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
49 | /// Supported authentication schemes | 49 | /// Supported authentication schemes |
50 | /// </summary> | 50 | /// </summary> |
51 | 51 | ||
52 | public const string AS_BASIC = "Basic"; // simple user/password verification | 52 | public const string AS_BASIC = "Basic"; // simple user/password verification |
53 | public const string AS_DIGEST = "Digest"; // password safe authentication | 53 | public const string AS_DIGEST = "Digest"; // password safe authentication |
54 | 54 | ||
55 | /// Supported Digest algorithms | 55 | /// Supported Digest algorithms |
56 | 56 | ||
57 | public const string Digest_MD5 = "MD5"; // assumed default if omitted | 57 | public const string Digest_MD5 = "MD5"; // assumed default if omitted |
58 | public const string Digest_MD5Sess = "MD5-sess"; // session-span - not good for REST? | 58 | public const string Digest_MD5Sess = "MD5-sess"; // session-span - not good for REST? |
59 | 59 | ||
60 | public const string Qop_Auth = "auth"; // authentication only | 60 | public const string Qop_Auth = "auth"; // authentication only |
61 | public const string Qop_Int = "auth-int"; // TODO | 61 | public const string Qop_Int = "auth-int"; // TODO |
62 | 62 | ||
63 | /// <summary> | 63 | /// <summary> |
64 | /// These values have a single value for the whole | 64 | /// These values have a single value for the whole |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs index 11cda6e..0775007 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs | |||
@@ -67,11 +67,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
67 | 67 | ||
68 | if (Rest.AvatarServices == null) | 68 | if (Rest.AvatarServices == null) |
69 | throw new Exception(String.Format("{0} OpenSim inventory services are not available", | 69 | throw new Exception(String.Format("{0} OpenSim inventory services are not available", |
70 | MsgId)); | 70 | MsgId)); |
71 | 71 | ||
72 | if (Rest.UserServices == null) | 72 | if (Rest.UserServices == null) |
73 | throw new Exception(String.Format("{0} OpenSim user profile services are not available", | 73 | throw new Exception(String.Format("{0} OpenSim user profile services are not available", |
74 | MsgId)); | 74 | MsgId)); |
75 | 75 | ||
76 | // If a relative path was specified for the handler's domain, | 76 | // If a relative path was specified for the handler's domain, |
77 | // add the standard prefix to make it absolute, e.g. /admin | 77 | // add the standard prefix to make it absolute, e.g. /admin |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index f9abc49..2af26f2 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
56 | 56 | ||
57 | if (Rest.AssetServices == null) | 57 | if (Rest.AssetServices == null) |
58 | throw new Exception(String.Format("{0} OpenSim asset services are not available", | 58 | throw new Exception(String.Format("{0} OpenSim asset services are not available", |
59 | MsgId)); | 59 | MsgId)); |
60 | 60 | ||
61 | // If the handler specifies a relative path for its domain | 61 | // If the handler specifies a relative path for its domain |
62 | // then we must add the standard absolute prefix, e.g. /admin | 62 | // then we must add the standard absolute prefix, e.g. /admin |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 003c6ee..db7d1bd 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -296,15 +296,15 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
296 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); | 296 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); |
297 | 297 | ||
298 | 298 | ||
299 | lock (rdata) | 299 | lock (rdata) |
300 | { | 300 | { |
301 | if (!rdata.HaveInventory) | 301 | if (!rdata.HaveInventory) |
302 | { | 302 | { |
303 | rdata.startWD(1000); | 303 | rdata.startWD(1000); |
304 | rdata.timeout = false; | 304 | rdata.timeout = false; |
305 | Monitor.Wait(rdata); | 305 | Monitor.Wait(rdata); |
306 | } | 306 | } |
307 | } | 307 | } |
308 | 308 | ||
309 | if (rdata.timeout) | 309 | if (rdata.timeout) |
310 | { | 310 | { |