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/Region/Communications/Local | |
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/Region/Communications/Local/LocalBackEndServices.cs | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index 5d4e702..4efaa23 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -173,6 +173,15 @@ namespace OpenSim.Region.Communications.Local | |||
173 | return false; | 173 | return false; |
174 | } | 174 | } |
175 | 175 | ||
176 | public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData) | ||
177 | { | ||
178 | if (m_regionListeners.ContainsKey(regionHandle)) | ||
179 | { | ||
180 | m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData); | ||
181 | return true; | ||
182 | } | ||
183 | return false; | ||
184 | } | ||
176 | /// <summary> | 185 | /// <summary> |
177 | /// | 186 | /// |
178 | /// </summary> | 187 | /// </summary> |
@@ -190,6 +199,15 @@ namespace OpenSim.Region.Communications.Local | |||
190 | } | 199 | } |
191 | return false; | 200 | return false; |
192 | } | 201 | } |
202 | public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) | ||
203 | { | ||
204 | if (m_regionListeners.ContainsKey(regionHandle)) | ||
205 | { | ||
206 | m_regionListeners[regionHandle].TriggerExpectPrimCrossing(regionHandle, primID, position, isPhysical); | ||
207 | return true; | ||
208 | } | ||
209 | return false; | ||
210 | } | ||
193 | 211 | ||
194 | public void TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) | 212 | public void TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) |
195 | { | 213 | { |
@@ -207,6 +225,14 @@ namespace OpenSim.Region.Communications.Local | |||
207 | } | 225 | } |
208 | return false; | 226 | return false; |
209 | } | 227 | } |
228 | public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) | ||
229 | { | ||
230 | if (m_regionListeners.ContainsKey(regionHandle)) | ||
231 | { | ||
232 | return true; | ||
233 | } | ||
234 | return false; | ||
235 | } | ||
210 | 236 | ||
211 | /// <summary> | 237 | /// <summary> |
212 | /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session | 238 | /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session |
@@ -240,6 +266,15 @@ namespace OpenSim.Region.Communications.Local | |||
240 | } | 266 | } |
241 | } | 267 | } |
242 | 268 | ||
269 | public void TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData) | ||
270 | { | ||
271 | if (m_regionListeners.ContainsKey(regionHandle)) | ||
272 | { | ||
273 | m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData); | ||
274 | } | ||
275 | |||
276 | } | ||
277 | |||
243 | public void PingCheckReply(Hashtable respData) | 278 | public void PingCheckReply(Hashtable respData) |
244 | { | 279 | { |
245 | foreach (ulong region in m_regions.Keys) | 280 | foreach (ulong region in m_regions.Keys) |
@@ -264,6 +299,15 @@ namespace OpenSim.Region.Communications.Local | |||
264 | return false; | 299 | return false; |
265 | } | 300 | } |
266 | 301 | ||
302 | public bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) | ||
303 | { | ||
304 | if (m_regionListeners.ContainsKey(regionHandle)) | ||
305 | { | ||
306 | return m_regionListeners[regionHandle].TriggerExpectPrimCrossing(regionHandle, primID, position, isPhysical); | ||
307 | } | ||
308 | return false; | ||
309 | } | ||
310 | |||
267 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) | 311 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) |
268 | { | 312 | { |
269 | if (m_regionListeners.ContainsKey(regionHandle)) | 313 | if (m_regionListeners.ContainsKey(regionHandle)) |