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

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-10-21 14:08:30 +00:00
parent 4218744a26
commit 0d4e391f75
6 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
View File

@ -49,16 +49,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
/// Supported authentication schemes /// Supported authentication schemes
/// </summary> /// </summary>
public const string AS_BASIC = "Basic"; // simple user/password verification public const string AS_BASIC = "Basic"; // simple user/password verification
public const string AS_DIGEST = "Digest"; // password safe authentication public const string AS_DIGEST = "Digest"; // password safe authentication
/// Supported Digest algorithms /// Supported Digest algorithms
public const string Digest_MD5 = "MD5"; // assumed default if omitted 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_MD5Sess = "MD5-sess"; // session-span - not good for REST?
public const string Qop_Auth = "auth"; // authentication only public const string Qop_Auth = "auth"; // authentication only
public const string Qop_Int = "auth-int"; // TODO public const string Qop_Int = "auth-int"; // TODO
/// <summary> /// <summary>
/// These values have a single value for the whole /// These values have a single value for the whole

4
OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
View File

@ -67,11 +67,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (Rest.AvatarServices == null) if (Rest.AvatarServices == null)
throw new Exception(String.Format("{0} OpenSim inventory services are not available", throw new Exception(String.Format("{0} OpenSim inventory services are not available",
MsgId)); MsgId));
if (Rest.UserServices == null) if (Rest.UserServices == null)
throw new Exception(String.Format("{0} OpenSim user profile services are not available", 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, // If a relative path was specified for the handler's domain,
// add the standard prefix to make it absolute, e.g. /admin // add the standard prefix to make it absolute, e.g. /admin

2
OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (Rest.AssetServices == null) if (Rest.AssetServices == null)
throw new Exception(String.Format("{0} OpenSim asset services are not available", throw new Exception(String.Format("{0} OpenSim asset services are not available",
MsgId)); MsgId));
// If the handler specifies a relative path for its domain // If the handler specifies a relative path for its domain
// then we must add the standard absolute prefix, e.g. /admin // then we must add the standard absolute prefix, e.g. /admin

18
OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
View File

@ -296,15 +296,15 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
lock (rdata) lock (rdata)
{ {
if (!rdata.HaveInventory) if (!rdata.HaveInventory)
{ {
rdata.startWD(1000); rdata.startWD(1000);
rdata.timeout = false; rdata.timeout = false;
Monitor.Wait(rdata); Monitor.Wait(rdata);
} }
} }
if (rdata.timeout) if (rdata.timeout)
{ {

82
OpenSim/Region/Environment/Interfaces/IWindModule.cs
View File

@ -1,41 +1,41 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using OpenSim.Framework; using OpenSim.Framework;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Region.Environment.Interfaces namespace OpenSim.Region.Environment.Interfaces
{ {
public interface IWindModule : IRegionModule public interface IWindModule : IRegionModule
{ {
Vector2[] WindSpeeds Vector2[] WindSpeeds
{ {
get; get;
} }
} }
} }

4
OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
View File

@ -237,7 +237,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
public void AddScene(Scene scene) public void AddScene(Scene scene)
{ {
lock(m_syncConnect) m_scenes.Add(scene); lock (m_syncConnect) m_scenes.Add(scene);
} }
public bool Connect() public bool Connect()
@ -707,4 +707,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
} }
} }
} }
} }