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

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
sacha 2010-08-07 21:05:18 +00:00
parent 478d835392 cabbd187e7
commit 4900d39b7d
10 changed files with 4745 additions and 13779 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

353
OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
View File

@ -1,169 +1,184 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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 System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Region.ClientStack.LindenUDP namespace OpenSim.Region.ClientStack.LindenUDP
{ {
/// <summary> /// <summary>
/// Special collection that is optimized for tracking unacknowledged packets /// Special collection that is optimized for tracking unacknowledged packets
/// </summary> /// </summary>
public sealed class UnackedPacketCollection public sealed class UnackedPacketCollection
{ {
/// <summary> /// <summary>
/// Holds information about a pending acknowledgement /// Holds information about a pending acknowledgement
/// </summary> /// </summary>
private struct PendingAck private struct PendingAck
{ {
/// <summary>Sequence number of the packet to remove</summary> /// <summary>Sequence number of the packet to remove</summary>
public uint SequenceNumber; public uint SequenceNumber;
/// <summary>Environment.TickCount value when the remove was queued. /// <summary>Environment.TickCount value when the remove was queued.
/// This is used to update round-trip times for packets</summary> /// This is used to update round-trip times for packets</summary>
public int RemoveTime; public int RemoveTime;
/// <summary>Whether or not this acknowledgement was attached to a /// <summary>Whether or not this acknowledgement was attached to a
/// resent packet. If so, round-trip time will not be calculated</summary> /// resent packet. If so, round-trip time will not be calculated</summary>
public bool FromResend; public bool FromResend;
public PendingAck(uint sequenceNumber, int currentTime, bool fromResend) public PendingAck(uint sequenceNumber, int currentTime, bool fromResend)
{ {
SequenceNumber = sequenceNumber; SequenceNumber = sequenceNumber;
RemoveTime = currentTime; RemoveTime = currentTime;
FromResend = fromResend; FromResend = fromResend;
} }
} }
/// <summary>Holds the actual unacked packet data, sorted by sequence number</summary> /// <summary>Holds the actual unacked packet data, sorted by sequence number</summary>
private Dictionary<uint, OutgoingPacket> m_packets = new Dictionary<uint, OutgoingPacket>(); private Dictionary<uint, OutgoingPacket> m_packets = new Dictionary<uint, OutgoingPacket>();
/// <summary>Holds packets that need to be added to the unacknowledged list</summary> /// <summary>Holds packets that need to be added to the unacknowledged list</summary>
private LocklessQueue<OutgoingPacket> m_pendingAdds = new LocklessQueue<OutgoingPacket>(); private LocklessQueue<OutgoingPacket> m_pendingAdds = new LocklessQueue<OutgoingPacket>();
/// <summary>Holds information about pending acknowledgements</summary> /// <summary>Holds information about pending acknowledgements</summary>
private LocklessQueue<PendingAck> m_pendingRemoves = new LocklessQueue<PendingAck>(); private LocklessQueue<PendingAck> m_pendingRemoves = new LocklessQueue<PendingAck>();
/// <summary> /// <summary>
/// Add an unacked packet to the collection /// Add an unacked packet to the collection
/// </summary> /// </summary>
/// <param name="packet">Packet that is awaiting acknowledgement</param> /// <param name="packet">Packet that is awaiting acknowledgement</param>
/// <returns>True if the packet was successfully added, false if the /// <returns>True if the packet was successfully added, false if the
/// packet already existed in the collection</returns> /// packet already existed in the collection</returns>
/// <remarks>This does not immediately add the ACK to the collection, /// <remarks>This does not immediately add the ACK to the collection,
/// it only queues it so it can be added in a thread-safe way later</remarks> /// it only queues it so it can be added in a thread-safe way later</remarks>
public void Add(OutgoingPacket packet) public void Add(OutgoingPacket packet)
{ {
m_pendingAdds.Enqueue(packet); m_pendingAdds.Enqueue(packet);
} }
/// <summary> /// <summary>
/// Marks a packet as acknowledged /// Marks a packet as acknowledged
/// </summary> /// </summary>
/// <param name="sequenceNumber">Sequence number of the packet to /// <param name="sequenceNumber">Sequence number of the packet to
/// acknowledge</param> /// acknowledge</param>
/// <param name="currentTime">Current value of Environment.TickCount</param> /// <param name="currentTime">Current value of Environment.TickCount</param>
/// <remarks>This does not immediately acknowledge the packet, it only /// <remarks>This does not immediately acknowledge the packet, it only
/// queues the ack so it can be handled in a thread-safe way later</remarks> /// queues the ack so it can be handled in a thread-safe way later</remarks>
public void Remove(uint sequenceNumber, int currentTime, bool fromResend) public void Remove(uint sequenceNumber, int currentTime, bool fromResend)
{ {
m_pendingRemoves.Enqueue(new PendingAck(sequenceNumber, currentTime, fromResend)); m_pendingRemoves.Enqueue(new PendingAck(sequenceNumber, currentTime, fromResend));
} }
/// <summary> /// <summary>
/// Returns a list of all of the packets with a TickCount older than /// Returns a list of all of the packets with a TickCount older than
/// the specified timeout /// the specified timeout
/// </summary> /// </summary>
/// <param name="timeoutMS">Number of ticks (milliseconds) before a /// <param name="timeoutMS">Number of ticks (milliseconds) before a
/// packet is considered expired</param> /// packet is considered expired</param>
/// <returns>A list of all expired packets according to the given /// <returns>A list of all expired packets according to the given
/// expiration timeout</returns> /// expiration timeout</returns>
/// <remarks>This function is not thread safe, and cannot be called /// <remarks>This function is not thread safe, and cannot be called
/// multiple times concurrently</remarks> /// multiple times concurrently</remarks>
public List<OutgoingPacket> GetExpiredPackets(int timeoutMS) public List<OutgoingPacket> GetExpiredPackets(int timeoutMS)
{ {
ProcessQueues(); ProcessQueues();
List<OutgoingPacket> expiredPackets = null; List<OutgoingPacket> expiredPackets = null;
if (m_packets.Count > 0) if (m_packets.Count > 0)
{ {
int now = Environment.TickCount & Int32.MaxValue; int now = Environment.TickCount & Int32.MaxValue;
foreach (OutgoingPacket packet in m_packets.Values) foreach (OutgoingPacket packet in m_packets.Values)
{ {
// TickCount of zero means a packet is in the resend queue // TickCount of zero means a packet is in the resend queue
// but hasn't actually been sent over the wire yet // but hasn't actually been sent over the wire yet
if (packet.TickCount == 0) if (packet.TickCount == 0)
continue; continue;
if (now - packet.TickCount >= timeoutMS) if (now - packet.TickCount >= timeoutMS)
{ {
if (expiredPackets == null) if (expiredPackets == null)
expiredPackets = new List<OutgoingPacket>(); expiredPackets = new List<OutgoingPacket>();
// The TickCount will be set to the current time when the packet // The TickCount will be set to the current time when the packet
// is actually sent out again // is actually sent out again
packet.TickCount = 0; packet.TickCount = 0;
expiredPackets.Add(packet); expiredPackets.Add(packet);
} }
} }
} }
return expiredPackets; return expiredPackets;
} }
private void ProcessQueues() private void ProcessQueues()
{ {
// Process all the pending adds // Process all the pending adds
OutgoingPacket pendingAdd;
while (m_pendingAdds.Dequeue(out pendingAdd)) OutgoingPacket pendingAdd;
m_packets[pendingAdd.SequenceNumber] = pendingAdd; if (m_pendingAdds != null)
{
// Process all the pending removes, including updating statistics and round-trip times while (m_pendingAdds.Dequeue(out pendingAdd))
PendingAck pendingRemove; {
OutgoingPacket ackedPacket; if (pendingAdd != null && m_packets != null)
while (m_pendingRemoves.Dequeue(out pendingRemove)) {
{ m_packets[pendingAdd.SequenceNumber] = pendingAdd;
if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket)) }
{ }
m_packets.Remove(pendingRemove.SequenceNumber); }
// Update stats // Process all the pending removes, including updating statistics and round-trip times
System.Threading.Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength); PendingAck pendingRemove;
OutgoingPacket ackedPacket;
if (!pendingRemove.FromResend) if (m_pendingRemoves != null)
{ {
// Calculate the round-trip time for this packet and its ACK while (m_pendingRemoves.Dequeue(out pendingRemove))
int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount; {
if (rtt > 0) if (m_pendingRemoves != null && m_packets != null)
ackedPacket.Client.UpdateRoundTrip(rtt); {
} if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
} {
} m_packets.Remove(pendingRemove.SequenceNumber);
}
} // Update stats
} System.Threading.Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
if (!pendingRemove.FromResend)
{
// Calculate the round-trip time for this packet and its ACK
int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
if (rtt > 0)
ackedPacket.Client.UpdateRoundTrip(rtt);
}
}
}
}
}
}
}
}

443
OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
View File

@ -1,220 +1,223 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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 System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.Avatar.Dialog namespace OpenSim.Region.CoreModules.Avatar.Dialog
{ {
public class DialogModule : IRegionModule, IDialogModule public class DialogModule : IRegionModule, IDialogModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected Scene m_scene; protected Scene m_scene;
public void Initialise(Scene scene, IConfigSource source) public void Initialise(Scene scene, IConfigSource source)
{ {
m_scene = scene; m_scene = scene;
m_scene.RegisterModuleInterface<IDialogModule>(this); m_scene.RegisterModuleInterface<IDialogModule>(this);
m_scene.AddCommand( m_scene.AddCommand(
this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand); this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand);
m_scene.AddCommand( m_scene.AddCommand(
this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand); this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);
m_scene.AddCommand( m_scene.AddCommand(
this, "alert dialog", "alert dialog <message>", "Send a dialog alert to everyone", HandleAlertConsoleCommand); this, "alert dialog", "alert dialog <message>", "Send a dialog alert to everyone", HandleAlertConsoleCommand);
} }
public void PostInitialise() {} public void PostInitialise() {}
public void Close() {} public void Close() {}
public string Name { get { return "Dialog Module"; } } public string Name { get { return "Dialog Module"; } }
public bool IsSharedModule { get { return false; } } public bool IsSharedModule { get { return false; } }
public void SendAlertToUser(IClientAPI client, string message) public void SendAlertToUser(IClientAPI client, string message)
{ {
SendAlertToUser(client, message, false); SendAlertToUser(client, message, false);
} }
public void SendAlertToUser(IClientAPI client, string message, bool modal) public void SendAlertToUser(IClientAPI client, string message, bool modal)
{ {
client.SendAgentAlertMessage(message, modal); client.SendAgentAlertMessage(message, modal);
} }
public void SendAlertToUser(UUID agentID, string message) public void SendAlertToUser(UUID agentID, string message)
{ {
SendAlertToUser(agentID, message, false); SendAlertToUser(agentID, message, false);
} }
public void SendAlertToUser(UUID agentID, string message, bool modal) public void SendAlertToUser(UUID agentID, string message, bool modal)
{ {
ScenePresence sp = m_scene.GetScenePresence(agentID); ScenePresence sp = m_scene.GetScenePresence(agentID);
if (sp != null) if (sp != null)
sp.ControllingClient.SendAgentAlertMessage(message, modal); sp.ControllingClient.SendAgentAlertMessage(message, modal);
} }
public void SendAlertToUser(string firstName, string lastName, string message, bool modal) public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
{ {
ScenePresence presence = m_scene.GetScenePresence(firstName, lastName); ScenePresence presence = m_scene.GetScenePresence(firstName, lastName);
if (presence != null) if (presence != null)
presence.ControllingClient.SendAgentAlertMessage(message, modal); presence.ControllingClient.SendAgentAlertMessage(message, modal);
} }
public void SendGeneralAlert(string message) public void SendGeneralAlert(string message)
{ {
m_scene.ForEachScenePresence(delegate(ScenePresence presence) m_scene.ForEachScenePresence(delegate(ScenePresence presence)
{ {
presence.ControllingClient.SendAlertMessage(message); if (!presence.IsChildAgent)
}); {
} presence.ControllingClient.SendAlertMessage(message);
}
public void SendDialogToUser( });
UUID avatarID, string objectName, UUID objectID, UUID ownerID, }
string message, UUID textureID, int ch, string[] buttonlabels)
{ public void SendDialogToUser(
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID); UUID avatarID, string objectName, UUID objectID, UUID ownerID,
string ownerFirstName, ownerLastName; string message, UUID textureID, int ch, string[] buttonlabels)
if (account != null) {
{ UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID);
ownerFirstName = account.FirstName; string ownerFirstName, ownerLastName;
ownerLastName = account.LastName; if (account != null)
} {
else ownerFirstName = account.FirstName;
{ ownerLastName = account.LastName;
ownerFirstName = "(unknown"; }
ownerLastName = "user)"; else
} {
ownerFirstName = "(unknown";
ScenePresence sp = m_scene.GetScenePresence(avatarID); ownerLastName = "user)";
if (sp != null) }
sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
} ScenePresence sp = m_scene.GetScenePresence(avatarID);
if (sp != null)
public void SendUrlToUser( sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url) }
{
ScenePresence sp = m_scene.GetScenePresence(avatarID); public void SendUrlToUser(
UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url)
if (sp != null) {
sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); ScenePresence sp = m_scene.GetScenePresence(avatarID);
}
if (sp != null)
public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid) sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
{ }
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
string ownerFirstName, ownerLastName; public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid)
if (account != null) {
{ UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
ownerFirstName = account.FirstName; string ownerFirstName, ownerLastName;
ownerLastName = account.LastName; if (account != null)
} {
else ownerFirstName = account.FirstName;
{ ownerLastName = account.LastName;
ownerFirstName = "(unknown"; }
ownerLastName = "user)"; else
} {
ownerFirstName = "(unknown";
ScenePresence sp = m_scene.GetScenePresence(avatarid); ownerLastName = "user)";
}
if (sp != null)
sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid); ScenePresence sp = m_scene.GetScenePresence(avatarid);
}
if (sp != null)
public void SendNotificationToUsersInRegion( sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid);
UUID fromAvatarID, string fromAvatarName, string message) }
{
m_scene.ForEachScenePresence(delegate(ScenePresence presence) public void SendNotificationToUsersInRegion(
{ UUID fromAvatarID, string fromAvatarName, string message)
if (!presence.IsChildAgent) {
presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message); m_scene.ForEachScenePresence(delegate(ScenePresence presence)
}); {
} if (!presence.IsChildAgent)
presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message);
/// <summary> });
/// Handle an alert command from the console. }
/// </summary>
/// <param name="module"></param> /// <summary>
/// <param name="cmdparams"></param> /// Handle an alert command from the console.
public void HandleAlertConsoleCommand(string module, string[] cmdparams) /// </summary>
{ /// <param name="module"></param>
if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene) /// <param name="cmdparams"></param>
return; public void HandleAlertConsoleCommand(string module, string[] cmdparams)
{
if (cmdparams[1] == "general") if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene)
{ return;
string message = CombineParams(cmdparams, 2);
if (cmdparams[1] == "general")
m_log.InfoFormat( {
"[DIALOG]: Sending general alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message); string message = CombineParams(cmdparams, 2);
SendGeneralAlert(message);
} m_log.InfoFormat(
else if (cmdparams[1] == "dialog") "[DIALOG]: Sending general alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message);
{ SendGeneralAlert(message);
string message = CombineParams(cmdparams, 2); }
else if (cmdparams[1] == "dialog")
m_log.InfoFormat( {
"[DIALOG]: Sending dialog alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message); string message = CombineParams(cmdparams, 2);
SendNotificationToUsersInRegion(UUID.Zero, "System", message);
} m_log.InfoFormat(
else "[DIALOG]: Sending dialog alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message);
{ SendNotificationToUsersInRegion(UUID.Zero, "System", message);
string firstName = cmdparams[1]; }
string lastName = cmdparams[2]; else
string message = CombineParams(cmdparams, 3); {
string firstName = cmdparams[1];
m_log.InfoFormat( string lastName = cmdparams[2];
"[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", string message = CombineParams(cmdparams, 3);
m_scene.RegionInfo.RegionName, firstName, lastName, message);
SendAlertToUser(firstName, lastName, message, false); m_log.InfoFormat(
} "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}",
} m_scene.RegionInfo.RegionName, firstName, lastName, message);
SendAlertToUser(firstName, lastName, message, false);
private string CombineParams(string[] commandParams, int pos) }
{ }
string result = string.Empty;
for (int i = pos; i < commandParams.Length; i++) private string CombineParams(string[] commandParams, int pos)
{ {
result += commandParams[i] + " "; string result = string.Empty;
} for (int i = pos; i < commandParams.Length; i++)
{
return result; result += commandParams[i] + " ";
} }
}
} return result;
}
}
}

7
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -476,6 +476,7 @@ namespace OpenSim.Region.Framework.Scenes
part.IgnoreUndoUpdate = false; part.IgnoreUndoUpdate = false;
part.StoreUndoState(UndoType.STATE_GROUP_POSITION); part.StoreUndoState(UndoType.STATE_GROUP_POSITION);
part.GroupPosition = val; part.GroupPosition = val;
part.TriggerScriptChangedEvent(Changed.POSITION);
} }
foreach (ScenePresence av in m_linkedAvatars) foreach (ScenePresence av in m_linkedAvatars)
@ -1734,9 +1735,9 @@ namespace OpenSim.Region.Framework.Scenes
// don't backup while it's selected or you're asking for changes mid stream. // don't backup while it's selected or you're asking for changes mid stream.
if ((isTimeToPersist()) || (forcedBackup)) if ((isTimeToPersist()) || (forcedBackup))
{ {
m_log.DebugFormat( // m_log.DebugFormat(
"[SCENE]: Storing {0}, {1} in {2}", // "[SCENE]: Storing {0}, {1} in {2}",
Name, UUID, m_scene.RegionInfo.RegionName); // Name, UUID, m_scene.RegionInfo.RegionName);
SceneObjectGroup backup_group = Copy(false); SceneObjectGroup backup_group = Copy(false);
backup_group.RootPart.Velocity = RootPart.Velocity; backup_group.RootPart.Velocity = RootPart.Velocity;

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -60,7 +60,8 @@ namespace OpenSim.Region.Framework.Scenes
TELEPORT = 512, TELEPORT = 512,
REGION_RESTART = 1024, REGION_RESTART = 1024,
MEDIA = 2048, MEDIA = 2048,
ANIMATION = 16384 ANIMATION = 16384,
POSITION = 32768
} }
// I don't really know where to put this except here. // I don't really know where to put this except here.
@ -730,6 +731,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
TriggerScriptChangedEvent(Changed.POSITION);
} }
} }

8658
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

File diff suppressed because it is too large Load Diff

1
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@ -279,6 +279,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
public const int CHANGED_MEDIA = 2048; public const int CHANGED_MEDIA = 2048;
public const int CHANGED_ANIMATION = 16384; public const int CHANGED_ANIMATION = 16384;
public const int CHANGED_POSITION = 32768;
public const int TYPE_INVALID = 0; public const int TYPE_INVALID = 0;
public const int TYPE_INTEGER = 1; public const int TYPE_INTEGER = 1;
public const int TYPE_FLOAT = 2; public const int TYPE_FLOAT = 2;

9055
bin/ICSharpCode.SharpZipLib.xml
View File

File diff suppressed because it is too large Load Diff

3
bin/hdfsdll.dll.config
View File

@ -1,3 +0,0 @@
<configuration>
<dllmap dll="hdfsdll" target="./hdfsdll.so" />
</configuration>

BIN
bin/hdfsdll.so
View File

Binary file not shown.

BIN
bin/xmrhelpers.so
View File

Binary file not shown.