Update svn properties.
Jeff Ames
parent
71ca162821
commit
37121bcf72
|
|
@ -1,52 +1,52 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using libsecondlife.Packets;
|
using libsecondlife.Packets;
|
||||||
using OpenSim.Region.Environment.Scenes;
|
using OpenSim.Region.Environment.Scenes;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
|
|
||||||
namespace OpenSim.Region.Environment.Interfaces
|
namespace OpenSim.Region.Environment.Interfaces
|
||||||
{
|
{
|
||||||
public interface ILandChannel
|
public interface ILandChannel
|
||||||
{
|
{
|
||||||
bool allowedForcefulBans { get; set; }
|
bool allowedForcefulBans { get; set; }
|
||||||
void IncomingLandObjectsFromStorage(List<LandData> data);
|
void IncomingLandObjectsFromStorage(List<LandData> data);
|
||||||
void IncomingLandObjectFromStorage(LandData data);
|
void IncomingLandObjectFromStorage(LandData data);
|
||||||
|
|
||||||
void NoLandDataFromStorage();
|
void NoLandDataFromStorage();
|
||||||
ILandObject getLandObject(int x, int y);
|
ILandObject getLandObject(int x, int y);
|
||||||
ILandObject getLandObject(float x, float y);
|
ILandObject getLandObject(float x, float y);
|
||||||
void setPrimsTainted();
|
void setPrimsTainted();
|
||||||
bool isLandPrimCountTainted();
|
bool isLandPrimCountTainted();
|
||||||
void sendLandUpdate(ScenePresence avatar, bool force);
|
void sendLandUpdate(ScenePresence avatar, bool force);
|
||||||
void sendLandUpdate(ScenePresence avatar);
|
void sendLandUpdate(ScenePresence avatar);
|
||||||
void resetAllLandPrimCounts();
|
void resetAllLandPrimCounts();
|
||||||
void addPrimToLandPrimCounts(SceneObjectGroup obj);
|
void addPrimToLandPrimCounts(SceneObjectGroup obj);
|
||||||
void removePrimFromLandPrimCounts(SceneObjectGroup obj);
|
void removePrimFromLandPrimCounts(SceneObjectGroup obj);
|
||||||
void finalizeLandPrimCountUpdate();
|
void finalizeLandPrimCountUpdate();
|
||||||
void updateLandPrimCounts();
|
void updateLandPrimCounts();
|
||||||
void performParcelPrimCountUpdate();
|
void performParcelPrimCountUpdate();
|
||||||
void updateLandObject(int local_id, LandData newData);
|
void updateLandObject(int local_id, LandData newData);
|
||||||
|
|
||||||
void sendParcelOverlay(IClientAPI remote_client);
|
void sendParcelOverlay(IClientAPI remote_client);
|
||||||
void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);
|
void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);
|
||||||
void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);
|
void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);
|
||||||
void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);
|
void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);
|
||||||
void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);
|
void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);
|
||||||
void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client);
|
void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client);
|
||||||
void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client);
|
void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client);
|
||||||
|
|
||||||
void resetSimLandObjects();
|
void resetSimLandObjects();
|
||||||
List<ILandObject> parcelsNearPoint(LLVector3 position);
|
List<ILandObject> parcelsNearPoint(LLVector3 position);
|
||||||
void sendYouAreBannedNotice(ScenePresence avatar);
|
void sendYouAreBannedNotice(ScenePresence avatar);
|
||||||
void handleAvatarChangingParcel(ScenePresence avatar, int localLandID, LLUUID regionID);
|
void handleAvatarChangingParcel(ScenePresence avatar, int localLandID, LLUUID regionID);
|
||||||
void sendOutNearestBanLine(IClientAPI avatar);
|
void sendOutNearestBanLine(IClientAPI avatar);
|
||||||
void handleSignificantClientMovement(IClientAPI remote_client);
|
void handleSignificantClientMovement(IClientAPI remote_client);
|
||||||
void handleAnyClientMovement(ScenePresence avatar);
|
void handleAnyClientMovement(ScenePresence avatar);
|
||||||
void handleParcelAccessRequest(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client);
|
void handleParcelAccessRequest(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client);
|
||||||
void handleParcelAccessUpdateRequest(LLUUID agentID, LLUUID sessionID, uint flags, int landLocalID, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);
|
void handleParcelAccessUpdateRequest(LLUUID agentID, LLUUID sessionID, uint flags, int landLocalID, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,54 +1,54 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using libsecondlife.Packets;
|
using libsecondlife.Packets;
|
||||||
using OpenSim.Region.Environment.Scenes;
|
using OpenSim.Region.Environment.Scenes;
|
||||||
|
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
|
|
||||||
namespace OpenSim.Region.Environment.Interfaces
|
namespace OpenSim.Region.Environment.Interfaces
|
||||||
{
|
{
|
||||||
public interface ILandObject
|
public interface ILandObject
|
||||||
{
|
{
|
||||||
|
|
||||||
LandData landData { get; set; }
|
LandData landData { get; set; }
|
||||||
bool[,] landBitmap { get; set; }
|
bool[,] landBitmap { get; set; }
|
||||||
LLUUID regionUUID { get; }
|
LLUUID regionUUID { get; }
|
||||||
bool containsPoint(int x, int y);
|
bool containsPoint(int x, int y);
|
||||||
ILandObject Copy();
|
ILandObject Copy();
|
||||||
|
|
||||||
|
|
||||||
void sendLandUpdateToAvatarsOverMe();
|
void sendLandUpdateToAvatarsOverMe();
|
||||||
|
|
||||||
void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client);
|
void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client);
|
||||||
void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);
|
void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);
|
||||||
bool isEitherBannedOrRestricted(LLUUID avatar);
|
bool isEitherBannedOrRestricted(LLUUID avatar);
|
||||||
bool isBannedFromLand(LLUUID avatar);
|
bool isBannedFromLand(LLUUID avatar);
|
||||||
bool isRestrictedFromLand(LLUUID avatar);
|
bool isRestrictedFromLand(LLUUID avatar);
|
||||||
void sendLandUpdateToClient(IClientAPI remote_client);
|
void sendLandUpdateToClient(IClientAPI remote_client);
|
||||||
ParcelAccessListReplyPacket.ListBlock[] createAccessListArrayByFlag(ParcelManager.AccessList flag);
|
ParcelAccessListReplyPacket.ListBlock[] createAccessListArrayByFlag(ParcelManager.AccessList flag);
|
||||||
void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
|
void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
|
||||||
void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);
|
void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);
|
||||||
void updateLandBitmapByteArray();
|
void updateLandBitmapByteArray();
|
||||||
void setLandBitmapFromByteArray();
|
void setLandBitmapFromByteArray();
|
||||||
bool[,] getLandBitmap();
|
bool[,] getLandBitmap();
|
||||||
void forceUpdateLandInfo();
|
void forceUpdateLandInfo();
|
||||||
void setLandBitmap(bool[,] bitmap);
|
void setLandBitmap(bool[,] bitmap);
|
||||||
|
|
||||||
bool[,] basicFullRegionLandBitmap();
|
bool[,] basicFullRegionLandBitmap();
|
||||||
bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y);
|
bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y);
|
||||||
bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value);
|
bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value);
|
||||||
bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add);
|
bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add);
|
||||||
void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client);
|
void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client);
|
||||||
void sendLandObjectOwners(IClientAPI remote_client);
|
void sendLandObjectOwners(IClientAPI remote_client);
|
||||||
void returnObject(SceneObjectGroup obj);
|
void returnObject(SceneObjectGroup obj);
|
||||||
void returnLandObjects(int type, LLUUID owner);
|
void returnLandObjects(int type, LLUUID owner);
|
||||||
void resetLandPrimCounts();
|
void resetLandPrimCounts();
|
||||||
void addPrimToCount(SceneObjectGroup obj);
|
void addPrimToCount(SceneObjectGroup obj);
|
||||||
void removePrimFromCount(SceneObjectGroup obj);
|
void removePrimFromCount(SceneObjectGroup obj);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,62 +1,62 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using libsecondlife.Packets;
|
using libsecondlife.Packets;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Console;
|
using OpenSim.Framework.Console;
|
||||||
using OpenSim.Region.Environment.Scenes;
|
using OpenSim.Region.Environment.Scenes;
|
||||||
using OpenSim.Region.Environment.Interfaces;
|
using OpenSim.Region.Environment.Interfaces;
|
||||||
using Nini.Config;
|
using Nini.Config;
|
||||||
|
|
||||||
namespace OpenSim.Region.Environment.Modules.LandManagement
|
namespace OpenSim.Region.Environment.Modules.LandManagement
|
||||||
{
|
{
|
||||||
public class LandManagementModule : IRegionModule
|
public class LandManagementModule : IRegionModule
|
||||||
{
|
{
|
||||||
private LandChannel landChannel;
|
private LandChannel landChannel;
|
||||||
private Scene m_scene;
|
private Scene m_scene;
|
||||||
|
|
||||||
#region IRegionModule Members
|
#region IRegionModule Members
|
||||||
|
|
||||||
public void Initialise(Scene scene, IConfigSource source)
|
public void Initialise(Scene scene, IConfigSource source)
|
||||||
{
|
{
|
||||||
m_scene = scene;
|
m_scene = scene;
|
||||||
landChannel = new LandChannel(scene);
|
landChannel = new LandChannel(scene);
|
||||||
|
|
||||||
m_scene.EventManager.OnParcelPrimCountAdd += landChannel.addPrimToLandPrimCounts;
|
m_scene.EventManager.OnParcelPrimCountAdd += landChannel.addPrimToLandPrimCounts;
|
||||||
m_scene.EventManager.OnParcelPrimCountUpdate += landChannel.updateLandPrimCounts;
|
m_scene.EventManager.OnParcelPrimCountUpdate += landChannel.updateLandPrimCounts;
|
||||||
m_scene.EventManager.OnAvatarEnteringNewParcel += new EventManager.AvatarEnteringNewParcel(landChannel.handleAvatarChangingParcel);
|
m_scene.EventManager.OnAvatarEnteringNewParcel += new EventManager.AvatarEnteringNewParcel(landChannel.handleAvatarChangingParcel);
|
||||||
m_scene.EventManager.OnClientMovement += new EventManager.ClientMovement(landChannel.handleAnyClientMovement);
|
m_scene.EventManager.OnClientMovement += new EventManager.ClientMovement(landChannel.handleAnyClientMovement);
|
||||||
|
|
||||||
lock (m_scene)
|
lock (m_scene)
|
||||||
{
|
{
|
||||||
m_scene.LandChannel = (ILandChannel)landChannel;
|
m_scene.LandChannel = (ILandChannel)landChannel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PostInitialise()
|
public void PostInitialise()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Close()
|
public void Close()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Name
|
public string Name
|
||||||
{
|
{
|
||||||
get { return "LandManagementModule"; }
|
get { return "LandManagementModule"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsSharedModule
|
public bool IsSharedModule
|
||||||
{
|
{
|
||||||
get { return false; }
|
get { return false; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue