diff options
author | Teravus Ovares | 2007-11-21 02:17:24 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-21 02:17:24 +0000 |
commit | 7cb38712d5ad6781e672e4f1c8500ecd88d85f3e (patch) | |
tree | 5203c9901fdbba5ec8d9a21880d7895f593af540 /OpenSim/Framework/RegionCommsListener.cs | |
parent | fix for mantis #2 from Justin Casey (IBM) (diff) | |
download | opensim-SC_OLD-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.zip opensim-SC_OLD-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.tar.gz opensim-SC_OLD-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.tar.bz2 opensim-SC_OLD-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.tar.xz |
* Did some initial work for prim crossing. Just glue so far.
* Added the child_get_tasks OpenSim.ini flag for testing the UDP packet sending code and packet throttler. This flag gets purposely disabled in grid mode. This flag also has the consequence that you can see the prim in neighboring regions without going into them. Be warned, this causes tons of dropped packets.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionCommsListener.cs | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index 84d1b02..5dc9b81 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs | |||
@@ -34,10 +34,13 @@ namespace OpenSim.Framework | |||
34 | public class RegionCommsListener : IRegionCommsListener | 34 | public class RegionCommsListener : IRegionCommsListener |
35 | { | 35 | { |
36 | public event ExpectUserDelegate OnExpectUser; | 36 | public event ExpectUserDelegate OnExpectUser; |
37 | public event ExpectPrimDelegate OnExpectPrim; | ||
37 | public event GenericCall2 OnExpectChildAgent; | 38 | public event GenericCall2 OnExpectChildAgent; |
38 | public event AgentCrossing OnAvatarCrossingIntoRegion; | 39 | public event AgentCrossing OnAvatarCrossingIntoRegion; |
40 | public event PrimCrossing OnPrimCrossingIntoRegion; | ||
39 | public event UpdateNeighbours OnNeighboursUpdate; | 41 | public event UpdateNeighbours OnNeighboursUpdate; |
40 | public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed; | 42 | public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed; |
43 | public event AcknowledgePrimCross OnAcknowledgePrimCrossed; | ||
41 | public event CloseAgentConnection OnCloseAgentConnection; | 44 | public event CloseAgentConnection OnCloseAgentConnection; |
42 | 45 | ||
43 | /// <summary> | 46 | /// <summary> |
@@ -55,6 +58,15 @@ namespace OpenSim.Framework | |||
55 | 58 | ||
56 | return false; | 59 | return false; |
57 | } | 60 | } |
61 | public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData) | ||
62 | { | ||
63 | if (OnExpectUser != null) | ||
64 | { | ||
65 | OnExpectPrim(regionHandle, primID, objData); | ||
66 | return true; | ||
67 | } | ||
68 | return false; | ||
69 | } | ||
58 | 70 | ||
59 | public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, | 71 | public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, |
60 | bool isFlying) | 72 | bool isFlying) |
@@ -66,6 +78,15 @@ namespace OpenSim.Framework | |||
66 | } | 78 | } |
67 | return false; | 79 | return false; |
68 | } | 80 | } |
81 | public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) | ||
82 | { | ||
83 | if (OnPrimCrossingIntoRegion != null) | ||
84 | { | ||
85 | OnPrimCrossingIntoRegion(regionHandle, primID, position, isPhysical); | ||
86 | return true; | ||
87 | } | ||
88 | return false; | ||
89 | } | ||
69 | 90 | ||
70 | public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID) | 91 | public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID) |
71 | { | 92 | { |
@@ -77,6 +98,16 @@ namespace OpenSim.Framework | |||
77 | return false; | 98 | return false; |
78 | } | 99 | } |
79 | 100 | ||
101 | public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) | ||
102 | { | ||
103 | if (OnAcknowledgePrimCrossed != null) | ||
104 | { | ||
105 | OnAcknowledgePrimCrossed(regionHandle, primID); | ||
106 | return true; | ||
107 | } | ||
108 | return false; | ||
109 | } | ||
110 | |||
80 | public virtual void TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID) | 111 | public virtual void TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID) |
81 | { | 112 | { |
82 | if (OnCloseAgentConnection != null) | 113 | if (OnCloseAgentConnection != null) |