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

Revert progressive texture patch from r8001 until issues can be addressed

0.6.2-post-fixes
Dahlia Trimble 2009-01-10 09:15:23 +00:00
parent a9988fa6cf
commit 630ce5b264
13 changed files with 314 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
View File

@ -204,7 +204,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
/// <param name="e"></param> /// <param name="e"></param>
public void TextureRequest(Object sender, TextureRequestArgs e) public void TextureRequest(Object sender, TextureRequestArgs e)
{ {
IClientAPI client = (IClientAPI) sender; IClientAPI client = (IClientAPI)sender;
if (e.Priority == 1016001f) // Preview if (e.Priority == 1016001f) // Preview
{ {
@ -241,52 +241,44 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{ {
ITextureSender sender = null; ITextureSender sender = null;
// try try
// { {
while (true) while (true)
{ {
try sender = m_queueSenders.Dequeue();
{
sender = m_queueSenders.Dequeue();
if (sender.Cancel) if (sender.Cancel)
{
TextureSent(sender);
sender.Cancel = false;
}
else
{
bool finished = sender.SendTexturePacket();
if (finished)
{ {
TextureSent(sender); TextureSent(sender);
sender.Cancel = false;
} }
else else
{ {
bool finished = sender.SendTexturePacket(); m_queueSenders.Enqueue(sender);
if (finished)
{
TextureSent(sender);
}
else
{
m_queueSenders.Enqueue(sender);
}
} }
// Make sure that any sender we currently have can get garbage collected
sender = null;
//m_log.InfoFormat("[TEXTURE] Texture sender queue size: {0}", m_queueSenders.Count());
}
catch(Exception e)
{
m_log.ErrorFormat(
"[TEXTURE]: Texture send thread caught exception. The texture send was aborted. Exception is {0}", e);
} }
// Make sure that any sender we currently have can get garbage collected
sender = null;
//m_log.InfoFormat("[TEXTURE] Texture sender queue size: {0}", m_queueSenders.Count());
} }
// } }
// catch (Exception e) catch (Exception e)
// { {
// // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened
// m_log.ErrorFormat( m_log.ErrorFormat(
// "[TEXTURE]: Texture send thread terminating with exception. PLEASE REBOOT YOUR SIM - TEXTURES WILL NOT BE AVAILABLE UNTIL YOU DO. Exception is {0}", "[TEXTURE]: Texture send thread terminating with exception. PLEASE REBOOT YOUR SIM - TEXTURES WILL NOT BE AVAILABLE UNTIL YOU DO. Exception is {0}",
// e); e);
// } }
} }
/// <summary> /// <summary>

21
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
View File

@ -28,6 +28,7 @@
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
@ -38,11 +39,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
/// </summary> /// </summary>
public class TextureNotFoundSender : ITextureSender public class TextureNotFoundSender : ITextureSender
{ {
// private static readonly log4net.ILog m_log // private static readonly log4net.ILog m_log
// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
// private IClientAPI m_client; // private IClientAPI m_client;
// private UUID m_textureId; // private UUID m_textureId;
public TextureNotFoundSender(IClientAPI client, UUID textureID) public TextureNotFoundSender(IClientAPI client, UUID textureID)
{ {
@ -55,13 +56,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
public bool Sending public bool Sending
{ {
get { return false; } get { return false; }
set {} set { }
} }
public bool Cancel public bool Cancel
{ {
get { return false; } get { return false; }
set {} set { }
} }
// See ITextureSender // See ITextureSender
@ -73,13 +74,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
// See ITextureSender // See ITextureSender
public bool SendTexturePacket() public bool SendTexturePacket()
{ {
// m_log.DebugFormat( // m_log.DebugFormat(
// "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", // "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found",
// m_textureId); // m_textureId);
// XXX Temporarily disabling as this appears to be causing client crashes on at least // XXX Temporarily disabling as this appears to be causing client crashes on at least
// 1.19.0(5) of the Linden Second Life client. // 1.19.0(5) of the Linden Second Life client.
// m_client.SendImageNotFound(m_textureId); // m_client.SendImageNotFound(m_textureId);
return true; return true;
} }

29
OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
View File

@ -56,10 +56,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
/// <summary> /// <summary>
/// We will allow the client to request the same texture n times before dropping further requests /// We will allow the client to request the same texture n times before dropping further requests
/// ///
/// This number contains repeated requests for the same texture at different resolutions (which /// This number includes repeated requests for the same texture at different resolutions (which we don't
/// are handled since r7368). However, this situation should be handled in a more sophisticated way. /// currently handle properly as far as I know). However, this situation should be handled in a more
/// sophisticated way.
/// </summary> /// </summary>
private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 15; private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5;
/// <summary> /// <summary>
/// XXX Also going to limit requests for found textures. /// XXX Also going to limit requests for found textures.
@ -119,13 +120,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
} }
else else
{ {
// m_log.DebugFormat("[TEXTURE]: Received a request for texture {0}", e.RequestedAssetID); // m_log.DebugFormat("[TEXTURE]: Received a request for texture {0}", e.RequestedAssetID);
if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID))
{ {
// m_log.DebugFormat( // m_log.DebugFormat(
// "[TEXTURE]: Refusing request for {0} from client {1}", // "[TEXTURE]: Refusing request for {0} from client {1}",
// e.RequestedAssetID, m_client.AgentId); // e.RequestedAssetID, m_client.AgentId);
return; return;
} }
@ -138,9 +139,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
// Commenting out this message for now as it causes too much noise with other // Commenting out this message for now as it causes too much noise with other
// debug messages. // debug messages.
// m_log.DebugFormat( // m_log.DebugFormat(
// "[TEXTURE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", // "[TEXTURE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests",
// e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS);
} }
return; return;
@ -148,7 +149,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
m_scene.AddPendingDownloads(1); m_scene.AddPendingDownloads(1);
TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber, e.Priority); TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber);
m_textureSenders.Add(e.RequestedAssetID, requestHandler); m_textureSenders.Add(e.RequestedAssetID, requestHandler);
m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true);
@ -195,9 +196,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{ {
missingTextureLimitStrategy.MonitorRequests(textureID); missingTextureLimitStrategy.MonitorRequests(textureID);
// m_log.DebugFormat( // m_log.DebugFormat(
// "[TEXTURE]: Queueing first TextureNotFoundSender for {0}, client {1}", // "[TEXTURE]: Queueing first TextureNotFoundSender for {0}, client {1}",
// textureID, m_client.AgentId); // textureID, m_client.AgentId);
} }
ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID); ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID);

2
OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
agent.startpos = Vector3.Zero; agent.startpos = Vector3.Zero;
agent.CapsPath = "http://wibble.com"; agent.CapsPath = "http://wibble.com";
new TextureSender(new TestClient(agent), 0, 0, 1.0f); new TextureSender(new TestClient(agent), 0, 0);
} }
} }
} }

311
OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
View File

@ -27,104 +27,13 @@
using System; using System;
using System.Reflection; using System.Reflection;
using OpenMetaverse.Packets;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
namespace OpenSim.Region.Environment.Modules.Agent.TextureSender namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
{ {
public class ImageDownload
{
public const int FIRST_IMAGE_PACKET_SIZE = 600;
public const int IMAGE_PACKET_SIZE = 1000;
public OpenMetaverse.AssetTexture Texture;
public int DiscardLevel;
public float Priority;
public int CurrentPacket;
public int StopPacket;
public ImageDownload(OpenMetaverse.AssetTexture texture, int discardLevel, float priority, int packet)
{
Texture = texture;
Update(discardLevel, priority, packet);
}
/// <summary>
/// Updates an image transfer with new information and recalculates
/// offsets
/// </summary>
/// <param name="discardLevel">New requested discard level</param>
/// <param name="priority">New requested priority</param>
/// <param name="packet">New requested packet offset</param>
public void Update(int discardLevel, float priority, int packet)
{
Priority = priority;
DiscardLevel = Clamp(discardLevel, 0, Texture.LayerInfo.Length - 1);
StopPacket = GetPacketForBytePosition(Texture.LayerInfo[(Texture.LayerInfo.Length - 1) - DiscardLevel].End);
CurrentPacket = Clamp(packet, 1, TexturePacketCount());
}
/// <summary>
/// Returns the total number of packets needed to transfer this texture,
/// including the first packet of size FIRST_IMAGE_PACKET_SIZE
/// </summary>
/// <returns>Total number of packets needed to transfer this texture</returns>
public int TexturePacketCount()
{
return ((Texture.AssetData.Length - FIRST_IMAGE_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE) + 1;
}
/// <summary>
/// Returns the current byte offset for this transfer, calculated from
/// the CurrentPacket
/// </summary>
/// <returns>Current byte offset for this transfer</returns>
public int CurrentBytePosition()
{
return FIRST_IMAGE_PACKET_SIZE + (CurrentPacket - 1) * IMAGE_PACKET_SIZE;
}
/// <summary>
/// Returns the size, in bytes, of the last packet. This will be somewhere
/// between 1 and IMAGE_PACKET_SIZE bytes
/// </summary>
/// <returns>Size of the last packet in the transfer</returns>
public int LastPacketSize()
{
return Texture.AssetData.Length - (FIRST_IMAGE_PACKET_SIZE + ((TexturePacketCount() - 2) * IMAGE_PACKET_SIZE));
}
/// <summary>
/// Find the packet number that contains a given byte position
/// </summary>
/// <param name="bytePosition">Byte position</param>
/// <returns>Packet number that contains the given byte position</returns>
int GetPacketForBytePosition(int bytePosition)
{
return ((bytePosition - FIRST_IMAGE_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE);
}
/// <summary>
/// Clamp a given value between a range
/// </summary>
/// <param name="value">Value to clamp</param>
/// <param name="min">Minimum allowable value</param>
/// <param name="max">Maximum allowable value</param>
/// <returns>A value inclusively between lower and upper</returns>
static int Clamp(int value, int min, int max)
{
// First we check to see if we're greater than the max
value = (value > max) ? max : value;
// Then we check to see if we're less than the min.
value = (value < min) ? min : value;
// There's no check to see if min > max.
return value;
}
}
/// <summary> /// <summary>
/// A TextureSender handles the process of receiving a texture requested by the client from the /// A TextureSender handles the process of receiving a texture requested by the client from the
/// AssetCache, and then sending that texture back to the client. /// AssetCache, and then sending that texture back to the client.
@ -134,81 +43,90 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
private static readonly ILog m_log private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Records the number of times texture send has been called.
/// </summary>
public int counter = 0;
public bool ImageLoaded = false; public bool ImageLoaded = false;
/// <summary> /// <summary>
/// Holds the texture asset to send. /// Holds the texture asset to send.
/// </summary> /// </summary>
private AssetBase m_asset; private AssetBase m_asset;
private bool m_cancel = false;
private bool m_sending = false;
private bool sendFirstPacket = false;
private int initialDiscardLevel = 0;
private int initialPacketNum = 0;
private float initialPriority = 0.0f;
private ImageDownload download; //public UUID assetID { get { return m_asset.FullID; } }
// private bool m_cancel = false;
// See ITextureSender
// private bool m_sending = false;
/// <summary>
/// This is actually the number of extra packets required to send the texture data! We always assume
/// at least one is required.
/// </summary>
private int NumPackets = 0;
/// <summary>
/// Holds the packet number to send next. In this case, each packet is 1000 bytes long and starts
/// at the 600th byte (0th indexed).
/// </summary>
private int PacketCounter = 0;
private int RequestedDiscardLevel = -1;
private IClientAPI RequestUser; private IClientAPI RequestUser;
private uint StartPacketNumber = 0;
public TextureSender(IClientAPI client, int discardLevel, uint packetNumber, float priority) public TextureSender(IClientAPI client, int discardLevel, uint packetNumber)
{ {
RequestUser = client; RequestUser = client;
initialDiscardLevel = discardLevel; RequestedDiscardLevel = discardLevel;
initialPacketNum = (int)packetNumber; StartPacketNumber = packetNumber;
initialPriority = priority;
} }
#region ITextureSender Members #region ITextureSender Members
public bool Cancel public bool Cancel
{ {
get { return m_cancel; } get { return false; }
set { m_cancel = value; } set
{
// m_cancel = value;
}
} }
public bool Sending public bool Sending
{ {
get { return m_sending; } get { return false; }
set { m_sending = value; } set
{
// m_sending = value;
}
} }
// See ITextureSender // See ITextureSender
public void UpdateRequest(int discardLevel, uint packetNumber) public void UpdateRequest(int discardLevel, uint packetNumber)
{ {
if (download == null) RequestedDiscardLevel = discardLevel;
return; StartPacketNumber = packetNumber;
PacketCounter = (int)StartPacketNumber;
lock (download)
{
if (discardLevel < download.DiscardLevel)
m_log.DebugFormat("Image download {0} is changing from DiscardLevel {1} to {2}",
m_asset.FullID, download.DiscardLevel, discardLevel);
if (packetNumber != download.CurrentPacket)
m_log.DebugFormat("Image download {0} is changing from Packet {1} to {2}",
m_asset.FullID, download.CurrentPacket, packetNumber);
download.Update(discardLevel, download.Priority, (int)packetNumber);
sendFirstPacket = true;
}
} }
// See ITextureSender // See ITextureSender
public bool SendTexturePacket() public bool SendTexturePacket()
{ {
if (download != null && !m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket)) //m_log.DebugFormat("[TEXTURE SENDER]: Sending packet for {0}", m_asset.FullID);
SendPacket();
counter++;
if ((NumPackets == 0) || (RequestedDiscardLevel == -1) || (PacketCounter > NumPackets) ||
((RequestedDiscardLevel > 0) && (counter > 50 + (NumPackets / (RequestedDiscardLevel + 1)))))
{ {
SendPacket();
return false;
}
else
{
m_sending = false;
m_cancel = true;
sendFirstPacket = false;
return true; return true;
} }
return false;
} }
#endregion #endregion
@ -220,52 +138,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
public void TextureReceived(AssetBase asset) public void TextureReceived(AssetBase asset)
{ {
m_asset = asset; m_asset = asset;
NumPackets = CalculateNumPackets(asset.Data.Length);
try PacketCounter = (int)StartPacketNumber;
{ ImageLoaded = true;
OpenMetaverse.AssetTexture texture = new OpenMetaverse.AssetTexture(m_asset.FullID, m_asset.Data);
if (texture.DecodeLayerBoundaries())
{
bool sane = true;
// Sanity check all of the layers
for (int i = 0; i < texture.LayerInfo.Length; i++)
{
if (texture.LayerInfo[i].End > texture.AssetData.Length)
{
sane = false;
break;
}
}
if (sane)
{
download = new ImageDownload(texture, initialDiscardLevel, initialPriority, initialPacketNum);
ImageLoaded = true;
m_sending = true;
m_cancel = false;
sendFirstPacket = true;
return;
}
else
{
m_log.Error("JPEG2000 texture decoding succeeded, but sanity check failed for " +
m_asset.FullID.ToString());
}
}
else
{
m_log.Error("JPEG2000 texture decoding failed for " + m_asset.FullID.ToString());
}
}
catch (Exception ex)
{
m_log.Error("JPEG2000 texture decoding threw an exception for " + m_asset.FullID.ToString(), ex);
}
ImageLoaded = false;
m_sending = false;
m_cancel = true;
} }
/// <summary> /// <summary>
@ -273,48 +148,66 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
/// </summary> /// </summary>
private void SendPacket() private void SendPacket()
{ {
lock (download) if (PacketCounter <= NumPackets)
{ {
if (sendFirstPacket) if (PacketCounter == 0)
{ {
sendFirstPacket = false; if (NumPackets == 0)
if (m_asset.Data.Length <= ImageDownload.FIRST_IMAGE_PACKET_SIZE)
{ {
RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
return; PacketCounter++;
} }
else else
{ {
byte[] firstImageData = new byte[ImageDownload.FIRST_IMAGE_PACKET_SIZE]; byte[] ImageData1 = new byte[600];
try { Buffer.BlockCopy(m_asset.Data, 0, firstImageData, 0, ImageDownload.FIRST_IMAGE_PACKET_SIZE); } Array.Copy(m_asset.Data, 0, ImageData1, 0, 600);
catch (Exception)
{ RequestUser.SendImageFirstPart(
m_log.Error("Texture data copy failed on first packet for " + m_asset.FullID.ToString()); (ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2);
m_cancel = true; PacketCounter++;
m_sending = false;
return;
}
RequestUser.SendImageFirstPart((ushort)download.TexturePacketCount(), m_asset.FullID, (uint)m_asset.Data.Length, firstImageData, 2);
} }
} }
else
int imagePacketSize = (download.CurrentPacket == download.TexturePacketCount() - 1) ?
download.LastPacketSize() : ImageDownload.IMAGE_PACKET_SIZE;
byte[] imageData = new byte[imagePacketSize];
try { Buffer.BlockCopy(m_asset.Data, download.CurrentBytePosition(), imageData, 0, imagePacketSize); }
catch (Exception)
{ {
m_log.Error("Texture data copy failed for " + m_asset.FullID.ToString()); int size = m_asset.Data.Length - 600 - (1000 * (PacketCounter - 1));
m_cancel = true; if (size > 1000) size = 1000;
m_sending = false; byte[] imageData = new byte[size];
return; try
} {
Array.Copy(m_asset.Data, 600 + (1000 * (PacketCounter - 1)), imageData, 0, size);
}
catch (ArgumentOutOfRangeException)
{
m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" +
m_asset.FullID.ToString());
return;
}
RequestUser.SendImageNextPart((ushort)download.CurrentPacket, m_asset.FullID, imageData); RequestUser.SendImageNextPart((ushort)PacketCounter, m_asset.FullID, imageData);
++download.CurrentPacket; PacketCounter++;
}
} }
} }
/// <summary>
/// Calculate the number of packets that will be required to send the texture loaded into this sender
/// This is actually the number of 1000 byte packets not including an initial 600 byte packet...
/// </summary>
/// <param name="length"></param>
/// <returns></returns>
private int CalculateNumPackets(int length)
{
int numPackets = 0;
if (length > 600)
{
//over 600 bytes so split up file
int restData = (length - 600);
int restPackets = ((restData + 999) / 1000);
numPackets = restPackets;
}
return numPackets;
}
} }
} }

25
OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
View File

@ -30,6 +30,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
@ -101,10 +102,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
private Dictionary<UUID, ulong> m_rootAgents = new Dictionary<UUID, ulong>(); private Dictionary<UUID, ulong> m_rootAgents = new Dictionary<UUID, ulong>();
private Dictionary<UUID, UUID> m_pendingCallingcardRequests = new Dictionary<UUID,UUID>(); private Dictionary<UUID, UUID> m_pendingCallingcardRequests = new Dictionary<UUID, UUID>();
private Scene m_initialScene; // saves a lookup if we don't have a specific scene private Scene m_initialScene; // saves a lookup if we don't have a specific scene
private Dictionary<ulong, Scene> m_scenes = new Dictionary<ulong,Scene>(); private Dictionary<ulong, Scene> m_scenes = new Dictionary<ulong, Scene>();
private IMessageTransferModule m_TransferModule = null; private IMessageTransferModule m_TransferModule = null;
#region IRegionModule Members #region IRegionModule Members
@ -212,7 +213,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
} }
} }
} }
catch(Exception e) catch (Exception e)
{ {
m_log.Warn("[FRIENDS]: Got exception while parsing presence_update_bulk request:", e); m_log.Warn("[FRIENDS]: Got exception while parsing presence_update_bulk request:", e);
} }
@ -491,7 +492,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
// If new friend is local, it will send an IM to the viewer. // If new friend is local, it will send an IM to the viewer.
// If new friend is remote, it will cause a OnGridInstantMessage on the remote server // If new friend is remote, it will cause a OnGridInstantMessage on the remote server
m_TransferModule.SendInstantMessage(msg, m_TransferModule.SendInstantMessage(msg,
delegate(bool success) { delegate(bool success)
{
m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
} }
); );
@ -510,7 +512,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
{ {
// this should succeed as we *know* the root agent is here. // this should succeed as we *know* the root agent is here.
m_TransferModule.SendInstantMessage(msg, m_TransferModule.SendInstantMessage(msg,
delegate(bool success) { delegate(bool success)
{
m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
} }
); );
@ -566,7 +569,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
client.Name, client.AgentId, agentID, friendID); client.Name, client.AgentId, agentID, friendID);
// store the new friend persistently for both avatars // store the new friend persistently for both avatars
m_initialScene.StoreAddFriendship(friendID, agentID, (uint) FriendRights.CanSeeOnline); m_initialScene.StoreAddFriendship(friendID, agentID, (uint)FriendRights.CanSeeOnline);
// The cache entries aren't valid anymore either, as we just added a friend to both sides. // The cache entries aren't valid anymore either, as we just added a friend to both sides.
lock (m_friendLists) lock (m_friendLists)
@ -609,7 +612,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
if (m_TransferModule != null) if (m_TransferModule != null)
{ {
m_TransferModule.SendInstantMessage(msg, m_TransferModule.SendInstantMessage(msg,
delegate(bool success) { delegate(bool success)
{
m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
} }
); );
@ -633,7 +637,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
if (m_TransferModule != null) if (m_TransferModule != null)
{ {
m_TransferModule.SendInstantMessage(msg, m_TransferModule.SendInstantMessage(msg,
delegate(bool success) { delegate(bool success)
{
m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
} }
); );
@ -914,7 +919,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
if (friendIDsToSendTo.Count > 0) if (friendIDsToSendTo.Count > 0)
{ {
// sort them into regions // sort them into regions
Dictionary<ulong, List<UUID>> friendsInRegion = new Dictionary<ulong,List<UUID>>(); Dictionary<ulong, List<UUID>> friendsInRegion = new Dictionary<ulong, List<UUID>>();
foreach (UUID uuid in friendIDsToSendTo) foreach (UUID uuid in friendIDsToSendTo)
{ {
ulong handle = friendRegions[uuid].regionHandle; // this can't fail as we filtered above already ulong handle = friendRegions[uuid].regionHandle; // this can't fail as we filtered above already
@ -993,5 +998,5 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
} }
} }
#endregion #endregion
} }

23
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -31,6 +31,7 @@ using System.Reflection;
using System.Text; using System.Text;
using System.Timers; using System.Timers;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
@ -60,14 +61,14 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (group is SceneObjectGroup) if (group is SceneObjectGroup)
{ {
((SceneObjectGroup) group).CreateScriptInstances(0, false, DefaultScriptEngine, 0); ((SceneObjectGroup)group).CreateScriptInstances(0, false, DefaultScriptEngine, 0);
} }
} }
} }
public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item) public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item)
{ {
IMoneyModule money=RequestModuleInterface<IMoneyModule>(); IMoneyModule money = RequestModuleInterface<IMoneyModule>();
if (money != null) if (money != null)
{ {
money.ApplyUploadCharge(agentID); money.ApplyUploadCharge(agentID);
@ -335,9 +336,9 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="name">The name of the updated item</param> /// <param name="name">The name of the updated item</param>
/// <param name="description">The description of the updated item</param> /// <param name="description">The description of the updated item</param>
/// <param name="nextOwnerMask">The permissions of the updated item</param> /// <param name="nextOwnerMask">The permissions of the updated item</param>
/* public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID, /* public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
UUID itemID, string name, string description, UUID itemID, string name, string description,
uint nextOwnerMask)*/ uint nextOwnerMask)*/
public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID, public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
UUID itemID, InventoryItemBase itemUpd) UUID itemID, InventoryItemBase itemUpd)
{ {
@ -502,7 +503,7 @@ namespace OpenSim.Region.Environment.Scenes
if ((item.CurrentPermissions & 8) != 0) // Propagate slam bit if ((item.CurrentPermissions & 8) != 0) // Propagate slam bit
{ {
itemCopy.CurrentPermissions = item.NextPermissions; itemCopy.CurrentPermissions = item.NextPermissions;
itemCopy.BasePermissions=itemCopy.CurrentPermissions; itemCopy.BasePermissions = itemCopy.CurrentPermissions;
itemCopy.CurrentPermissions |= 8; itemCopy.CurrentPermissions |= 8;
} }
@ -989,8 +990,8 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (ent is SceneObjectGroup) if (ent is SceneObjectGroup)
{ {
if (((SceneObjectGroup) ent).HasChildPrim(localID)) if (((SceneObjectGroup)ent).HasChildPrim(localID))
return (SceneObjectGroup) ent; return (SceneObjectGroup)ent;
} }
} }
return null; return null;
@ -1958,8 +1959,8 @@ namespace OpenSim.Region.Environment.Scenes
if (remoteClient != null && (remoteClient.AgentId != objectGroup.RootPart.OwnerID) && Permissions.PropagatePermissions()) if (remoteClient != null && (remoteClient.AgentId != objectGroup.RootPart.OwnerID) && Permissions.PropagatePermissions())
{ {
uint perms=objectGroup.GetEffectivePermissions(); uint perms = objectGroup.GetEffectivePermissions();
uint nextPerms=(perms & 7) << 13; uint nextPerms = (perms & 7) << 13;
if ((nextPerms & (uint)PermissionMask.Copy) == 0) if ((nextPerms & (uint)PermissionMask.Copy) == 0)
perms &= ~(uint)PermissionMask.Copy; perms &= ~(uint)PermissionMask.Copy;
if ((nextPerms & (uint)PermissionMask.Transfer) == 0) if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
@ -2213,7 +2214,7 @@ namespace OpenSim.Region.Environment.Scenes
Vector3 pos = GetNewRezLocation( Vector3 pos = GetNewRezLocation(
RayStart, RayEnd, RayTargetID, Quaternion.Identity, RayStart, RayEnd, RayTargetID, Quaternion.Identity,
BypassRayCast, bRayEndIsIntersection,true,scale, false); BypassRayCast, bRayEndIsIntersection, true, scale, false);
// Rez object // Rez object
CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);

86
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
private IConfig m_ScriptConfig; private IConfig m_ScriptConfig;
private ICompiler m_Compiler; private ICompiler m_Compiler;
private int m_MinThreads; private int m_MinThreads;
private int m_MaxThreads ; private int m_MaxThreads;
private int m_IdleTimeout; private int m_IdleTimeout;
private int m_StackSize; private int m_StackSize;
private int m_SleepTime; private int m_SleepTime;
@ -72,8 +72,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
private bool m_Enabled = false; private bool m_Enabled = false;
private bool m_InitialStartup = true; private bool m_InitialStartup = true;
// disable warning: need to keep a reference to XEngine.EventManager // disable warning: need to keep a reference to XEngine.EventManager
// alive to avoid it being garbage collected // alive to avoid it being garbage collected
#pragma warning disable 414 #pragma warning disable 414
private EventManager m_EventManager; private EventManager m_EventManager;
#pragma warning restore 414 #pragma warning restore 414
@ -85,8 +85,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// Maps the local id to the script inventory items in it // Maps the local id to the script inventory items in it
private Dictionary<uint, List<UUID> > m_PrimObjects = private Dictionary<uint, List<UUID>> m_PrimObjects =
new Dictionary<uint, List<UUID> >(); new Dictionary<uint, List<UUID>>();
// Maps the UUID above to the script instance // Maps the UUID above to the script instance
@ -105,8 +105,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// List the scripts running in each appdomain // List the scripts running in each appdomain
private Dictionary<UUID, List<UUID> > m_DomainScripts = private Dictionary<UUID, List<UUID>> m_DomainScripts =
new Dictionary<UUID, List<UUID> >(); new Dictionary<UUID, List<UUID>>();
private Queue m_CompileQueue = new Queue(100); private Queue m_CompileQueue = new Queue(100);
IWorkItemResult m_CurrentCompile = null; IWorkItemResult m_CurrentCompile = null;
@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (m_ScriptConfig == null) if (m_ScriptConfig == null)
{ {
// m_log.ErrorFormat("[XEngine] No script configuration found. Scripts disabled"); // m_log.ErrorFormat("[XEngine] No script configuration found. Scripts disabled");
return; return;
} }
@ -172,7 +172,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
m_MaxThreads = m_ScriptConfig.GetInt("MaxThreads", 100); m_MaxThreads = m_ScriptConfig.GetInt("MaxThreads", 100);
m_IdleTimeout = m_ScriptConfig.GetInt("IdleTimeout", 60); m_IdleTimeout = m_ScriptConfig.GetInt("IdleTimeout", 60);
string priority = m_ScriptConfig.GetString("Priority", "BelowNormal"); string priority = m_ScriptConfig.GetString("Priority", "BelowNormal");
m_MaxScriptQueue = m_ScriptConfig.GetInt("MaxScriptEventQueue",300); m_MaxScriptQueue = m_ScriptConfig.GetInt("MaxScriptEventQueue", 300);
m_StackSize = m_ScriptConfig.GetInt("ThreadStackSize", 262144); m_StackSize = m_ScriptConfig.GetInt("ThreadStackSize", 262144);
m_SleepTime = m_ScriptConfig.GetInt("MaintenanceInterval", 10) * 1000; m_SleepTime = m_ScriptConfig.GetInt("MaintenanceInterval", 10) * 1000;
@ -239,7 +239,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (m_SleepTime > 0) if (m_SleepTime > 0)
{ {
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance),
new Object[]{ m_SleepTime }); new Object[] { m_SleepTime });
} }
if (m_SaveTime > 0) if (m_SaveTime > 0)
@ -268,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (saveTime > 0) if (saveTime > 0)
System.Threading.Thread.Sleep(saveTime); System.Threading.Thread.Sleep(saveTime);
// m_log.Debug("[XEngine] Backing up script states"); // m_log.Debug("[XEngine] Backing up script states");
List<IScriptInstance> instances = new List<IScriptInstance>(); List<IScriptInstance> instances = new List<IScriptInstance>();
@ -319,7 +319,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
System.Threading.Thread.Sleep(sleepTime); System.Threading.Thread.Sleep(sleepTime);
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance),
new Object[]{ sleepTime }); new Object[] { sleepTime });
return 0; return 0;
} }
@ -351,12 +351,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
int colon = firstline.IndexOf(':'); int colon = firstline.IndexOf(':');
if (firstline.Length > 2 && firstline.Substring(0, 2) == "//" && colon != -1) if (firstline.Length > 2 && firstline.Substring(0, 2) == "//" && colon != -1)
{ {
string engineName = firstline.Substring(2, colon-2); string engineName = firstline.Substring(2, colon - 2);
if (names.Contains(engineName)) if (names.Contains(engineName))
{ {
engine = engineName; engine = engineName;
script = "//" + script.Substring(script.IndexOf(':')+1); script = "//" + script.Substring(script.IndexOf(':') + 1);
} }
else else
{ {
@ -375,11 +375,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (presence != null) if (presence != null)
{ {
presence.ControllingClient.SendAgentAlertMessage( presence.ControllingClient.SendAgentAlertMessage(
"Selected engine unavailable. "+ "Selected engine unavailable. " +
"Running script on "+ "Running script on " +
ScriptEngineName, ScriptEngineName,
false); false);
} }
} }
} }
@ -389,7 +389,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (engine != ScriptEngineName) if (engine != ScriptEngineName)
return; return;
Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez, (StateSource)stateSource}; Object[] parms = new Object[] { localID, itemID, script, startParam, postOnRez, (StateSource)stateSource };
if (stateSource == (int)StateSource.ScriptedRez) if (stateSource == (int)StateSource.ScriptedRez)
{ {
@ -453,7 +453,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
Object[] p = (Object[])parm; Object[] p = (Object[])parm;
uint localID = (uint)p[0]; uint localID = (uint)p[0];
UUID itemID = (UUID)p[1]; UUID itemID = (UUID)p[1];
string script =(string)p[2]; string script = (string)p[2];
int startParam = (int)p[3]; int startParam = (int)p[3];
bool postOnRez = (bool)p[4]; bool postOnRez = (bool)p[4];
StateSource stateSource = (StateSource)p[5]; StateSource stateSource = (StateSource)p[5];
@ -477,8 +477,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
UUID assetID = item.AssetID; UUID assetID = item.AssetID;
// m_log.DebugFormat("[XEngine] Compiling script {0} ({1})", // m_log.DebugFormat("[XEngine] Compiling script {0} ({1})",
// item.Name, itemID.ToString()); // item.Name, itemID.ToString());
ScenePresence presence = m_Scene.GetScenePresence(item.OwnerID); ScenePresence presence = m_Scene.GetScenePresence(item.OwnerID);
@ -509,7 +509,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
} }
catch (Exception e2) // LEGIT: User Scripting catch (Exception e2) // LEGIT: User Scripting
{ {
m_log.Error("[XEngine]: "+ m_log.Error("[XEngine]: " +
"Error displaying error in-world: " + "Error displaying error in-world: " +
e2.ToString()); e2.ToString());
m_log.Error("[XEngine]: " + m_log.Error("[XEngine]: " +
@ -537,28 +537,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
try try
{ {
AppDomainSetup appSetup = new AppDomainSetup(); AppDomainSetup appSetup = new AppDomainSetup();
// appSetup.ApplicationBase = Path.Combine( // appSetup.ApplicationBase = Path.Combine(
// "ScriptEngines", // "ScriptEngines",
// m_Scene.RegionInfo.RegionID.ToString()); // m_Scene.RegionInfo.RegionID.ToString());
Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
Evidence evidence = new Evidence(baseEvidence); Evidence evidence = new Evidence(baseEvidence);
AppDomain sandbox = m_AppDomains[appDomain] =
AppDomain.CreateDomain( AppDomain.CreateDomain(
m_Scene.RegionInfo.RegionID.ToString(), m_Scene.RegionInfo.RegionID.ToString(),
evidence, appSetup); evidence, appSetup);
PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
sandbox.SetAppDomainPolicy(sandboxPolicy);
m_AppDomains[appDomain] = sandbox;
m_AppDomains[appDomain].AssemblyResolve += m_AppDomains[appDomain].AssemblyResolve +=
new ResolveEventHandler( new ResolveEventHandler(
AssemblyResolver.OnAssemblyResolve); AssemblyResolver.OnAssemblyResolve);
@ -613,7 +603,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (!m_Scripts.ContainsKey(itemID)) if (!m_Scripts.ContainsKey(itemID))
return; return;
IScriptInstance instance=m_Scripts[itemID]; IScriptInstance instance = m_Scripts[itemID];
m_Scripts.Remove(itemID); m_Scripts.Remove(itemID);
instance.ClearQueue(); instance.ClearQueue();
@ -685,17 +675,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
foreach (UUID assetID in assetIDList) foreach (UUID assetID in assetIDList)
{ {
// m_log.DebugFormat("[XEngine] Removing unreferenced assembly {0}", m_Assemblies[assetID]); // m_log.DebugFormat("[XEngine] Removing unreferenced assembly {0}", m_Assemblies[assetID]);
try try
{ {
if (File.Exists(m_Assemblies[assetID])) if (File.Exists(m_Assemblies[assetID]))
File.Delete(m_Assemblies[assetID]); File.Delete(m_Assemblies[assetID]);
if (File.Exists(m_Assemblies[assetID]+".state")) if (File.Exists(m_Assemblies[assetID] + ".state"))
File.Delete(m_Assemblies[assetID]+".state"); File.Delete(m_Assemblies[assetID] + ".state");
if (File.Exists(m_Assemblies[assetID]+".mdb")) if (File.Exists(m_Assemblies[assetID] + ".mdb"))
File.Delete(m_Assemblies[assetID]+".mdb"); File.Delete(m_Assemblies[assetID] + ".mdb");
} }
catch (Exception) catch (Exception)
{ {
@ -713,7 +703,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
AppDomain.Unload(domain); AppDomain.Unload(domain);
domain = null; domain = null;
// m_log.DebugFormat("[XEngine] Unloaded app domain {0}", id.ToString()); // m_log.DebugFormat("[XEngine] Unloaded app domain {0}", id.ToString());
} }
} }
@ -757,7 +747,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
CultureInfo USCulture = new CultureInfo("en-US"); CultureInfo USCulture = new CultureInfo("en-US");
Thread.CurrentThread.CurrentCulture = USCulture; Thread.CurrentThread.CurrentCulture = USCulture;
IScriptInstance instance = (ScriptInstance) parms; IScriptInstance instance = (ScriptInstance)parms;
//m_log.DebugFormat("[XENGINE]: Processing event for {0}", instance); //m_log.DebugFormat("[XENGINE]: Processing event for {0}", instance);
@ -831,7 +821,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
foreach (string s in pathList) foreach (string s in pathList)
{ {
string path = Path.Combine(Directory.GetCurrentDirectory(), string path = Path.Combine(Directory.GetCurrentDirectory(),
Path.Combine(s, assemblyName))+".dll"; Path.Combine(s, assemblyName)) + ".dll";
if (File.Exists(path)) if (File.Exists(path))
return Assembly.LoadFrom(path); return Assembly.LoadFrom(path);
@ -969,7 +959,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
i.Running = prevRunning; i.Running = prevRunning;
} }
DoBackup(new Object[] {0}); DoBackup(new Object[] { 0 });
} }
public IScriptApi GetApi(UUID itemID, string name) public IScriptApi GetApi(UUID itemID, string name)

BIN
bin/OpenMetaverse.dll
View File

Binary file not shown.

BIN
bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
View File

Binary file not shown.

BIN
bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
View File

Binary file not shown.

BIN
bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
View File

Binary file not shown.

BIN
bin/openjpeg-dotnet.dll
View File

Binary file not shown.