From 0d4e391f75a8c7f50075245fc57fe78269865efe Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 21 Oct 2008 14:08:30 +0000 Subject: Update svn properties, minor formatting cleanup. --- OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | 12 ++++++------ .../Rest/Inventory/RestAppearanceServices.cs | 4 ++-- .../Rest/Inventory/RestAssetServices.cs | 2 +- .../Rest/Inventory/RestInventoryServices.cs | 18 +++++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'OpenSim/ApplicationPlugins') 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 /// Supported authentication schemes /// - public const string AS_BASIC = "Basic"; // simple user/password verification - public const string AS_DIGEST = "Digest"; // password safe authentication + public const string AS_BASIC = "Basic"; // simple user/password verification + public const string AS_DIGEST = "Digest"; // password safe authentication /// Supported Digest algorithms - public const string Digest_MD5 = "MD5"; // assumed default if omitted - public const string Digest_MD5Sess = "MD5-sess"; // session-span - not good for REST? + public const string Digest_MD5 = "MD5"; // assumed default if omitted + public const string Digest_MD5Sess = "MD5-sess"; // session-span - not good for REST? - public const string Qop_Auth = "auth"; // authentication only - public const string Qop_Int = "auth-int"; // TODO + public const string Qop_Auth = "auth"; // authentication only + public const string Qop_Int = "auth-int"; // TODO /// /// 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 if (Rest.AvatarServices == null) throw new Exception(String.Format("{0} OpenSim inventory services are not available", - MsgId)); + MsgId)); if (Rest.UserServices == null) throw new Exception(String.Format("{0} OpenSim user profile services are not available", - MsgId)); + MsgId)); // If a relative path was specified for the handler's domain, // 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 if (Rest.AssetServices == null) throw new Exception(String.Format("{0} OpenSim asset services are not available", - MsgId)); + MsgId)); // If the handler specifies a relative path for its domain // 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 MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); - lock (rdata) - { - if (!rdata.HaveInventory) - { - rdata.startWD(1000); - rdata.timeout = false; - Monitor.Wait(rdata); - } - } + lock (rdata) + { + if (!rdata.HaveInventory) + { + rdata.startWD(1000); + rdata.timeout = false; + Monitor.Wait(rdata); + } + } if (rdata.timeout) { -- cgit v1.1