OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pesty warnings

httptests
UbitUmarov 2018-02-03 20:37:36 +00:00
parent e7e8a7ab4d
commit 42d07e283f
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -99,8 +99,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event AgentRequestSit OnAgentRequestSit; public event AgentRequestSit OnAgentRequestSit;
public event AgentSit OnAgentSit; public event AgentSit OnAgentSit;
public event AvatarPickerRequest OnAvatarPickerRequest; public event AvatarPickerRequest OnAvatarPickerRequest;
public event StartAnim OnStartAnim;
public event StopAnim OnStopAnim;
public event ChangeAnim OnChangeAnim; public event ChangeAnim OnChangeAnim;
public event Action<IClientAPI> OnRequestAvatarsData; public event Action<IClientAPI> OnRequestAvatarsData;
public event LinkObjects OnLinkObjects; public event LinkObjects OnLinkObjects;
@ -131,12 +129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event UpdatePrimTexture OnUpdatePrimTexture; public event UpdatePrimTexture OnUpdatePrimTexture;
public event ClientChangeObject onClientChangeObject; public event ClientChangeObject onClientChangeObject;
public event UpdateVector OnUpdatePrimGroupPosition; public event UpdateVector OnUpdatePrimGroupPosition;
public event UpdateVector OnUpdatePrimSinglePosition;
public event UpdatePrimRotation OnUpdatePrimGroupRotation; public event UpdatePrimRotation OnUpdatePrimGroupRotation;
public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition;
public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
public event UpdateVector OnUpdatePrimScale;
public event UpdateVector OnUpdatePrimGroupScale; public event UpdateVector OnUpdatePrimGroupScale;
public event RequestMapBlocks OnRequestMapBlocks; public event RequestMapBlocks OnRequestMapBlocks;
public event RequestMapName OnMapNameRequest; public event RequestMapName OnMapNameRequest;
@ -292,7 +285,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
public event GenericCall2 OnUpdateThrottles; public event GenericCall2 OnUpdateThrottles;
#pragma warning disable 0067 #pragma warning disable 0067
// still unused
public event GenericMessage OnGenericMessage; public event GenericMessage OnGenericMessage;
public event TextureRequest OnRequestTexture; public event TextureRequest OnRequestTexture;
public event StatusChange OnChildAgentStatus; public event StatusChange OnChildAgentStatus;
@ -304,6 +299,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture; public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
public event TerrainUnacked OnUnackedTerrain; public event TerrainUnacked OnUnackedTerrain;
public event CachedTextureRequest OnCachedTextureRequest; public event CachedTextureRequest OnCachedTextureRequest;
public event UpdateVector OnUpdatePrimSinglePosition;
public event StartAnim OnStartAnim;
public event StopAnim OnStopAnim;
public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition;
public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
public event UpdateVector OnUpdatePrimScale;
#pragma warning restore 0067 #pragma warning restore 0067
#endregion Events #endregion Events
@ -339,12 +344,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private PriorityQueue m_entityUpdates; private PriorityQueue m_entityUpdates;
private PriorityQueue m_entityProps; private PriorityQueue m_entityProps;
private Prioritizer m_prioritizer; private Prioritizer m_prioritizer;
private bool m_disableFacelights = false; private bool m_disableFacelights;
// needs optimazation // needs optimazation
private HashSet<SceneObjectGroup> GroupsInView = new HashSet<SceneObjectGroup>(); private HashSet<SceneObjectGroup> GroupsInView = new HashSet<SceneObjectGroup>();
#pragma warning disable 0414
private bool m_VelocityInterpolate = false; private bool m_VelocityInterpolate;
#pragma warning restore 0414
private const uint MaxTransferBytesPerPacket = 600; private const uint MaxTransferBytesPerPacket = 600;
/// <value> /// <value>
@ -503,8 +509,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
RegisterInterface<IClientChat>(this); RegisterInterface<IClientChat>(this);
m_scene = scene; m_scene = scene;
m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); int pcap = 512;
m_entityProps = new PriorityQueue(m_scene.Entities.Count); if(pcap > m_scene.Entities.Count)
pcap = m_scene.Entities.Count;
m_entityUpdates = new PriorityQueue(pcap);
m_entityProps = new PriorityQueue(pcap);
m_killRecord = new List<uint>(); m_killRecord = new List<uint>();
// m_attachmentsSent = new HashSet<uint>(); // m_attachmentsSent = new HashSet<uint>();
@ -617,8 +626,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ImageManager.Close(); ImageManager.Close();
ImageManager = null; ImageManager = null;
m_entityUpdates = new PriorityQueue(1); m_entityUpdates.Close();
m_entityProps = new PriorityQueue(1); m_entityProps.Close();
m_killRecord.Clear(); m_killRecord.Clear();
GroupsInView.Clear(); GroupsInView.Clear();

2
OpenSim/Region/ScriptEngine/XMREngine/XMREngine.cs
View File

@ -97,7 +97,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
private int m_HeapSize; private int m_HeapSize;
private XMRScriptThread[] m_ScriptThreads; private XMRScriptThread[] m_ScriptThreads;
private Thread m_SleepThread = null; private Thread m_SleepThread = null;
private Thread m_SliceThread = null; // private Thread m_SliceThread = null;
private bool m_Exiting = false; private bool m_Exiting = false;
private int m_MaintenanceInterval = 10; private int m_MaintenanceInterval = 10;