From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * 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. --- OpenSim/Region/Environment/Interfaces/ILandObject.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Environment/Interfaces/ILandObject.cs') diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Environment/Interfaces/ILandObject.cs index 750b387..96fa378 100644 --- a/OpenSim/Region/Environment/Interfaces/ILandObject.cs +++ b/OpenSim/Region/Environment/Interfaces/ILandObject.cs @@ -26,7 +26,7 @@ */ using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; @@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Interfaces LandData landData { get; set; } bool[,] landBitmap { get; set; } - LLUUID regionUUID { get; } + UUID regionUUID { get; } bool containsPoint(int x, int y); ILandObject Copy(); @@ -50,12 +50,12 @@ namespace OpenSim.Region.Environment.Interfaces void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client); void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client); - bool isEitherBannedOrRestricted(LLUUID avatar); - bool isBannedFromLand(LLUUID avatar); - bool isRestrictedFromLand(LLUUID avatar); + bool isEitherBannedOrRestricted(UUID avatar); + bool isBannedFromLand(UUID avatar); + bool isRestrictedFromLand(UUID avatar); void sendLandUpdateToClient(IClientAPI remote_client); - List createAccessListArrayByFlag(ParcelManager.AccessList flag); - void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, IClientAPI remote_client); + List createAccessListArrayByFlag(ParcelManager.AccessList flag); + void sendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client); void updateAccessList(uint flags, List entries, IClientAPI remote_client); void updateLandBitmapByteArray(); void setLandBitmapFromByteArray(); @@ -71,11 +71,11 @@ namespace OpenSim.Region.Environment.Interfaces void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client); void sendLandObjectOwners(IClientAPI remote_client); void returnObject(SceneObjectGroup obj); - void returnLandObjects(uint type, LLUUID[] owners, IClientAPI remote_client); + void returnLandObjects(uint type, UUID[] owners, IClientAPI remote_client); void resetLandPrimCounts(); void addPrimToCount(SceneObjectGroup obj); void removePrimFromCount(SceneObjectGroup obj); - void updateLandSold(LLUUID avatarID, LLUUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area); + void updateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area); void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel); void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel); -- cgit v1.1