Update svn properties, minor formatting cleanup.
parent
4218744a26
commit
0d4e391f75
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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()
|
||||||
|
|
Loading…
Reference in New Issue