* Massive cleanup of LLClientView, removed a few hundred unnecessary value initialisers, etc.
Adam Frisby
parent
84136c70d8
commit
4c24b1bc9b
|
|
@ -28,7 +28,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
|
|
@ -40,7 +39,6 @@ using log4net;
|
|||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications.Cache;
|
||||
using OpenSim.Framework.Statistics;
|
||||
using OpenSim.Region.ClientStack.LindenUDP;
|
||||
using OpenSim.Region.Interfaces;
|
||||
using OpenSim.Region.Environment.Scenes;
|
||||
using Timer = System.Timers.Timer;
|
||||
|
|
@ -63,39 +61,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
// }
|
||||
|
||||
/* static variables */
|
||||
public static SynchronizeClientHandler SynchronizeClient = null;
|
||||
public static SynchronizeClientHandler SynchronizeClient;
|
||||
/* private variables */
|
||||
private readonly UUID m_sessionId;
|
||||
private UUID m_secureSessionId = UUID.Zero;
|
||||
private readonly UUID m_secureSessionId = UUID.Zero;
|
||||
//private AgentAssetUpload UploadAssets;
|
||||
|
||||
private int m_debugPacketLevel = 0;
|
||||
private int m_debugPacketLevel;
|
||||
|
||||
private readonly AssetCache m_assetCache;
|
||||
// private InventoryCache m_inventoryCache;
|
||||
private int m_cachedTextureSerial = 0;
|
||||
private int m_cachedTextureSerial;
|
||||
private Timer m_clientPingTimer;
|
||||
|
||||
private bool m_clientBlocked = false;
|
||||
private bool m_clientBlocked;
|
||||
|
||||
private int m_probesWithNoIngressPackets = 0;
|
||||
private int m_probesWithNoIngressPackets;
|
||||
//private int m_lastPacketsReceived = 0;
|
||||
//private byte[] ZeroOutBuffer = new byte[4096];
|
||||
|
||||
private readonly UUID m_agentId;
|
||||
private readonly uint m_circuitCode;
|
||||
private int m_moneyBalance;
|
||||
private IPacketHandler m_PacketHandler;
|
||||
private readonly IPacketHandler m_PacketHandler;
|
||||
|
||||
private int m_animationSequenceNumber = 1;
|
||||
|
||||
private byte[] m_channelVersion = Utils.StringToBytes("OpenSimulator Server"); // Dummy value needed by libSL
|
||||
private readonly byte[] m_channelVersion = Utils.StringToBytes("OpenSimulator Server"); // Dummy value needed by libSL
|
||||
|
||||
private Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>();
|
||||
private readonly Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>();
|
||||
|
||||
private bool m_SendLogoutPacketWhenClosing = true;
|
||||
|
||||
private int m_inPacketsChecked = 0;
|
||||
private int m_inPacketsChecked;
|
||||
|
||||
/* protected variables */
|
||||
|
||||
|
|
@ -117,163 +115,163 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
protected EndPoint m_proxyEndPoint;
|
||||
protected UUID m_activeGroupID = UUID.Zero;
|
||||
protected string m_activeGroupName = String.Empty;
|
||||
protected ulong m_activeGroupPowers = 0;
|
||||
protected ulong m_activeGroupPowers;
|
||||
protected Dictionary<UUID,ulong> m_groupPowers = new Dictionary<UUID, ulong>();
|
||||
|
||||
/* Instantiated Designated Event Delegates */
|
||||
//- used so we don't create new objects for each incoming packet and then toss it out later */
|
||||
|
||||
private GenericMessage handlerGenericMessage = null;
|
||||
private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties;
|
||||
private UpdateAvatarProperties handlerUpdateAvatarProperties = null; // OnUpdateAvatarProperties;
|
||||
private ChatMessage handlerChatFromClient = null; //OnChatFromClient;
|
||||
private ChatMessage handlerChatFromClient2 = null; //OnChatFromClient;
|
||||
private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage;
|
||||
private FriendActionDelegate handlerApproveFriendRequest = null; //OnApproveFriendRequest;
|
||||
private FriendshipTermination handlerTerminateFriendship = null; //OnTerminateFriendship;
|
||||
private RezObject handlerRezObject = null; //OnRezObject;
|
||||
private DeRezObject handlerDeRezObject = null; //OnDeRezObject;
|
||||
private ModifyTerrain handlerModifyTerrain = null;
|
||||
private BakeTerrain handlerBakeTerrain = null;
|
||||
private EstateChangeInfo handlerEstateChangeInfo = null;
|
||||
private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply;
|
||||
private GenericCall2 handlerRequestWearables = null; //OnRequestWearables;
|
||||
private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData;
|
||||
private SetAppearance handlerSetAppearance = null; //OnSetAppearance;
|
||||
private AvatarNowWearing handlerAvatarNowWearing = null; //OnAvatarNowWearing;
|
||||
private RezSingleAttachmentFromInv handlerRezSingleAttachment = null; //OnRezSingleAttachmentFromInv;
|
||||
private UUIDNameRequest handlerDetachAttachmentIntoInv = null; // Detach attachment!
|
||||
private ObjectAttach handlerObjectAttach = null; //OnObjectAttach;
|
||||
private SetAlwaysRun handlerSetAlwaysRun = null; //OnSetAlwaysRun;
|
||||
private GenericCall2 handlerCompleteMovementToRegion = null; //OnCompleteMovementToRegion;
|
||||
private UpdateAgent handlerAgentUpdate = null; //OnAgentUpdate;
|
||||
private StartAnim handlerStartAnim = null;
|
||||
private StopAnim handlerStopAnim = null;
|
||||
private AgentRequestSit handlerAgentRequestSit = null; //OnAgentRequestSit;
|
||||
private AgentSit handlerAgentSit = null; //OnAgentSit;
|
||||
private AvatarPickerRequest handlerAvatarPickerRequest = null; //OnAvatarPickerRequest;
|
||||
private FetchInventory handlerAgentDataUpdateRequest = null; //OnAgentDataUpdateRequest;
|
||||
private FetchInventory handlerUserInfoRequest = null; //OnUserInfoRequest;
|
||||
private TeleportLocationRequest handlerSetStartLocationRequest = null; //OnSetStartLocationRequest;
|
||||
private TeleportLandmarkRequest handlerTeleportLandmarkRequest = null; //OnTeleportLandmarkRequest;
|
||||
private LinkObjects handlerLinkObjects = null; //OnLinkObjects;
|
||||
private DelinkObjects handlerDelinkObjects = null; //OnDelinkObjects;
|
||||
private AddNewPrim handlerAddPrim = null; //OnAddPrim;
|
||||
private UpdateShape handlerUpdatePrimShape = null; //null;
|
||||
private ObjectExtraParams handlerUpdateExtraParams = null; //OnUpdateExtraParams;
|
||||
private ObjectDuplicate handlerObjectDuplicate = null;
|
||||
private ObjectDuplicateOnRay handlerObjectDuplicateOnRay = null;
|
||||
private ObjectSelect handlerObjectSelect = null;
|
||||
private ObjectDeselect handlerObjectDeselect = null;
|
||||
private ObjectIncludeInSearch handlerObjectIncludeInSearch = null;
|
||||
private UpdatePrimFlags handlerUpdatePrimFlags = null; //OnUpdatePrimFlags;
|
||||
private UpdatePrimTexture handlerUpdatePrimTexture = null;
|
||||
private GrabObject handlerGrabObject = null; //OnGrabObject;
|
||||
private MoveObject handlerGrabUpdate = null; //OnGrabUpdate;
|
||||
private ObjectSelect handlerDeGrabObject = null; //OnDeGrabObject;
|
||||
private GenericCall7 handlerObjectDescription = null;
|
||||
private GenericCall7 handlerObjectName = null;
|
||||
private GenericCall7 handlerObjectClickAction = null;
|
||||
private GenericCall7 handlerObjectMaterial = null;
|
||||
private ObjectPermissions handlerObjectPermissions = null;
|
||||
private RequestObjectPropertiesFamily handlerRequestObjectPropertiesFamily = null; //OnRequestObjectPropertiesFamily;
|
||||
private TextureRequest handlerTextureRequest = null;
|
||||
private UDPAssetUploadRequest handlerAssetUploadRequest = null; //OnAssetUploadRequest;
|
||||
private RequestXfer handlerRequestXfer = null; //OnRequestXfer;
|
||||
private XferReceive handlerXferReceive = null; //OnXferReceive;
|
||||
private ConfirmXfer handlerConfirmXfer = null; //OnConfirmXfer;
|
||||
private CreateInventoryFolder handlerCreateInventoryFolder = null; //OnCreateNewInventoryFolder;
|
||||
private UpdateInventoryFolder handlerUpdateInventoryFolder = null;
|
||||
private MoveInventoryFolder handlerMoveInventoryFolder = null;
|
||||
private CreateNewInventoryItem handlerCreateNewInventoryItem = null; //OnCreateNewInventoryItem;
|
||||
private FetchInventory handlerFetchInventory = null;
|
||||
private FetchInventoryDescendents handlerFetchInventoryDescendents = null; //OnFetchInventoryDescendents;
|
||||
private PurgeInventoryDescendents handlerPurgeInventoryDescendents = null; //OnPurgeInventoryDescendents;
|
||||
private UpdateInventoryItem handlerUpdateInventoryItem = null;
|
||||
private CopyInventoryItem handlerCopyInventoryItem = null;
|
||||
private MoveInventoryItem handlerMoveInventoryItem = null;
|
||||
private RemoveInventoryItem handlerRemoveInventoryItem = null;
|
||||
private RemoveInventoryFolder handlerRemoveInventoryFolder = null;
|
||||
private RequestTaskInventory handlerRequestTaskInventory = null; //OnRequestTaskInventory;
|
||||
private UpdateTaskInventory handlerUpdateTaskInventory = null; //OnUpdateTaskInventory;
|
||||
private MoveTaskInventory handlerMoveTaskItem = null;
|
||||
private RemoveTaskInventory handlerRemoveTaskItem = null; //OnRemoveTaskItem;
|
||||
private RezScript handlerRezScript = null; //OnRezScript;
|
||||
private RequestMapBlocks handlerRequestMapBlocks = null; //OnRequestMapBlocks;
|
||||
private RequestMapName handlerMapNameRequest = null; //OnMapNameRequest;
|
||||
private TeleportLocationRequest handlerTeleportLocationRequest = null; //OnTeleportLocationRequest;
|
||||
private MoneyBalanceRequest handlerMoneyBalanceRequest = null; //OnMoneyBalanceRequest;
|
||||
private UUIDNameRequest handlerNameRequest = null;
|
||||
private ParcelAccessListRequest handlerParcelAccessListRequest = null; //OnParcelAccessListRequest;
|
||||
private ParcelAccessListUpdateRequest handlerParcelAccessListUpdateRequest = null; //OnParcelAccessListUpdateRequest;
|
||||
private ParcelPropertiesRequest handlerParcelPropertiesRequest = null; //OnParcelPropertiesRequest;
|
||||
private ParcelDivideRequest handlerParcelDivideRequest = null; //OnParcelDivideRequest;
|
||||
private ParcelJoinRequest handlerParcelJoinRequest = null; //OnParcelJoinRequest;
|
||||
private ParcelPropertiesUpdateRequest handlerParcelPropertiesUpdateRequest = null; //OnParcelPropertiesUpdateRequest;
|
||||
private ParcelSelectObjects handlerParcelSelectObjects = null; //OnParcelSelectObjects;
|
||||
private ParcelObjectOwnerRequest handlerParcelObjectOwnerRequest = null; //OnParcelObjectOwnerRequest;
|
||||
private ParcelAbandonRequest handlerParcelAbandonRequest = null;
|
||||
private ParcelGodForceOwner handlerParcelGodForceOwner = null;
|
||||
private ParcelReclaim handlerParcelReclaim = null;
|
||||
private ParcelReturnObjectsRequest handlerParcelReturnObjectsRequest = null;
|
||||
private RegionInfoRequest handlerRegionInfoRequest = null; //OnRegionInfoRequest;
|
||||
private EstateCovenantRequest handlerEstateCovenantRequest = null; //OnEstateCovenantRequest;
|
||||
private RequestGodlikePowers handlerReqGodlikePowers = null; //OnRequestGodlikePowers;
|
||||
private GodKickUser handlerGodKickUser = null; //OnGodKickUser;
|
||||
private ViewerEffectEventHandler handlerViewerEffect = null; //OnViewerEffect;
|
||||
private Action<IClientAPI> handlerLogout = null; //OnLogout;
|
||||
private MoneyTransferRequest handlerMoneyTransferRequest = null; //OnMoneyTransferRequest;
|
||||
private ParcelBuy handlerParcelBuy = null;
|
||||
private EconomyDataRequest handlerEconomoyDataRequest = null;
|
||||
private GenericMessage handlerGenericMessage;
|
||||
private RequestAvatarProperties handlerRequestAvatarProperties; //OnRequestAvatarProperties;
|
||||
private UpdateAvatarProperties handlerUpdateAvatarProperties; // OnUpdateAvatarProperties;
|
||||
private ChatMessage handlerChatFromClient; //OnChatFromClient;
|
||||
private ChatMessage handlerChatFromClient2; //OnChatFromClient;
|
||||
private ImprovedInstantMessage handlerInstantMessage; //OnInstantMessage;
|
||||
private FriendActionDelegate handlerApproveFriendRequest; //OnApproveFriendRequest;
|
||||
private FriendshipTermination handlerTerminateFriendship; //OnTerminateFriendship;
|
||||
private RezObject handlerRezObject; //OnRezObject;
|
||||
private DeRezObject handlerDeRezObject; //OnDeRezObject;
|
||||
private ModifyTerrain handlerModifyTerrain;
|
||||
private BakeTerrain handlerBakeTerrain;
|
||||
private EstateChangeInfo handlerEstateChangeInfo;
|
||||
private Action<IClientAPI> handlerRegionHandShakeReply; //OnRegionHandShakeReply;
|
||||
private GenericCall2 handlerRequestWearables; //OnRequestWearables;
|
||||
private Action<IClientAPI> handlerRequestAvatarsData; //OnRequestAvatarsData;
|
||||
private SetAppearance handlerSetAppearance; //OnSetAppearance;
|
||||
private AvatarNowWearing handlerAvatarNowWearing; //OnAvatarNowWearing;
|
||||
private RezSingleAttachmentFromInv handlerRezSingleAttachment; //OnRezSingleAttachmentFromInv;
|
||||
private UUIDNameRequest handlerDetachAttachmentIntoInv; // Detach attachment!
|
||||
private ObjectAttach handlerObjectAttach; //OnObjectAttach;
|
||||
private SetAlwaysRun handlerSetAlwaysRun; //OnSetAlwaysRun;
|
||||
private GenericCall2 handlerCompleteMovementToRegion; //OnCompleteMovementToRegion;
|
||||
private UpdateAgent handlerAgentUpdate; //OnAgentUpdate;
|
||||
private StartAnim handlerStartAnim;
|
||||
private StopAnim handlerStopAnim;
|
||||
private AgentRequestSit handlerAgentRequestSit; //OnAgentRequestSit;
|
||||
private AgentSit handlerAgentSit; //OnAgentSit;
|
||||
private AvatarPickerRequest handlerAvatarPickerRequest; //OnAvatarPickerRequest;
|
||||
private FetchInventory handlerAgentDataUpdateRequest; //OnAgentDataUpdateRequest;
|
||||
private FetchInventory handlerUserInfoRequest; //OnUserInfoRequest;
|
||||
private TeleportLocationRequest handlerSetStartLocationRequest; //OnSetStartLocationRequest;
|
||||
private TeleportLandmarkRequest handlerTeleportLandmarkRequest; //OnTeleportLandmarkRequest;
|
||||
private LinkObjects handlerLinkObjects; //OnLinkObjects;
|
||||
private DelinkObjects handlerDelinkObjects; //OnDelinkObjects;
|
||||
private AddNewPrim handlerAddPrim; //OnAddPrim;
|
||||
private UpdateShape handlerUpdatePrimShape; //null;
|
||||
private ObjectExtraParams handlerUpdateExtraParams; //OnUpdateExtraParams;
|
||||
private ObjectDuplicate handlerObjectDuplicate;
|
||||
private ObjectDuplicateOnRay handlerObjectDuplicateOnRay;
|
||||
private ObjectSelect handlerObjectSelect;
|
||||
private ObjectDeselect handlerObjectDeselect;
|
||||
private ObjectIncludeInSearch handlerObjectIncludeInSearch;
|
||||
private UpdatePrimFlags handlerUpdatePrimFlags; //OnUpdatePrimFlags;
|
||||
private UpdatePrimTexture handlerUpdatePrimTexture;
|
||||
private GrabObject handlerGrabObject; //OnGrabObject;
|
||||
private MoveObject handlerGrabUpdate; //OnGrabUpdate;
|
||||
private ObjectSelect handlerDeGrabObject; //OnDeGrabObject;
|
||||
private GenericCall7 handlerObjectDescription;
|
||||
private GenericCall7 handlerObjectName;
|
||||
private GenericCall7 handlerObjectClickAction;
|
||||
private GenericCall7 handlerObjectMaterial;
|
||||
private ObjectPermissions handlerObjectPermissions;
|
||||
private RequestObjectPropertiesFamily handlerRequestObjectPropertiesFamily; //OnRequestObjectPropertiesFamily;
|
||||
private TextureRequest handlerTextureRequest;
|
||||
private UDPAssetUploadRequest handlerAssetUploadRequest; //OnAssetUploadRequest;
|
||||
private RequestXfer handlerRequestXfer; //OnRequestXfer;
|
||||
private XferReceive handlerXferReceive; //OnXferReceive;
|
||||
private ConfirmXfer handlerConfirmXfer; //OnConfirmXfer;
|
||||
private CreateInventoryFolder handlerCreateInventoryFolder; //OnCreateNewInventoryFolder;
|
||||
private UpdateInventoryFolder handlerUpdateInventoryFolder;
|
||||
private MoveInventoryFolder handlerMoveInventoryFolder;
|
||||
private CreateNewInventoryItem handlerCreateNewInventoryItem; //OnCreateNewInventoryItem;
|
||||
private FetchInventory handlerFetchInventory;
|
||||
private FetchInventoryDescendents handlerFetchInventoryDescendents; //OnFetchInventoryDescendents;
|
||||
private PurgeInventoryDescendents handlerPurgeInventoryDescendents; //OnPurgeInventoryDescendents;
|
||||
private UpdateInventoryItem handlerUpdateInventoryItem;
|
||||
private CopyInventoryItem handlerCopyInventoryItem;
|
||||
private MoveInventoryItem handlerMoveInventoryItem;
|
||||
private RemoveInventoryItem handlerRemoveInventoryItem;
|
||||
private RemoveInventoryFolder handlerRemoveInventoryFolder;
|
||||
private RequestTaskInventory handlerRequestTaskInventory; //OnRequestTaskInventory;
|
||||
private UpdateTaskInventory handlerUpdateTaskInventory; //OnUpdateTaskInventory;
|
||||
private MoveTaskInventory handlerMoveTaskItem;
|
||||
private RemoveTaskInventory handlerRemoveTaskItem; //OnRemoveTaskItem;
|
||||
private RezScript handlerRezScript; //OnRezScript;
|
||||
private RequestMapBlocks handlerRequestMapBlocks; //OnRequestMapBlocks;
|
||||
private RequestMapName handlerMapNameRequest; //OnMapNameRequest;
|
||||
private TeleportLocationRequest handlerTeleportLocationRequest; //OnTeleportLocationRequest;
|
||||
private MoneyBalanceRequest handlerMoneyBalanceRequest; //OnMoneyBalanceRequest;
|
||||
private UUIDNameRequest handlerNameRequest;
|
||||
private ParcelAccessListRequest handlerParcelAccessListRequest; //OnParcelAccessListRequest;
|
||||
private ParcelAccessListUpdateRequest handlerParcelAccessListUpdateRequest; //OnParcelAccessListUpdateRequest;
|
||||
private ParcelPropertiesRequest handlerParcelPropertiesRequest; //OnParcelPropertiesRequest;
|
||||
private ParcelDivideRequest handlerParcelDivideRequest; //OnParcelDivideRequest;
|
||||
private ParcelJoinRequest handlerParcelJoinRequest; //OnParcelJoinRequest;
|
||||
private ParcelPropertiesUpdateRequest handlerParcelPropertiesUpdateRequest; //OnParcelPropertiesUpdateRequest;
|
||||
private ParcelSelectObjects handlerParcelSelectObjects; //OnParcelSelectObjects;
|
||||
private ParcelObjectOwnerRequest handlerParcelObjectOwnerRequest; //OnParcelObjectOwnerRequest;
|
||||
private ParcelAbandonRequest handlerParcelAbandonRequest;
|
||||
private ParcelGodForceOwner handlerParcelGodForceOwner;
|
||||
private ParcelReclaim handlerParcelReclaim;
|
||||
private ParcelReturnObjectsRequest handlerParcelReturnObjectsRequest;
|
||||
private RegionInfoRequest handlerRegionInfoRequest; //OnRegionInfoRequest;
|
||||
private EstateCovenantRequest handlerEstateCovenantRequest; //OnEstateCovenantRequest;
|
||||
private RequestGodlikePowers handlerReqGodlikePowers; //OnRequestGodlikePowers;
|
||||
private GodKickUser handlerGodKickUser; //OnGodKickUser;
|
||||
private ViewerEffectEventHandler handlerViewerEffect; //OnViewerEffect;
|
||||
private Action<IClientAPI> handlerLogout; //OnLogout;
|
||||
private MoneyTransferRequest handlerMoneyTransferRequest; //OnMoneyTransferRequest;
|
||||
private ParcelBuy handlerParcelBuy;
|
||||
private EconomyDataRequest handlerEconomoyDataRequest;
|
||||
|
||||
private UpdateVector handlerUpdatePrimSinglePosition = null; //OnUpdatePrimSinglePosition;
|
||||
private UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = null; //OnUpdatePrimSingleRotation;
|
||||
private UpdateVector handlerUpdatePrimScale = null; //OnUpdatePrimScale;
|
||||
private UpdateVector handlerUpdatePrimGroupScale = null; //OnUpdateGroupScale;
|
||||
private UpdateVector handlerUpdateVector = null; //OnUpdatePrimGroupPosition;
|
||||
private UpdatePrimRotation handlerUpdatePrimRotation = null; //OnUpdatePrimGroupRotation;
|
||||
// private UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = null; //OnUpdatePrimGroupMouseRotation;
|
||||
// private RequestAsset handlerRequestAsset = null; // OnRequestAsset;
|
||||
private UUIDNameRequest handlerTeleportHomeRequest = null;
|
||||
private UpdateVector handlerUpdatePrimSinglePosition; //OnUpdatePrimSinglePosition;
|
||||
private UpdatePrimSingleRotation handlerUpdatePrimSingleRotation; //OnUpdatePrimSingleRotation;
|
||||
private UpdateVector handlerUpdatePrimScale; //OnUpdatePrimScale;
|
||||
private UpdateVector handlerUpdatePrimGroupScale; //OnUpdateGroupScale;
|
||||
private UpdateVector handlerUpdateVector; //OnUpdatePrimGroupPosition;
|
||||
private UpdatePrimRotation handlerUpdatePrimRotation; //OnUpdatePrimGroupRotation;
|
||||
// private UpdatePrimGroupRotation handlerUpdatePrimGroupRotation; //OnUpdatePrimGroupMouseRotation;
|
||||
// private RequestAsset handlerRequestAsset; // OnRequestAsset;
|
||||
private UUIDNameRequest handlerTeleportHomeRequest;
|
||||
|
||||
private RegionHandleRequest handlerRegionHandleRequest = null; // OnRegionHandleRequest
|
||||
private ParcelInfoRequest handlerParcelInfoRequest = null; // OnParcelInfoRequest
|
||||
private RegionHandleRequest handlerRegionHandleRequest; // OnRegionHandleRequest
|
||||
private ParcelInfoRequest handlerParcelInfoRequest; // OnParcelInfoRequest
|
||||
|
||||
private ScriptAnswer handlerScriptAnswer = null;
|
||||
private RequestPayPrice handlerRequestPayPrice = null;
|
||||
private ObjectSaleInfo handlerObjectSaleInfo = null;
|
||||
private ObjectBuy handlerObjectBuy = null;
|
||||
//private BuyObjectInventory handlerBuyObjectInventory = null;
|
||||
private ObjectDeselect handlerObjectDetach = null;
|
||||
private ObjectDrop handlerObjectDrop = null;
|
||||
private AgentSit handlerOnUndo = null;
|
||||
private ScriptAnswer handlerScriptAnswer;
|
||||
private RequestPayPrice handlerRequestPayPrice;
|
||||
private ObjectSaleInfo handlerObjectSaleInfo;
|
||||
private ObjectBuy handlerObjectBuy;
|
||||
//private BuyObjectInventory handlerBuyObjectInventory;
|
||||
private ObjectDeselect handlerObjectDetach;
|
||||
private ObjectDrop handlerObjectDrop;
|
||||
private AgentSit handlerOnUndo;
|
||||
|
||||
private ForceReleaseControls handlerForceReleaseControls = null;
|
||||
private ForceReleaseControls handlerForceReleaseControls;
|
||||
|
||||
private GodLandStatRequest handlerLandStatRequest = null;
|
||||
private GodLandStatRequest handlerLandStatRequest;
|
||||
|
||||
private UUIDNameRequest handlerUUIDGroupNameRequest = null;
|
||||
private UUIDNameRequest handlerUUIDGroupNameRequest;
|
||||
|
||||
private RequestObjectPropertiesFamily handlerObjectGroupRequest = null;
|
||||
private ScriptReset handlerScriptReset = null;
|
||||
private GetScriptRunning handlerGetScriptRunning = null;
|
||||
private SetScriptRunning handlerSetScriptRunning = null;
|
||||
private UpdateVector handlerAutoPilotGo = null;
|
||||
private RequestObjectPropertiesFamily handlerObjectGroupRequest;
|
||||
private ScriptReset handlerScriptReset;
|
||||
private GetScriptRunning handlerGetScriptRunning;
|
||||
private SetScriptRunning handlerSetScriptRunning;
|
||||
private UpdateVector handlerAutoPilotGo;
|
||||
//Gesture
|
||||
private ActivateGesture handlerActivateGesture = null;
|
||||
private DeactivateGesture handlerDeactivateGesture = null;
|
||||
private ObjectOwner handlerObjectOwner = null;
|
||||
private ActivateGesture handlerActivateGesture;
|
||||
private DeactivateGesture handlerDeactivateGesture;
|
||||
private ObjectOwner handlerObjectOwner;
|
||||
|
||||
private DirPlacesQuery handlerDirPlacesQuery = null;
|
||||
private DirFindQuery handlerDirFindQuery = null;
|
||||
private DirLandQuery handlerDirLandQuery = null;
|
||||
private DirPopularQuery handlerDirPopularQuery = null;
|
||||
private DirClassifiedQuery handlerDirClassifiedQuery = null;
|
||||
private ParcelSetOtherCleanTime handlerParcelSetOtherCleanTime = null;
|
||||
private DirPlacesQuery handlerDirPlacesQuery;
|
||||
private DirFindQuery handlerDirFindQuery;
|
||||
private DirLandQuery handlerDirLandQuery;
|
||||
private DirPopularQuery handlerDirPopularQuery;
|
||||
private DirClassifiedQuery handlerDirClassifiedQuery;
|
||||
private ParcelSetOtherCleanTime handlerParcelSetOtherCleanTime;
|
||||
|
||||
private MapItemRequest handlerMapItemRequest = null;
|
||||
private MapItemRequest handlerMapItemRequest;
|
||||
|
||||
private IGroupsModule m_GroupsModule = null;
|
||||
private IGroupsModule m_GroupsModule;
|
||||
|
||||
//private TerrainUnacked handlerUnackedTerrain = null;
|
||||
|
||||
|
|
@ -399,15 +397,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="remoteEP"></param>
|
||||
/// <param name="scene"></param>
|
||||
/// <param name="assetCache"></param>
|
||||
/// <param name="packServer"></param>
|
||||
/// <param name="authenSessions"></param>
|
||||
/// <param name="agentId"></param>
|
||||
/// <param name="sessionId"></param>
|
||||
/// <param name="circuitCode"></param>
|
||||
/// <param name="proxyEP"></param>
|
||||
public LLClientView(
|
||||
EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer,
|
||||
AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP,
|
||||
|
|
@ -451,7 +440,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
RegisterLocalPacketHandlers();
|
||||
|
||||
m_clientThread = new Thread(new ThreadStart(Start));
|
||||
m_clientThread = new Thread(Start);
|
||||
m_clientThread.Name = "ClientThread";
|
||||
m_clientThread.IsBackground = true;
|
||||
m_clientThread.Start();
|
||||
|
|
@ -645,7 +634,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
if (m_debugPacketLevel > 0)
|
||||
{
|
||||
string info = String.Empty;
|
||||
string info;
|
||||
|
||||
if (m_debugPacketLevel < 255 && packet.Type == PacketType.AgentUpdate)
|
||||
return;
|
||||
|
|
@ -699,7 +688,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
# endregion
|
||||
|
||||
protected int m_terrainCheckerCount = 0;
|
||||
protected int m_terrainCheckerCount;
|
||||
|
||||
/// <summary>
|
||||
/// Event handler for check client timer
|
||||
|
|
@ -1002,10 +991,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
#region Scene/Avatar to Client
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="regionInfo"></param>
|
||||
public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
|
||||
{
|
||||
RegionHandshakePacket handshake = (RegionHandshakePacket)PacketPool.Instance.GetPacket(PacketType.RegionHandshake);
|
||||
|
|
@ -2050,8 +2035,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog);
|
||||
dialog.Data.ObjectID = objectID;
|
||||
dialog.Data.ObjectName = Utils.StringToBytes(objectname);
|
||||
dialog.Data.FirstName = Utils.StringToBytes(this.FirstName);
|
||||
dialog.Data.LastName = Utils.StringToBytes(this.LastName);
|
||||
dialog.Data.FirstName = Utils.StringToBytes(FirstName);
|
||||
dialog.Data.LastName = Utils.StringToBytes(LastName);
|
||||
dialog.Data.Message = Utils.StringToBytes(msg);
|
||||
dialog.Data.ImageID = textureID;
|
||||
dialog.Data.ChatChannel = ch;
|
||||
|
|
@ -2519,11 +2504,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="regionHandle"></param>
|
||||
/// <param name="timeDilation"></param>
|
||||
/// <param name="localID"></param>
|
||||
/// <param name="position"></param>
|
||||
/// <param name="rotation"></param>
|
||||
public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
|
||||
Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId)
|
||||
{
|
||||
|
|
@ -2709,7 +2689,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
#region Estate Data Sending Methods
|
||||
|
||||
private bool convertParamStringToBool(byte[] field)
|
||||
private static bool convertParamStringToBool(byte[] field)
|
||||
{
|
||||
string s = Utils.BytesToString(field);
|
||||
if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true")
|
||||
|
|
@ -2723,7 +2703,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
|
||||
packet.AgentData.TransactionID = UUID.Random();
|
||||
packet.AgentData.AgentID = this.AgentId;
|
||||
packet.AgentData.AgentID = AgentId;
|
||||
packet.AgentData.SessionID = this.SessionId;
|
||||
packet.MethodData.Invoice = invoice;
|
||||
packet.MethodData.Method = Utils.StringToBytes("setaccess");
|
||||
|
|
@ -2766,7 +2746,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
|
||||
packet.AgentData.TransactionID = UUID.Random();
|
||||
packet.AgentData.AgentID = this.AgentId;
|
||||
packet.AgentData.AgentID = AgentId;
|
||||
packet.AgentData.SessionID = this.SessionId;
|
||||
packet.MethodData.Invoice = invoice;
|
||||
packet.MethodData.Method = Utils.StringToBytes("setaccess");
|
||||
|
|
@ -2799,7 +2779,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
RegionInfoPacket rinfopack = new RegionInfoPacket();
|
||||
RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock();
|
||||
rinfopack.AgentData.AgentID = this.AgentId;
|
||||
rinfopack.AgentData.AgentID = AgentId;
|
||||
rinfopack.AgentData.SessionID = this.SessionId;
|
||||
rinfoblk.BillableFactor = args.billableFactor;
|
||||
rinfoblk.EstateID = args.estateID;
|
||||
|
|
@ -2974,7 +2954,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
|
||||
{
|
||||
ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
|
||||
replyPacket.Data.AgentID = this.AgentId;
|
||||
replyPacket.Data.AgentID = AgentId;
|
||||
replyPacket.Data.Flags = accessFlag;
|
||||
replyPacket.Data.LocalID = localLandID;
|
||||
replyPacket.Data.SequenceID = 0;
|
||||
|
|
@ -3580,8 +3560,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
if (nod.Attributes["name"] != null)
|
||||
{
|
||||
string name = (string)nod.Attributes["name"].Value.ToLower();
|
||||
string id = (string)nod.InnerText;
|
||||
string name = nod.Attributes["name"].Value.ToLower();
|
||||
string id = nod.InnerText;
|
||||
m_defaultAnimations.Add(name, (UUID)id);
|
||||
}
|
||||
}
|
||||
|
|
@ -3687,8 +3667,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
else
|
||||
{
|
||||
// UUID partId = part.UUID;
|
||||
UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation;
|
||||
UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
|
||||
UpdatePrimRotation handlerUpdatePrimRotation;
|
||||
UpdatePrimGroupRotation handlerUpdatePrimGroupRotation;
|
||||
|
||||
switch (block.Type)
|
||||
{
|
||||
|
|
@ -3856,7 +3836,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
/*
|
||||
IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);
|
||||
MapBlockReplyPacket mbReply = new MapBlockReplyPacket();
|
||||
mbReply.AgentData.AgentId = this.AgentId;
|
||||
mbReply.AgentData.AgentId = AgentId;
|
||||
int len;
|
||||
if (simMapProfiles == null)
|
||||
len = 0;
|
||||
|
|
@ -3933,11 +3913,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
SendMoneyBalance(UUID.Zero, true, Utils.StringToBytes("Poof Poof!"), m_moneyBalance);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Breaks down the genericMessagePacket into specific events
|
||||
|
|
@ -3950,16 +3927,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
switch (gmMethod)
|
||||
{
|
||||
case "autopilot":
|
||||
float locx = 0f;
|
||||
float locy = 0f;
|
||||
float locz = 0f;
|
||||
uint regionX = 0;
|
||||
uint regionY = 0;
|
||||
float locx;
|
||||
float locy;
|
||||
float locz;
|
||||
uint regionX;
|
||||
uint regionY;
|
||||
try
|
||||
{
|
||||
Helpers.LongToUInts(Scene.RegionInfo.RegionHandle, out regionX, out regionY);
|
||||
locx = Convert.ToSingle(Utils.BytesToString(gmParams[0].Parameter)) - (float)regionX;
|
||||
locy = Convert.ToSingle(Utils.BytesToString(gmParams[1].Parameter)) - (float)regionY;
|
||||
locx = Convert.ToSingle(Utils.BytesToString(gmParams[0].Parameter)) - regionX;
|
||||
locy = Convert.ToSingle(Utils.BytesToString(gmParams[1].Parameter)) - regionY;
|
||||
locz = Convert.ToSingle(Utils.BytesToString(gmParams[2].Parameter));
|
||||
}
|
||||
catch (InvalidCastException)
|
||||
|
|
@ -3978,10 +3955,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
break;
|
||||
default:
|
||||
m_log.Debug("[CLIENT]: Unknown Generic Message, Method: " + gmMethod + ". Invoice: " + gmInvoice.ToString() + ". Dumping Params:");
|
||||
m_log.Debug("[CLIENT]: Unknown Generic Message, Method: " + gmMethod + ". Invoice: " + gmInvoice + ". Dumping Params:");
|
||||
for (int hi = 0; hi < gmParams.Length; hi++)
|
||||
{
|
||||
System.Console.WriteLine(gmParams[hi].ToString());
|
||||
Console.WriteLine(gmParams[hi].ToString());
|
||||
}
|
||||
//gmpack.MethodData.
|
||||
break;
|
||||
|
|
@ -4002,8 +3979,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
//there is a handler registered that handled this packet type
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Main packet processing conditional
|
||||
switch (Pack.Type)
|
||||
{
|
||||
|
|
@ -4201,7 +4176,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
modify.ModifyBlock.BrushSize,
|
||||
modify.ModifyBlock.Action, modify.ParcelData[i].North,
|
||||
modify.ParcelData[i].West, modify.ParcelData[i].South,
|
||||
modify.ParcelData[i].East, this.AgentId);
|
||||
modify.ParcelData[i].East, AgentId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5006,12 +4981,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
//
|
||||
if (transfer.TransferInfo.SourceType == 3)
|
||||
{
|
||||
UUID taskID = UUID.Zero;
|
||||
UUID itemID = UUID.Zero;
|
||||
UUID requestID = UUID.Zero;
|
||||
taskID = new UUID(transfer.TransferInfo.Params, 48);
|
||||
itemID = new UUID(transfer.TransferInfo.Params, 64);
|
||||
requestID = new UUID(transfer.TransferInfo.Params, 80);
|
||||
UUID taskID = new UUID(transfer.TransferInfo.Params, 48);
|
||||
UUID itemID = new UUID(transfer.TransferInfo.Params, 64);
|
||||
UUID requestID = new UUID(transfer.TransferInfo.Params, 80);
|
||||
if (!(((Scene)m_scene).ExternalChecks.ExternalChecksBypassPermissions()))
|
||||
{
|
||||
if (taskID != UUID.Zero) // Prim
|
||||
|
|
@ -5479,7 +5451,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
item.SalePrice = rezScriptx.InventoryBlock.SalePrice;
|
||||
item.Name = Util.FieldToString(rezScriptx.InventoryBlock.Name);
|
||||
item.Description = Util.FieldToString(rezScriptx.InventoryBlock.Description);
|
||||
item.CreationDate = (int)rezScriptx.InventoryBlock.CreationDate;
|
||||
item.CreationDate = rezScriptx.InventoryBlock.CreationDate;
|
||||
|
||||
if (handlerRezScript != null)
|
||||
{
|
||||
|
|
@ -5502,7 +5474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
break;
|
||||
case PacketType.MapNameRequest:
|
||||
MapNameRequestPacket map = (MapNameRequestPacket)Pack;
|
||||
string mapName = UTF8Encoding.UTF8.GetString(map.NameData.Name, 0,
|
||||
string mapName = Encoding.UTF8.GetString(map.NameData.Name, 0,
|
||||
map.NameData.Name.Length - 1);
|
||||
handlerMapNameRequest = OnMapNameRequest;
|
||||
if (handlerMapNameRequest != null)
|
||||
|
|
@ -5547,7 +5519,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
handlerTeleportHomeRequest = OnTeleportHomeRequest;
|
||||
if (handlerTeleportHomeRequest != null)
|
||||
{
|
||||
handlerTeleportHomeRequest(this.AgentId, this);
|
||||
handlerTeleportHomeRequest(AgentId, this);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -5808,13 +5780,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
switch (Utils.BytesToString(messagePacket.MethodData.Method))
|
||||
{
|
||||
case "getinfo":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
OnDetailedEstateDataRequest(this, messagePacket.MethodData.Invoice);
|
||||
}
|
||||
break;
|
||||
case "setregioninfo":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter),
|
||||
convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter),
|
||||
|
|
@ -5827,7 +5799,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
break;
|
||||
// case "texturebase":
|
||||
// if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
// if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
// {
|
||||
// foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
|
||||
// {
|
||||
|
|
@ -5842,7 +5814,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
// }
|
||||
// break;
|
||||
case "texturedetail":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
|
||||
{
|
||||
|
|
@ -5860,7 +5832,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
break;
|
||||
case "textureheights":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
|
||||
{
|
||||
|
|
@ -5881,7 +5853,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
OnCommitEstateTerrainTextureRequest(this);
|
||||
break;
|
||||
case "setregionterrain":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
if (messagePacket.ParamList.Length != 9)
|
||||
{
|
||||
|
|
@ -5891,8 +5863,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
try
|
||||
{
|
||||
string tmp;
|
||||
tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter);
|
||||
string tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter);
|
||||
if (!tmp.Contains(".")) tmp += ".00";
|
||||
float WaterHeight = (float)Convert.ToDecimal(tmp);
|
||||
tmp = Utils.BytesToString(messagePacket.ParamList[1].Parameter);
|
||||
|
|
@ -5913,19 +5884,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
m_log.Error("EstateOwnerMessage: Exception while setting terrain settings: \n" + messagePacket.ToString() + "\n" + ex.ToString());
|
||||
m_log.Error("EstateOwnerMessage: Exception while setting terrain settings: \n" + messagePacket + "\n" + ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
case "restart":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
// There's only 1 block in the estateResetSim.. and that's the number of seconds till restart.
|
||||
foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
|
||||
{
|
||||
float timeSeconds = 0;
|
||||
float timeSeconds;
|
||||
Utils.TryParseSingle(Utils.BytesToString(block.Parameter), out timeSeconds);
|
||||
timeSeconds = (int)timeSeconds;
|
||||
OnEstateRestartSimRequest(this, (int)timeSeconds);
|
||||
|
|
@ -5934,7 +5905,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
break;
|
||||
case "estatechangecovenantid":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
|
||||
{
|
||||
|
|
@ -5944,7 +5915,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
break;
|
||||
case "estateaccessdelta": // Estate access delta manages the banlist and allow list too.
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
int estateAccessType = Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[1].Parameter));
|
||||
OnUpdateEstateAccessDeltaRequest(this, messagePacket.MethodData.Invoice, estateAccessType, new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter)));
|
||||
|
|
@ -5952,7 +5923,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
break;
|
||||
case "simulatormessage":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
UUID invoice = messagePacket.MethodData.Invoice;
|
||||
UUID SenderID = new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter));
|
||||
|
|
@ -5963,7 +5934,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
break;
|
||||
case "instantmessage":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
if (messagePacket.ParamList.Length < 5)
|
||||
break;
|
||||
|
|
@ -5976,7 +5947,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
break;
|
||||
case "setregiondebug":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
UUID invoice = messagePacket.MethodData.Invoice;
|
||||
UUID SenderID = messagePacket.AgentData.AgentID;
|
||||
|
|
@ -5988,11 +5959,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
break;
|
||||
case "teleporthomeuser":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
UUID invoice = messagePacket.MethodData.Invoice;
|
||||
UUID SenderID = messagePacket.AgentData.AgentID;
|
||||
UUID Prey = UUID.Zero;
|
||||
UUID Prey;
|
||||
|
||||
UUID.TryParse(Utils.BytesToString(messagePacket.ParamList[1].Parameter), out Prey);
|
||||
|
||||
|
|
@ -6000,7 +5971,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
break;
|
||||
case "teleporthomeallusers":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
UUID invoice = messagePacket.MethodData.Invoice;
|
||||
UUID SenderID = messagePacket.AgentData.AgentID;
|
||||
|
|
@ -6022,7 +5993,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
break;
|
||||
case "terrain":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
handlerBakeTerrain = OnBakeTerrain;
|
||||
if (handlerBakeTerrain != null)
|
||||
|
|
@ -6033,7 +6004,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
break;
|
||||
|
||||
case "estatechangeinfo":
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
|
||||
if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false))
|
||||
{
|
||||
UUID invoice = messagePacket.MethodData.Invoice;
|
||||
UUID SenderID = messagePacket.AgentData.AgentID;
|
||||
|
|
@ -6049,7 +6020,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
break;
|
||||
|
||||
default:
|
||||
m_log.Error("EstateOwnerMessage: Unknown method requested\n" + messagePacket.ToString());
|
||||
m_log.Error("EstateOwnerMessage: Unknown method requested\n" + messagePacket);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
|
@ -6773,7 +6744,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
OutPacket(createGroupReply, ThrottleOutPacketType.Task);
|
||||
|
||||
// Sync with event queue
|
||||
System.Threading.Thread.Sleep(1000);
|
||||
Thread.Sleep(1000);
|
||||
|
||||
m_GroupsModule.SendAgentGroupDataUpdate(this);
|
||||
}
|
||||
|
|
@ -6916,12 +6887,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
break;
|
||||
|
||||
default:
|
||||
m_log.Warn("[CLIENT]: unhandled packet " + Pack.ToString());
|
||||
m_log.Warn("[CLIENT]: unhandled packet " + Pack);
|
||||
break;
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
PacketPool.Instance.ReturnPacket(Pack);
|
||||
}
|
||||
|
|
@ -6967,7 +6937,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message)
|
||||
{
|
||||
if (!ChildAgentStatus())
|
||||
SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)1, (uint)Util.UnixTimeSinceEpoch());
|
||||
SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, 1, (uint)Util.UnixTimeSinceEpoch());
|
||||
|
||||
//SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch());
|
||||
}
|
||||
|
|
@ -7145,7 +7115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
Transfer.TransferInfo.Params = new byte[20];
|
||||
Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
|
||||
int assType = (int)req.AssetInf.Type;
|
||||
int assType = req.AssetInf.Type;
|
||||
Array.Copy(Helpers.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4);
|
||||
}
|
||||
else if (req.AssetRequestSource == 3)
|
||||
|
|
@ -7155,7 +7125,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
//Array.Copy(req.RequestUser.AgentId.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
|
||||
//Array.Copy(req.RequestUser.SessionId.GetBytes(), 0, Transfer.TransferInfo.Params, 16, 16);
|
||||
}
|
||||
Transfer.TransferInfo.Size = (int)req.AssetInf.Data.Length;
|
||||
Transfer.TransferInfo.Size = req.AssetInf.Data.Length;
|
||||
Transfer.TransferInfo.TransferID = req.TransferRequestID;
|
||||
Transfer.Header.Zerocoded = true;
|
||||
OutPacket(Transfer, ThrottleOutPacketType.Asset);
|
||||
|
|
@ -7217,8 +7187,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
ClientInfo info = m_PacketHandler.GetClientInfo();
|
||||
|
||||
info.userEP = this.m_userEndPoint;
|
||||
info.proxyEP = this.m_proxyEndPoint;
|
||||
info.userEP = m_userEndPoint;
|
||||
info.proxyEP = m_proxyEndPoint;
|
||||
info.agentcircuit = new sAgentCircuitData(RequestClientInfo());
|
||||
|
||||
return info;
|
||||
|
|
@ -7234,7 +7204,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
|
||||
{
|
||||
ParcelMediaCommandMessagePacket commandMessagePacket = new ParcelMediaCommandMessagePacket();
|
||||
commandMessagePacket.CommandBlock.Flags = (uint) flags;
|
||||
commandMessagePacket.CommandBlock.Flags = flags;
|
||||
commandMessagePacket.CommandBlock.Command =(uint) command;
|
||||
commandMessagePacket.CommandBlock.Time = time;
|
||||
|
||||
|
|
@ -7348,7 +7318,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
switch (option)
|
||||
{
|
||||
case "ReliableIsImportant":
|
||||
bool val = false;
|
||||
bool val;
|
||||
|
||||
if (bool.TryParse(value, out val))
|
||||
m_PacketHandler.ReliableIsImportant = val;
|
||||
|
|
@ -7594,7 +7564,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
packet.EventData.Name = Utils.StringToBytes(data.name);
|
||||
packet.EventData.Category = Utils.StringToBytes(data.category);
|
||||
packet.EventData.Desc = Utils.StringToBytes(data.description);
|
||||
packet.EventData.Date = Utils.StringToBytes(data.date.ToString());
|
||||
packet.EventData.Date = Utils.StringToBytes(data.date);
|
||||
packet.EventData.DateUTC = data.dateUTC;
|
||||
packet.EventData.Duration = data.duration;
|
||||
packet.EventData.Cover = data.cover;
|
||||
|
|
@ -7671,8 +7641,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
public void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data)
|
||||
{
|
||||
int i;
|
||||
|
||||
AvatarGroupsReplyPacket p = (AvatarGroupsReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarGroupsReply);
|
||||
|
||||
p.AgentData = new AvatarGroupsReplyPacket.AgentDataBlock();
|
||||
|
|
@ -7680,7 +7648,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
p.AgentData.AvatarID = avatarID;
|
||||
|
||||
p.GroupData = new AvatarGroupsReplyPacket.GroupDataBlock[data.Length];
|
||||
i = 0;
|
||||
int i = 0;
|
||||
foreach (GroupMembershipData m in data)
|
||||
{
|
||||
p.GroupData[i] = new AvatarGroupsReplyPacket.GroupDataBlock();
|
||||
|
|
|
|||
Loading…
Reference in New Issue