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 ++--- .../Region/Environment/Interfaces/IWindModule.cs | 82 +++++++++++----------- .../Modules/Avatar/Chat/IRCConnector.cs | 4 +- 6 files changed, 61 insertions(+), 61 deletions(-) (limited to 'OpenSim') 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) { diff --git a/OpenSim/Region/Environment/Interfaces/IWindModule.cs b/OpenSim/Region/Environment/Interfaces/IWindModule.cs index 63a95d3..9896c56 100644 --- a/OpenSim/Region/Environment/Interfaces/IWindModule.cs +++ b/OpenSim/Region/Environment/Interfaces/IWindModule.cs @@ -1,41 +1,41 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSim Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using OpenSim.Framework; -using OpenMetaverse; - -namespace OpenSim.Region.Environment.Interfaces -{ - public interface IWindModule : IRegionModule - { - Vector2[] WindSpeeds - { - get; - } - } -} +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using OpenSim.Framework; +using OpenMetaverse; + +namespace OpenSim.Region.Environment.Interfaces +{ + public interface IWindModule : IRegionModule + { + Vector2[] WindSpeeds + { + get; + } + } +} diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs index 0eb303c..dd40a32 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs @@ -237,7 +237,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat public void AddScene(Scene scene) { - lock(m_syncConnect) m_scenes.Add(scene); + lock (m_syncConnect) m_scenes.Add(scene); } public bool Connect() @@ -707,4 +707,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat } } } -} \ No newline at end of file +} -- cgit v1.1