diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index a2c3c2c..aabddc6 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
@@ -177,7 +177,7 @@ namespace OpenSim.Region.Communications.Local | |||
177 | return null; | 177 | return null; |
178 | } | 178 | } |
179 | 179 | ||
180 | public RegionInfo RequestNeighbourInfo(LLUUID regionID) | 180 | public RegionInfo RequestNeighbourInfo(UUID regionID) |
181 | { | 181 | { |
182 | // TODO add a dictionary for faster lookup | 182 | // TODO add a dictionary for faster lookup |
183 | foreach (RegionInfo info in m_regions.Values) | 183 | foreach (RegionInfo info in m_regions.Values) |
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Communications.Local | |||
229 | return mapBlocks; | 229 | return mapBlocks; |
230 | } | 230 | } |
231 | 231 | ||
232 | public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) | 232 | public bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) |
233 | { | 233 | { |
234 | if (m_regionListeners.ContainsKey(regionHandle)) | 234 | if (m_regionListeners.ContainsKey(regionHandle)) |
235 | { | 235 | { |
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Communications.Local | |||
306 | return false; | 306 | return false; |
307 | } | 307 | } |
308 | 308 | ||
309 | public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) | 309 | public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) |
310 | { | 310 | { |
311 | if (m_regionListeners.ContainsKey(regionHandle)) | 311 | if (m_regionListeners.ContainsKey(regionHandle)) |
312 | { | 312 | { |
@@ -338,7 +338,7 @@ namespace OpenSim.Region.Communications.Local | |||
338 | return false; | 338 | return false; |
339 | } | 339 | } |
340 | 340 | ||
341 | public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) | 341 | public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod) |
342 | { | 342 | { |
343 | if (m_regionListeners.ContainsKey(regionHandle)) | 343 | if (m_regionListeners.ContainsKey(regionHandle)) |
344 | { | 344 | { |
@@ -355,7 +355,7 @@ namespace OpenSim.Region.Communications.Local | |||
355 | /// <param name="agentID"></param> | 355 | /// <param name="agentID"></param> |
356 | /// <param name="position"></param> | 356 | /// <param name="position"></param> |
357 | /// <returns></returns> | 357 | /// <returns></returns> |
358 | public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) | 358 | public bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying) |
359 | { | 359 | { |
360 | if (m_regionListeners.ContainsKey(regionHandle)) | 360 | if (m_regionListeners.ContainsKey(regionHandle)) |
361 | { | 361 | { |
@@ -366,7 +366,7 @@ namespace OpenSim.Region.Communications.Local | |||
366 | return false; | 366 | return false; |
367 | } | 367 | } |
368 | 368 | ||
369 | public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) | 369 | public bool ExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical) |
370 | { | 370 | { |
371 | if (m_regionListeners.ContainsKey(regionHandle)) | 371 | if (m_regionListeners.ContainsKey(regionHandle)) |
372 | { | 372 | { |
@@ -376,7 +376,7 @@ namespace OpenSim.Region.Communications.Local | |||
376 | return false; | 376 | return false; |
377 | } | 377 | } |
378 | 378 | ||
379 | public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) | 379 | public bool AcknowledgeAgentCrossed(ulong regionHandle, UUID agentId) |
380 | { | 380 | { |
381 | if (m_regionListeners.ContainsKey(regionHandle)) | 381 | if (m_regionListeners.ContainsKey(regionHandle)) |
382 | { | 382 | { |
@@ -385,7 +385,7 @@ namespace OpenSim.Region.Communications.Local | |||
385 | return false; | 385 | return false; |
386 | } | 386 | } |
387 | 387 | ||
388 | public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) | 388 | public bool AcknowledgePrimCrossed(ulong regionHandle, UUID primID) |
389 | { | 389 | { |
390 | if (m_regionListeners.ContainsKey(regionHandle)) | 390 | if (m_regionListeners.ContainsKey(regionHandle)) |
391 | { | 391 | { |
@@ -430,7 +430,7 @@ namespace OpenSim.Region.Communications.Local | |||
430 | } | 430 | } |
431 | } | 431 | } |
432 | 432 | ||
433 | public void TriggerLogOffUser(ulong regionHandle, LLUUID agentID, LLUUID RegionSecret, string message) | 433 | public void TriggerLogOffUser(ulong regionHandle, UUID agentID, UUID RegionSecret, string message) |
434 | { | 434 | { |
435 | if (m_regionListeners.ContainsKey(regionHandle)) | 435 | if (m_regionListeners.ContainsKey(regionHandle)) |
436 | { | 436 | { |
@@ -440,7 +440,7 @@ namespace OpenSim.Region.Communications.Local | |||
440 | } | 440 | } |
441 | } | 441 | } |
442 | 442 | ||
443 | public void TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) | 443 | public void TriggerExpectPrim(ulong regionHandle, UUID primID, string objData, int XMLMethod) |
444 | { | 444 | { |
445 | if (m_regionListeners.ContainsKey(regionHandle)) | 445 | if (m_regionListeners.ContainsKey(regionHandle)) |
446 | { | 446 | { |
@@ -461,7 +461,7 @@ namespace OpenSim.Region.Communications.Local | |||
461 | } | 461 | } |
462 | } | 462 | } |
463 | 463 | ||
464 | public bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) | 464 | public bool TriggerExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying) |
465 | { | 465 | { |
466 | if (m_regionListeners.ContainsKey(regionHandle)) | 466 | if (m_regionListeners.ContainsKey(regionHandle)) |
467 | { | 467 | { |
@@ -472,7 +472,7 @@ namespace OpenSim.Region.Communications.Local | |||
472 | return false; | 472 | return false; |
473 | } | 473 | } |
474 | 474 | ||
475 | public bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) | 475 | public bool TriggerExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical) |
476 | { | 476 | { |
477 | if (m_regionListeners.ContainsKey(regionHandle)) | 477 | if (m_regionListeners.ContainsKey(regionHandle)) |
478 | { | 478 | { |