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/Environment/Modules/World/Estate/EstateManagementModule.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/Environment/Modules/World/Estate/EstateManagementModule.cs | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 28347d0..976a634 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -28,7 +28,7 @@ using System; | |||
28 | using System.Threading; | 28 | using System.Threading; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using log4net; | 32 | using log4net; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
@@ -41,15 +41,15 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
41 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | private delegate void LookupUUIDS(List<LLUUID> uuidLst); | 44 | private delegate void LookupUUIDS(List<UUID> uuidLst); |
45 | 45 | ||
46 | private Scene m_scene; | 46 | private Scene m_scene; |
47 | 47 | ||
48 | #region Packet Data Responders | 48 | #region Packet Data Responders |
49 | 49 | ||
50 | private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice) | 50 | private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice) |
51 | { | 51 | { |
52 | //SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant) | 52 | //SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant) |
53 | 53 | ||
54 | uint sun = 0; | 54 | uint sun = 0; |
55 | if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) | 55 | if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) |
@@ -119,9 +119,9 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
119 | sendRegionInfoPacketToAll(); | 119 | sendRegionInfoPacketToAll(); |
120 | } | 120 | } |
121 | 121 | ||
122 | public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID texture) | 122 | public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID texture) |
123 | { | 123 | { |
124 | if (texture == LLUUID.Zero) | 124 | if(texture == UUID.Zero) |
125 | return; | 125 | return; |
126 | 126 | ||
127 | switch (corner) | 127 | switch (corner) |
@@ -202,13 +202,13 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
202 | m_scene.Restart(timeInSeconds); | 202 | m_scene.Restart(timeInSeconds); |
203 | } | 203 | } |
204 | 204 | ||
205 | private void handleChangeEstateCovenantRequest(IClientAPI remoteClient, LLUUID estateCovenantID) | 205 | private void handleChangeEstateCovenantRequest(IClientAPI remoteClient, UUID estateCovenantID) |
206 | { | 206 | { |
207 | m_scene.RegionInfo.RegionSettings.Covenant = estateCovenantID; | 207 | m_scene.RegionInfo.RegionSettings.Covenant = estateCovenantID; |
208 | m_scene.RegionInfo.RegionSettings.Save(); | 208 | m_scene.RegionInfo.RegionSettings.Save(); |
209 | } | 209 | } |
210 | 210 | ||
211 | private void handleEstateAccessDeltaRequest(IClientAPI remote_client, LLUUID invoice, int estateAccessType, LLUUID user) | 211 | private void handleEstateAccessDeltaRequest(IClientAPI remote_client, UUID invoice, int estateAccessType, UUID user) |
212 | { | 212 | { |
213 | // EstateAccessDelta handles Estate Managers, Sim Access, Sim Banlist, allowed Groups.. etc. | 213 | // EstateAccessDelta handles Estate Managers, Sim Access, Sim Banlist, allowed Groups.. etc. |
214 | 214 | ||
@@ -338,17 +338,17 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
338 | } | 338 | } |
339 | } | 339 | } |
340 | 340 | ||
341 | private void SendSimulatorBlueBoxMessage(IClientAPI remote_client, LLUUID invoice, LLUUID senderID, LLUUID sessionID, string senderName, string message) | 341 | private void SendSimulatorBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) |
342 | { | 342 | { |
343 | m_scene.SendRegionMessageFromEstateTools(senderID, sessionID, senderName, message); | 343 | m_scene.SendRegionMessageFromEstateTools(senderID, sessionID, senderName, message); |
344 | } | 344 | } |
345 | 345 | ||
346 | private void SendEstateBlueBoxMessage(IClientAPI remote_client, LLUUID invoice, LLUUID senderID, LLUUID sessionID, string senderName, string message) | 346 | private void SendEstateBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) |
347 | { | 347 | { |
348 | m_scene.SendEstateMessageFromEstateTools(senderID, sessionID, senderName, message); | 348 | m_scene.SendEstateMessageFromEstateTools(senderID, sessionID, senderName, message); |
349 | } | 349 | } |
350 | 350 | ||
351 | private void handleEstateDebugRegionRequest(IClientAPI remote_client, LLUUID invoice, LLUUID senderID, bool scripted, bool collisionEvents, bool physics) | 351 | private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics) |
352 | { | 352 | { |
353 | if (physics) | 353 | if (physics) |
354 | m_scene.RegionInfo.RegionSettings.DisablePhysics = true; | 354 | m_scene.RegionInfo.RegionSettings.DisablePhysics = true; |
@@ -371,9 +371,9 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
371 | m_scene.SetSceneCoreDebug(scripted, collisionEvents, physics); | 371 | m_scene.SetSceneCoreDebug(scripted, collisionEvents, physics); |
372 | } | 372 | } |
373 | 373 | ||
374 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, LLUUID invoice, LLUUID senderID, LLUUID prey) | 374 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) |
375 | { | 375 | { |
376 | if (prey != LLUUID.Zero) | 376 | if (prey != UUID.Zero) |
377 | { | 377 | { |
378 | ScenePresence s = m_scene.GetScenePresence(prey); | 378 | ScenePresence s = m_scene.GetScenePresence(prey); |
379 | if (s != null) | 379 | if (s != null) |
@@ -419,7 +419,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
419 | private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFlags, string filter, IClientAPI remoteClient) | 419 | private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFlags, string filter, IClientAPI remoteClient) |
420 | { | 420 | { |
421 | Dictionary<uint, float> SceneData = new Dictionary<uint,float>(); | 421 | Dictionary<uint, float> SceneData = new Dictionary<uint,float>(); |
422 | List<LLUUID> uuidNameLookupList = new List<LLUUID>(); | 422 | List<UUID> uuidNameLookupList = new List<UUID>(); |
423 | 423 | ||
424 | if (reportType == 1) | 424 | if (reportType == 1) |
425 | { | 425 | { |
@@ -491,7 +491,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
491 | LookupUUIDS icon = (LookupUUIDS)iar.AsyncState; | 491 | LookupUUIDS icon = (LookupUUIDS)iar.AsyncState; |
492 | icon.EndInvoke(iar); | 492 | icon.EndInvoke(iar); |
493 | } | 493 | } |
494 | private void LookupUUID(List<LLUUID> uuidLst) | 494 | private void LookupUUID(List<UUID> uuidLst) |
495 | { | 495 | { |
496 | LookupUUIDS d = LookupUUIDsAsync; | 496 | LookupUUIDS d = LookupUUIDsAsync; |
497 | 497 | ||
@@ -499,9 +499,9 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
499 | LookupUUIDSCompleted, | 499 | LookupUUIDSCompleted, |
500 | d); | 500 | d); |
501 | } | 501 | } |
502 | private void LookupUUIDsAsync(List<LLUUID> uuidLst) | 502 | private void LookupUUIDsAsync(List<UUID> uuidLst) |
503 | { | 503 | { |
504 | LLUUID[] uuidarr = new LLUUID[0]; | 504 | UUID[] uuidarr = new UUID[0]; |
505 | 505 | ||
506 | lock (uuidLst) | 506 | lock (uuidLst) |
507 | { | 507 | { |
@@ -533,7 +533,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
533 | { | 533 | { |
534 | RegionHandshakeArgs args = new RegionHandshakeArgs(); | 534 | RegionHandshakeArgs args = new RegionHandshakeArgs(); |
535 | bool estatemanager = false; | 535 | bool estatemanager = false; |
536 | LLUUID[] EstateManagers = m_scene.RegionInfo.EstateSettings.EstateManagers; | 536 | UUID[] EstateManagers = m_scene.RegionInfo.EstateSettings.EstateManagers; |
537 | for (int i = 0; i < EstateManagers.Length; i++) | 537 | for (int i = 0; i < EstateManagers.Length; i++) |
538 | { | 538 | { |
539 | if (EstateManagers[i] == remoteClient.AgentId) | 539 | if (EstateManagers[i] == remoteClient.AgentId) |
@@ -559,14 +559,14 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
559 | 559 | ||
560 | args.regionFlags = GetRegionFlags(); | 560 | args.regionFlags = GetRegionFlags(); |
561 | args.regionName = m_scene.RegionInfo.RegionName; | 561 | args.regionName = m_scene.RegionInfo.RegionName; |
562 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) | 562 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) |
563 | args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; | 563 | args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; |
564 | else | 564 | else |
565 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 565 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
566 | args.terrainBase0 = LLUUID.Zero; | 566 | args.terrainBase0 = UUID.Zero; |
567 | args.terrainBase1 = LLUUID.Zero; | 567 | args.terrainBase1 = UUID.Zero; |
568 | args.terrainBase2 = LLUUID.Zero; | 568 | args.terrainBase2 = UUID.Zero; |
569 | args.terrainBase3 = LLUUID.Zero; | 569 | args.terrainBase3 = UUID.Zero; |
570 | args.terrainDetail0 = m_scene.RegionInfo.RegionSettings.TerrainTexture1; | 570 | args.terrainDetail0 = m_scene.RegionInfo.RegionSettings.TerrainTexture1; |
571 | args.terrainDetail1 = m_scene.RegionInfo.RegionSettings.TerrainTexture2; | 571 | args.terrainDetail1 = m_scene.RegionInfo.RegionSettings.TerrainTexture2; |
572 | args.terrainDetail2 = m_scene.RegionInfo.RegionSettings.TerrainTexture3; | 572 | args.terrainDetail2 = m_scene.RegionInfo.RegionSettings.TerrainTexture3; |
@@ -582,7 +582,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
582 | ); | 582 | ); |
583 | } | 583 | } |
584 | 584 | ||
585 | public void handleEstateChangeInfo(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, UInt32 parms1, UInt32 parms2) | 585 | public void handleEstateChangeInfo(IClientAPI remoteClient, UUID invoice, UUID senderID, UInt32 parms1, UInt32 parms2) |
586 | { | 586 | { |
587 | if (parms2 == 0) | 587 | if (parms2 == 0) |
588 | { | 588 | { |
@@ -812,14 +812,14 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
812 | return (uint)flags; | 812 | return (uint)flags; |
813 | } | 813 | } |
814 | 814 | ||
815 | public bool IsManager(LLUUID avatarID) | 815 | public bool IsManager(UUID avatarID) |
816 | { | 816 | { |
817 | if (avatarID == m_scene.RegionInfo.MasterAvatarAssignedUUID) | 817 | if (avatarID == m_scene.RegionInfo.MasterAvatarAssignedUUID) |
818 | return true; | 818 | return true; |
819 | if (avatarID == m_scene.RegionInfo.EstateSettings.EstateOwner) | 819 | if (avatarID == m_scene.RegionInfo.EstateSettings.EstateOwner) |
820 | return true; | 820 | return true; |
821 | 821 | ||
822 | List<LLUUID> ems = new List<LLUUID>(m_scene.RegionInfo.EstateSettings.EstateManagers); | 822 | List<UUID> ems = new List<UUID>(m_scene.RegionInfo.EstateSettings.EstateManagers); |
823 | if (ems.Contains(avatarID)) | 823 | if (ems.Contains(avatarID)) |
824 | return true; | 824 | return true; |
825 | 825 | ||