diff options
author | Justin Clark-Casey (justincc) | 2009-11-26 19:02:41 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-26 19:02:41 +0000 |
commit | 377bc27c1fdab6f45135194a53ba17cce1f3388f (patch) | |
tree | 51e2bbc45c30dfceed0311452ad9b30532d7bd13 /OpenSim/Framework/RegionCommsListener.cs | |
parent | Bump trunk version number to 0.6.9. (diff) | |
parent | Fix a small bug. Trusted script crossings now work again (diff) | |
download | opensim-SC_OLD-377bc27c1fdab6f45135194a53ba17cce1f3388f.zip opensim-SC_OLD-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.gz opensim-SC_OLD-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.bz2 opensim-SC_OLD-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/RegionCommsListener.cs')
-rw-r--r-- | OpenSim/Framework/RegionCommsListener.cs | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index 90200d6..718a556 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs | |||
@@ -43,7 +43,6 @@ namespace OpenSim.Framework | |||
43 | private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; | 43 | private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; |
44 | private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection; | 44 | private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection; |
45 | private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent; | 45 | private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent; |
46 | private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim; | ||
47 | private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser | 46 | private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser |
48 | private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate; | 47 | private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate; |
49 | private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; | 48 | private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; |
@@ -53,7 +52,6 @@ namespace OpenSim.Framework | |||
53 | #region IRegionCommsListener Members | 52 | #region IRegionCommsListener Members |
54 | 53 | ||
55 | public event ExpectUserDelegate OnExpectUser; | 54 | public event ExpectUserDelegate OnExpectUser; |
56 | public event ExpectPrimDelegate OnExpectPrim; | ||
57 | public event GenericCall2 OnExpectChildAgent; | 55 | public event GenericCall2 OnExpectChildAgent; |
58 | public event AgentCrossing OnAvatarCrossingIntoRegion; | 56 | public event AgentCrossing OnAvatarCrossingIntoRegion; |
59 | public event PrimCrossing OnPrimCrossingIntoRegion; | 57 | public event PrimCrossing OnPrimCrossingIntoRegion; |
@@ -95,17 +93,6 @@ namespace OpenSim.Framework | |||
95 | 93 | ||
96 | } | 94 | } |
97 | 95 | ||
98 | public virtual bool TriggerExpectPrim(UUID primID, string objData, int XMLMethod) | ||
99 | { | ||
100 | handlerExpectPrim = OnExpectPrim; | ||
101 | if (handlerExpectPrim != null) | ||
102 | { | ||
103 | handlerExpectPrim(primID, objData, XMLMethod); | ||
104 | return true; | ||
105 | } | ||
106 | return false; | ||
107 | } | ||
108 | |||
109 | public virtual bool TriggerChildAgentUpdate(ChildAgentDataUpdate cAgentData) | 96 | public virtual bool TriggerChildAgentUpdate(ChildAgentDataUpdate cAgentData) |
110 | { | 97 | { |
111 | handlerChildAgentUpdate = OnChildAgentUpdate; | 98 | handlerChildAgentUpdate = OnChildAgentUpdate; |
@@ -128,18 +115,6 @@ namespace OpenSim.Framework | |||
128 | return false; | 115 | return false; |
129 | } | 116 | } |
130 | 117 | ||
131 | public virtual bool TriggerExpectPrimCrossing(UUID primID, Vector3 position, | ||
132 | bool isPhysical) | ||
133 | { | ||
134 | handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion; | ||
135 | if (handlerPrimCrossingIntoRegion != null) | ||
136 | { | ||
137 | handlerPrimCrossingIntoRegion(primID, position, isPhysical); | ||
138 | return true; | ||
139 | } | ||
140 | return false; | ||
141 | } | ||
142 | |||
143 | public virtual bool TriggerAcknowledgeAgentCrossed(UUID agentID) | 118 | public virtual bool TriggerAcknowledgeAgentCrossed(UUID agentID) |
144 | { | 119 | { |
145 | handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed; | 120 | handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed; |