Update svn properties, add copyright header, formatting cleanup.
parent
c266df0dfe
commit
54ccca1e2c
|
@ -227,7 +227,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
|
||||||
// them easy to reach from anywhere in the assembly.
|
// them easy to reach from anywhere in the assembly.
|
||||||
|
|
||||||
Rest.main = openSim;
|
Rest.main = openSim;
|
||||||
if(Rest.main == null)
|
if (Rest.main == null)
|
||||||
throw new Exception("OpenSim base pointer is null");
|
throw new Exception("OpenSim base pointer is null");
|
||||||
|
|
||||||
Rest.Plugin = this;
|
Rest.Plugin = this;
|
||||||
|
|
|
@ -503,7 +503,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||||
req.Params = transferRequest.TransferInfo.Params;
|
req.Params = transferRequest.TransferInfo.Params;
|
||||||
req.AssetInf = new AssetInfo(asset);
|
req.AssetInf = new AssetInfo(asset);
|
||||||
req.NumPackets = CalculateNumPackets(asset.Data);
|
req.NumPackets = CalculateNumPackets(asset.Data);
|
||||||
lock(AssetRequests) AssetRequests.Add(req);
|
lock (AssetRequests) AssetRequests.Add(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -526,7 +526,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||||
|
|
||||||
for (int i = 0; i < num; i++)
|
for (int i = 0; i < num; i++)
|
||||||
{
|
{
|
||||||
lock(AssetRequests)
|
lock (AssetRequests)
|
||||||
{
|
{
|
||||||
req = AssetRequests[0];
|
req = AssetRequests[0];
|
||||||
AssetRequests.RemoveAt(0);
|
AssetRequests.RemoveAt(0);
|
||||||
|
|
|
@ -1,8 +1,33 @@
|
||||||
|
/*
|
||||||
|
* 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 OpenSimulator 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 System;
|
||||||
|
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
|
|
||||||
|
|
||||||
namespace OpenSim.Framework.Communications
|
namespace OpenSim.Framework.Communications
|
||||||
{
|
{
|
||||||
public interface IAuthentication
|
public interface IAuthentication
|
||||||
|
|
|
@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
|
||||||
bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
|
bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
|
||||||
"POST", m_RestURL+"/SaveMessage/", im);
|
"POST", m_RestURL+"/SaveMessage/", im);
|
||||||
|
|
||||||
if(im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
|
if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
|
||||||
{
|
{
|
||||||
IClientAPI client = FindClient(new UUID(im.fromAgentID));
|
IClientAPI client = FindClient(new UUID(im.fromAgentID));
|
||||||
if (client == null)
|
if (client == null)
|
||||||
|
|
|
@ -66,10 +66,9 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
|
||||||
/// <param name="data"></param>
|
/// <param name="data"></param>
|
||||||
public void ReturnData(UUID id, byte[] data)
|
public void ReturnData(UUID id, byte[] data)
|
||||||
{
|
{
|
||||||
|
|
||||||
DynamicTextureUpdater updater = null;
|
DynamicTextureUpdater updater = null;
|
||||||
|
|
||||||
lock(Updaters)
|
lock (Updaters)
|
||||||
{
|
{
|
||||||
if (Updaters.ContainsKey(id))
|
if (Updaters.ContainsKey(id))
|
||||||
{
|
{
|
||||||
|
@ -77,7 +76,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(updater != null)
|
if (updater != null)
|
||||||
{
|
{
|
||||||
if (RegisteredScenes.ContainsKey(updater.SimUUID))
|
if (RegisteredScenes.ContainsKey(updater.SimUUID))
|
||||||
{
|
{
|
||||||
|
@ -86,9 +85,9 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(updater.UpdateTimer == 0)
|
if (updater.UpdateTimer == 0)
|
||||||
{
|
{
|
||||||
lock(Updaters)
|
lock (Updaters)
|
||||||
{
|
{
|
||||||
if (!Updaters.ContainsKey(updater.UpdaterID))
|
if (!Updaters.ContainsKey(updater.UpdaterID))
|
||||||
{
|
{
|
||||||
|
@ -96,7 +95,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
|
public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
|
||||||
|
@ -123,7 +121,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
|
||||||
updater.BlendWithOldTexture = SetBlending;
|
updater.BlendWithOldTexture = SetBlending;
|
||||||
updater.FrontAlpha = AlphaValue;
|
updater.FrontAlpha = AlphaValue;
|
||||||
|
|
||||||
lock(Updaters)
|
lock (Updaters)
|
||||||
{
|
{
|
||||||
if (!Updaters.ContainsKey(updater.UpdaterID))
|
if (!Updaters.ContainsKey(updater.UpdaterID))
|
||||||
{
|
{
|
||||||
|
@ -159,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
|
||||||
updater.BlendWithOldTexture = SetBlending;
|
updater.BlendWithOldTexture = SetBlending;
|
||||||
updater.FrontAlpha = AlphaValue;
|
updater.FrontAlpha = AlphaValue;
|
||||||
|
|
||||||
lock(Updaters)
|
lock (Updaters)
|
||||||
{
|
{
|
||||||
if (!Updaters.ContainsKey(updater.UpdaterID))
|
if (!Updaters.ContainsKey(updater.UpdaterID))
|
||||||
{
|
{
|
||||||
|
@ -173,7 +171,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
|
||||||
return UUID.Zero;
|
return UUID.Zero;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void GetDrawStringSize(string contentType, string text, string fontName, int fontSize,
|
public void GetDrawStringSize(string contentType, string text, string fontName, int fontSize,
|
||||||
out double xSize, out double ySize)
|
out double xSize, out double ySize)
|
||||||
{
|
{
|
||||||
|
@ -307,7 +304,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
|
||||||
part.ScheduleFullUpdate();
|
part.ScheduleFullUpdate();
|
||||||
|
|
||||||
scene.CommsManager.AssetCache.ExpireAsset(oldID);
|
scene.CommsManager.AssetCache.ExpireAsset(oldID);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha)
|
private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha)
|
||||||
|
|
|
@ -50,7 +50,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
|
||||||
return localID.ToString() + itemID.ToString();
|
return localID.ToString() + itemID.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private class TimerClass
|
private class TimerClass
|
||||||
{
|
{
|
||||||
public uint localID;
|
public uint localID;
|
||||||
|
|
|
@ -231,8 +231,8 @@
|
||||||
|
|
||||||
[Communications]
|
[Communications]
|
||||||
|
|
||||||
;InterregionComms = "LocalComms"
|
;InterregionComms = "LocalComms"
|
||||||
InterregionComms = "RESTComms"
|
InterregionComms = "RESTComms"
|
||||||
|
|
||||||
[StandAlone]
|
[StandAlone]
|
||||||
accounts_authenticate = true
|
accounts_authenticate = true
|
||||||
|
@ -581,14 +581,14 @@ InterregionComms = "RESTComms"
|
||||||
[RestHandler]
|
[RestHandler]
|
||||||
; Change this to true to enable the REST Asset and Inventory Plugin
|
; Change this to true to enable the REST Asset and Inventory Plugin
|
||||||
enabled = false
|
enabled = false
|
||||||
authenticate=true
|
authenticate = true
|
||||||
secured=true
|
secured = true
|
||||||
extended-escape=true
|
extended-escape = true
|
||||||
realm=OpenSim REST
|
realm = OpenSim REST
|
||||||
dump-asset=false
|
dump-asset = false
|
||||||
path-fill=true
|
path-fill = true
|
||||||
dump-line-size=32
|
dump-line-size = 32
|
||||||
flush-on-error=true
|
flush-on-error = true
|
||||||
|
|
||||||
|
|
||||||
; Uncomment the following for IRC bridge
|
; Uncomment the following for IRC bridge
|
||||||
|
|
Loading…
Reference in New Issue