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

change encoding of a few event caps messages

0.9.1.0-post-fixes
UbitUmarov 2019-01-26 16:42:42 +00:00
parent 07946e040d
commit 695d807696
5 changed files with 294 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
OpenSim/Framework/LLSDxmlEncode.cs
View File

@ -176,96 +176,96 @@ namespace OpenSim.Framework
public static void AddElem(Vector2 e, StringBuilder sb)
{
sb.Append("<map><key>x</key>");
sb.Append("<array>");
if(e.X == 0)
sb.Append("<real /><key>y</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>y</key>");
sb.Append("</real>");
}
if(e.Y == 0)
sb.Append("<real /></map>");
sb.Append("<real /></array>");
else
{
sb.Append("<real>");
sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
sb.Append("</real></map>");
sb.Append("</real></array>");
}
}
public static void AddElem(Vector3 e, StringBuilder sb)
{
sb.Append("<map>key>x</key>");
sb.Append("<array>");
if(e.X == 0)
sb.Append("<real /><key>y</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>y</key>");
sb.Append("</real>");
}
if(e.Y == 0)
sb.Append("<real /><key>z</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>z</key>");
sb.Append("</real>");
}
if(e.Z == 0)
sb.Append("<real /></map>");
sb.Append("<real /></array>");
else
{
sb.Append("<real>");
sb.Append(e.Z.ToString(CultureInfo.InvariantCulture));
sb.Append("</real></map>");
sb.Append("</real></array>");
}
}
public static void AddElem(Quaternion e, StringBuilder sb)
{
sb.Append("<map><key>x</key>");
sb.Append("<array><key>x</key>");
if(e.X == 0)
sb.Append("<real /><key>y</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>y</key>");
sb.Append("</real>");
}
if(e.Y == 0)
sb.Append("<real /><key>z</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>z</key>");
sb.Append("</real>");
}
if(e.Z == 0)
sb.Append("<real /><key>w</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.Z.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>w</key>");
sb.Append("</real>");
}
if(e.W == 0)
sb.Append("<real /></map>");
sb.Append("<real /></array>");
else
{
sb.Append("<real>");
sb.Append(e.W.ToString(CultureInfo.InvariantCulture));
sb.Append("</real></map>");
sb.Append("</real></array>");
}
}
@ -491,24 +491,24 @@ namespace OpenSim.Framework
{
sb.Append("<key>");
sb.Append(name);
sb.Append("</key><map><key>x</key>");
sb.Append("</key><array>>");
if(e.X == 0)
sb.Append("<real /><key>y</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>y</key>");
sb.Append("</real>");
}
if(e.Y == 0)
sb.Append("<real /></map>");
sb.Append("<real /></array>");
else
{
sb.Append("<real>");
sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
sb.Append("</real></map>");
sb.Append("</real></array>");
}
}
@ -516,33 +516,33 @@ namespace OpenSim.Framework
{
sb.Append("<key>");
sb.Append(name);
sb.Append("</key><map>key>x</key>");
sb.Append("</key><array>");
if(e.X == 0)
sb.Append("<real /><key>y</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>y</key>");
sb.Append("</real>");
}
if(e.Y == 0)
sb.Append("<real /><key>z</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>z</key>");
sb.Append("</real>");
}
if(e.Z == 0)
sb.Append("<real /></map>");
sb.Append("<real /></array>");
else
{
sb.Append("<real>");
sb.Append(e.Z.ToString(CultureInfo.InvariantCulture));
sb.Append("</real></map>");
sb.Append("</real></array>");
}
}
@ -550,41 +550,41 @@ namespace OpenSim.Framework
{
sb.Append("<key>");
sb.Append(name);
sb.Append("</key><map><key>x</key>");
sb.Append("</key><array>");
if(e.X == 0)
sb.Append("<real /><key>y</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>y</key>");
sb.Append("</real>");
}
if(e.Y == 0)
sb.Append("<real /><key>z</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>z</key>");
sb.Append("</real>");
}
if(e.Z == 0)
sb.Append("<real /><key>w</key>");
sb.Append("<real />");
else
{
sb.Append("<real>");
sb.Append(e.Z.ToString(CultureInfo.InvariantCulture));
sb.Append("</real><key>w</key>");
sb.Append("</real>");
}
if(e.W == 0)
sb.Append("<real /></map>");
sb.Append("<real /></array>");
else
{
sb.Append("<real>");
sb.Append(e.W.ToString(CultureInfo.InvariantCulture));
sb.Append("</real></map>");
sb.Append("</real></array>");
}
}

17
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
View File

@ -499,6 +499,23 @@ namespace OpenSim.Region.ClientStack.Linden
Enqueue(item, avatarID);
}
*/
public StringBuilder StartEvent(string eventName)
{
StringBuilder sb = new StringBuilder(256);
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("message", eventName, sb);
LLSDxmlEncode.AddMap("body", sb);
return sb;
}
public string EndEvent(StringBuilder sb)
{
LLSDxmlEncode.AddEndMap(sb); // close body
LLSDxmlEncode.AddEndMap(sb); // close event
return sb.ToString();
}
public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
{
if (DebugLevel > 0)

194
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -30,6 +30,7 @@ using System.Collections.Generic;
using System.Net;
using System.Reflection;
using System.Runtime;
using System.Text;
using System.Threading;
using log4net;
@ -4847,19 +4848,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_entityProps.Enqueue(priority, new ObjectPropertyUpdate(entity,0,false,true));
}
List<ObjectPropertiesFamilyPacket.ObjectDataBlock> objectFamilyBlocks = new
List<ObjectPropertiesFamilyPacket.ObjectDataBlock>();
List<ObjectPropertiesPacket.ObjectDataBlock> objectPropertiesBlocks =
new List<ObjectPropertiesPacket.ObjectDataBlock>();
List<SceneObjectPart> needPhysics = new List<SceneObjectPart>();
private void ProcessEntityPropertyRequests(int maxUpdateBytes)
{
// OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>> familyUpdates =
// new OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>>();
// OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>> propertyUpdates =
// new OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>>();
List<ObjectPropertiesFamilyPacket.ObjectDataBlock> objectFamilyBlocks = null;
List<ObjectPropertiesPacket.ObjectDataBlock> objectPropertiesBlocks = null;
List<SceneObjectPart> needPhysics = null;
bool orderedDequeue = m_scene.UpdatePrioritizationScheme == UpdatePrioritizationSchemes.SimpleAngularDistance;
@ -4888,8 +4881,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
SceneObjectPart sop = (SceneObjectPart)update.Entity;
ObjectPropertiesFamilyPacket.ObjectDataBlock objPropDB = CreateObjectPropertiesFamilyBlock(sop,update.Flags);
if(objectFamilyBlocks == null)
objectFamilyBlocks = new List<ObjectPropertiesFamilyPacket.ObjectDataBlock>();
objectFamilyBlocks.Add(objPropDB);
// familyUpdates.Value.Add(update);
maxUpdateBytes -= objPropDB.Length;
}
}
@ -4899,26 +4893,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (update.Entity is SceneObjectPart)
{
SceneObjectPart sop = (SceneObjectPart)update.Entity;
if(needPhysics == null)
needPhysics = new List<SceneObjectPart>();
needPhysics.Add(sop);
ObjectPropertiesPacket.ObjectDataBlock objPropDB = CreateObjectPropertiesBlock(sop);
if(objectPropertiesBlocks == null)
objectPropertiesBlocks = new List<ObjectPropertiesPacket.ObjectDataBlock>();
objectPropertiesBlocks.Add(objPropDB);
// propertyUpdates.Value.Add(update);
maxUpdateBytes -= objPropDB.Length;
}
}
}
if (objectPropertiesBlocks.Count > 0)
if (objectPropertiesBlocks != null)
{
ObjectPropertiesPacket packet = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
packet.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[objectPropertiesBlocks.Count];
for (int i = 0; i < objectPropertiesBlocks.Count; i++)
packet.ObjectData[i] = objectPropertiesBlocks[i];
objectPropertiesBlocks.Clear();
packet.Header.Zerocoded = true;
// Pass in the delegate so that if this packet needs to be resent, we send the current properties
// of the object rather than the properties when the packet was created
// HACK : Remove intelligent resending until it's fixed in core
@ -4928,15 +4921,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// ResendPropertyUpdates(propertyUpdates.Value, oPacket);
// });
OutPacket(packet, ThrottleOutPacketType.Task, true);
// pbcnt += blocks.Count;
// ppcnt++;
}
// Int32 fpcnt = 0;
// Int32 fbcnt = 0;
if (objectFamilyBlocks.Count > 0)
if (objectFamilyBlocks != null)
{
// one packet per object block... uggh...
for (int i = 0; i < objectFamilyBlocks.Count; i++)
@ -4945,7 +4932,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
(ObjectPropertiesFamilyPacket)PacketPool.Instance.GetPacket(PacketType.ObjectPropertiesFamily);
packet.ObjectData = objectFamilyBlocks[i];
packet.Header.Zerocoded = true;
// Pass in the delegate so that if this packet needs to be resent, we send the current properties
// of the object rather than the properties when the packet was created
@ -4958,41 +4944,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// ResendPropertyUpdates(updates, oPacket);
// });
OutPacket(packet, ThrottleOutPacketType.Task, true);
// fpcnt++;
// fbcnt++;
}
objectFamilyBlocks.Clear();
}
if(needPhysics.Count > 0)
if(needPhysics != null)
{
IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
if(eq != null)
{
OSDArray array = new OSDArray();
foreach(SceneObjectPart sop in needPhysics)
StringBuilder sb = eq.StartEvent("ObjectPhysicsProperties");
LLSDxmlEncode.AddArray("ObjectData", sb);
foreach (SceneObjectPart sop in needPhysics)
{
OSDMap physinfo = new OSDMap(6);
physinfo["LocalID"] = sop.LocalId;
physinfo["Density"] = sop.Density;
physinfo["Friction"] = sop.Friction;
physinfo["GravityMultiplier"] = sop.GravityModifier;
physinfo["Restitution"] = sop.Restitution;
physinfo["PhysicsShapeType"] = (int)sop.PhysicsShapeType;
array.Add(physinfo);
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("LocalID",(int)sop.LocalId, sb);
LLSDxmlEncode.AddElem("Density", sop.Density, sb);
LLSDxmlEncode.AddElem("Friction", sop.Friction, sb);
LLSDxmlEncode.AddElem("GravityMultiplier", sop.GravityModifier, sb);
LLSDxmlEncode.AddElem("Restitution", sop.Restitution, sb);
LLSDxmlEncode.AddElem("PhysicsShapeType", (int)sop.PhysicsShapeType, sb);
LLSDxmlEncode.AddEndMap(sb);
}
OSDMap llsdBody = new OSDMap(1);
llsdBody.Add("ObjectData", array);
eq.Enqueue(BuildEvent("ObjectPhysicsProperties", llsdBody),AgentId);
LLSDxmlEncode.AddEndArray(sb);
OSDllsdxml ev = new OSDllsdxml(eq.EndEvent(sb));
eq.Enqueue(ev, AgentId);
}
needPhysics.Clear();
}
// m_log.WarnFormat("[PACKETCOUNTS] queued {0} property packets with {1} blocks",ppcnt,pbcnt);
// m_log.WarnFormat("[PACKETCOUNTS] queued {0} family property packets with {1} blocks",fpcnt,fbcnt);
}
private ObjectPropertiesFamilyPacket.ObjectDataBlock CreateObjectPropertiesFamilyBlock(SceneObjectPart sop, PrimUpdateFlags requestFlags)
@ -5309,12 +5286,117 @@ namespace OpenSim.Region.ClientStack.LindenUDP
int sequence_id, bool snap_selection, int request_result, ILandObject lo,
float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
{
// m_log.DebugFormat("[LLCLIENTVIEW]: Sending land properties for {0} to {1}", lo.LandData.GlobalID, Name);
// m_log.DebugFormat("[LLCLIENTVIEW]: Sending land properties for {0} to {1}", lo.LandData.GlobalID, Name);
IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
if (eq == null)
{
m_log.Warn("[LLCLIENTVIEW]: No EQ Interface when sending parcel data.");
return;
}
LandData landData = lo.LandData;
IPrimCounts pc = lo.PrimCounts;
ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage();
StringBuilder sb = eq.StartEvent("ParcelProperties");
LLSDxmlEncode.AddArray("ParcelData", sb);
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("LocalID", landData.LocalID, sb);
LLSDxmlEncode.AddElem("AABBMax", landData.AABBMax, sb);
LLSDxmlEncode.AddElem("AABBMin", landData.AABBMin, sb);
LLSDxmlEncode.AddElem("Area", landData.Area, sb);
LLSDxmlEncode.AddElem("AuctionID", (int)landData.AuctionID, sb);
LLSDxmlEncode.AddElem("AuthBuyerID", landData.AuthBuyerID, sb);
LLSDxmlEncode.AddElem("Bitmap", landData.Bitmap, sb);
LLSDxmlEncode.AddElem("Category", (int)landData.Category, sb);
LLSDxmlEncode.AddElem("ClaimDate", Util.ToDateTime(landData.ClaimDate), sb);
LLSDxmlEncode.AddElem("ClaimPrice", landData.ClaimPrice, sb);
LLSDxmlEncode.AddElem("Desc", landData.Description, sb);
LLSDxmlEncode.AddElem("ParcelFlags", landData.Flags, sb);
LLSDxmlEncode.AddElem("GroupID", landData.GroupID, sb);
LLSDxmlEncode.AddElem("GroupPrims", pc.Group, sb);
LLSDxmlEncode.AddElem("IsGroupOwned", landData.IsGroupOwned, sb);
LLSDxmlEncode.AddElem("LandingType", (int)landData.LandingType, sb);
if (landData.Area > 0)
LLSDxmlEncode.AddElem("MaxPrims", parcelObjectCapacity, sb);
else
LLSDxmlEncode.AddElem("MaxPrims", (int)0, sb);
LLSDxmlEncode.AddElem("MediaID", landData.MediaID, sb);
LLSDxmlEncode.AddElem("MediaURL", landData.MediaURL, sb);
LLSDxmlEncode.AddElem("MediaAutoScale", landData.MediaAutoScale != 0, sb);
LLSDxmlEncode.AddElem("MusicURL", landData.MusicURL, sb);
LLSDxmlEncode.AddElem("Name", landData.Name, sb);
LLSDxmlEncode.AddElem("OtherCleanTime", landData.OtherCleanTime, sb);
LLSDxmlEncode.AddElem("OtherCount", (int)0 , sb); //TODO
LLSDxmlEncode.AddElem("OtherPrims", pc.Others, sb);
LLSDxmlEncode.AddElem("OwnerID", landData.OwnerID, sb);
LLSDxmlEncode.AddElem("OwnerPrims", pc.Owner, sb);
LLSDxmlEncode.AddElem("ParcelPrimBonus", simObjectBonusFactor, sb);
LLSDxmlEncode.AddElem("PassHours", landData.PassHours, sb);
LLSDxmlEncode.AddElem("PassPrice", landData.PassPrice, sb);
LLSDxmlEncode.AddElem("PublicCount", (int)0, sb); //TODO
LLSDxmlEncode.AddElem("Privacy", false, sb); //TODO ??
LLSDxmlEncode.AddElem("RegionDenyAnonymous", (regionFlags & (uint)RegionFlags.DenyAnonymous) != 0, sb);
//LLSDxmlEncode.AddElem("RegionDenyIdentified", (regionFlags & (uint)RegionFlags.DenyIdentified) != 0, sb);
LLSDxmlEncode.AddElem("RegionDenyIdentified", false, sb);
//LLSDxmlEncode.AddElem("RegionDenyTransacted", (regionFlags & (uint)RegionFlags.DenyTransacted) != 0, sb);
LLSDxmlEncode.AddElem("RegionDenyTransacted", false, sb);
LLSDxmlEncode.AddElem("RegionPushOverride", (regionFlags & (uint)RegionFlags.RestrictPushObject) != 0, sb);
LLSDxmlEncode.AddElem("RentPrice", (int) 0, sb);;
LLSDxmlEncode.AddElem("RequestResult", request_result, sb);
LLSDxmlEncode.AddElem("SalePrice", landData.SalePrice, sb);
LLSDxmlEncode.AddElem("SelectedPrims", pc.Selected, sb);
LLSDxmlEncode.AddElem("SelfCount", (int)0, sb); //TODO
LLSDxmlEncode.AddElem("SequenceID", sequence_id, sb);
if (landData.SimwideArea > 0)
LLSDxmlEncode.AddElem("SimWideMaxPrims", lo.GetSimulatorMaxPrimCount(), sb);
else
LLSDxmlEncode.AddElem("SimWideMaxPrims", (int)0, sb);
LLSDxmlEncode.AddElem("SimWideTotalPrims", pc.Simulator, sb);
LLSDxmlEncode.AddElem("SnapSelection", snap_selection, sb);
LLSDxmlEncode.AddElem("SnapshotID", landData.SnapshotID, sb);
LLSDxmlEncode.AddElem("Status", (int)landData.Status, sb);
LLSDxmlEncode.AddElem("TotalPrims", pc.Total, sb);
LLSDxmlEncode.AddElem("UserLocation", landData.UserLocation, sb);
LLSDxmlEncode.AddElem("UserLookAt", landData.UserLookAt, sb);
LLSDxmlEncode.AddElem("SeeAVs", landData.SeeAVs, sb);
LLSDxmlEncode.AddElem("AnyAVSounds", landData.AnyAVSounds, sb);
LLSDxmlEncode.AddElem("GroupAVSounds", landData.GroupAVSounds, sb);
LLSDxmlEncode.AddEndMap(sb);
LLSDxmlEncode.AddEndArray(sb);
LLSDxmlEncode.AddArray("MediaData", sb);
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("MediaDesc", landData.MediaDescription, sb);
LLSDxmlEncode.AddElem("MediaHeight", landData.MediaHeight, sb);
LLSDxmlEncode.AddElem("MediaWidth", landData.MediaWidth, sb);
LLSDxmlEncode.AddElem("MediaLoop", landData.MediaLoop, sb);
LLSDxmlEncode.AddElem("MediaType", landData.MediaType, sb);
LLSDxmlEncode.AddElem("ObscureMedia", landData.ObscureMedia, sb);
LLSDxmlEncode.AddElem("ObscureMusic", landData.ObscureMusic, sb);
LLSDxmlEncode.AddEndMap(sb);
LLSDxmlEncode.AddEndArray(sb);
LLSDxmlEncode.AddArray("AgeVerificationBlock", sb);
LLSDxmlEncode.AddMap(sb);
//LLSDxmlEncode.AddElem("RegionDenyAgeUnverified", (regionFlags & (uint)RegionFlags.DenyAgeUnverified) != 0, sb);
LLSDxmlEncode.AddElem("RegionDenyAgeUnverified", false, sb);
LLSDxmlEncode.AddEndMap(sb);
LLSDxmlEncode.AddEndArray(sb);
OSDllsdxml ev = new OSDllsdxml(eq.EndEvent(sb));
eq.Enqueue(ev, AgentId);
/*
updateMessage.AABBMax = landData.AABBMax;
updateMessage.AABBMin = landData.AABBMin;
updateMessage.Area = landData.Area;
@ -5392,7 +5474,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
updateMessage.AnyAVSounds = landData.AnyAVSounds;
updateMessage.GroupAVSounds = landData.GroupAVSounds;
IPrimCounts pc = lo.PrimCounts;
updateMessage.OwnerPrims = pc.Owner;
updateMessage.GroupPrims = pc.Group;
updateMessage.OtherPrims = pc.Others;
@ -5403,21 +5484,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//m_log.DebugFormat("[YYY]: SimWideMaxPrims={0} OwnerPrims={1} TotalPrims={2} SimWideTotalPrims={3} MaxPrims={4}",
// updateMessage.SimWideMaxPrims, updateMessage.OwnerPrims, updateMessage.TotalPrims, updateMessage.SimWideTotalPrims, updateMessage.MaxPrims);
try
{
IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
if (eq != null)
{
eq.ParcelProperties(updateMessage, this.AgentId);
}
else
{
m_log.Warn("[LLCLIENTVIEW]: No EQ Interface when sending parcel data.");
}
}
catch (Exception ex)
{
m_log.Error("[LLCLIENTVIEW]: Unable to send parcel data via eventqueue - exception: " + ex.ToString());
}
*/
}
public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID)

5
OpenSim/Region/Framework/Interfaces/IEventQueue.cs
View File

@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Text;
using System.Net;
using OpenMetaverse;
using OpenMetaverse.Packets;
@ -58,11 +59,13 @@ namespace OpenSim.Region.Framework.Interfaces
void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent,
bool canVoiceChat, bool isModerator, bool textMute, bool isEnterorLeave);
void ChatterBoxForceClose(UUID toAgent, UUID sessionID, string reason);
void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID);
//void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID);
void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data);
void ScriptRunningEvent(UUID objectID, UUID itemID, bool running, UUID avatarID);
OSD BuildEvent(string eventName, OSD eventBody);
void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID);
StringBuilder StartEvent(string eventName);
string EndEvent(StringBuilder sb);
}
}

11
OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
View File

@ -30,6 +30,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Net;
using System.Reflection;
using System.Text;
using System.Threading;
using log4net;
using Nini.Config;
@ -183,5 +184,15 @@ namespace OpenSim.Tests.Common
{
AddEvent(avatarID, "partPhysicsProperties", localID, physhapetype, density, friction, bounce, gravmod);
}
public StringBuilder StartEvent(string eventName)
{
return null;
}
public string EndEvent(StringBuilder sb)
{
return "";
}
}
}