* minor: remove warnings (the code cleaners strike again)
parent
36097a8198
commit
8c55f3eaa6
|
@ -395,14 +395,14 @@ namespace OpenSim.Data.Tests
|
|||
return i;
|
||||
}
|
||||
|
||||
private InventoryFolderBase NewFolder(UUID id, UUID parent, UUID owner, string name)
|
||||
{
|
||||
InventoryFolderBase f = new InventoryFolderBase();
|
||||
f.ID = id;
|
||||
f.ParentID = parent;
|
||||
f.Owner = owner;
|
||||
f.Name = name;
|
||||
return f;
|
||||
}
|
||||
// private InventoryFolderBase NewFolder(UUID id, UUID parent, UUID owner, string name)
|
||||
// {
|
||||
// InventoryFolderBase f = new InventoryFolderBase();
|
||||
// f.ID = id;
|
||||
// f.ParentID = parent;
|
||||
// f.Owner = owner;
|
||||
// f.Name = name;
|
||||
// return f;
|
||||
// }
|
||||
}
|
||||
}
|
|
@ -594,10 +594,10 @@ namespace OpenSim.Framework.Servers
|
|||
case "application/xml":
|
||||
default:
|
||||
// Point of note.. the DoWeHaveA methods check for an EXACT path
|
||||
if (request.RawUrl.Contains("/CAPS/EQG"))
|
||||
{
|
||||
int i = 1;
|
||||
}
|
||||
// if (request.RawUrl.Contains("/CAPS/EQG"))
|
||||
// {
|
||||
// int i = 1;
|
||||
// }
|
||||
if (DoWeHaveALLSDHandler(request.RawUrl))
|
||||
{
|
||||
HandleLLSDRequests(request, response);
|
||||
|
|
|
@ -783,8 +783,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
ClientLoop();
|
||||
}
|
||||
}
|
||||
//Todo set as Generic Exception again.
|
||||
}
|
||||
catch (System.Exception e)
|
||||
{
|
||||
if (e is ThreadAbortException)
|
||||
|
@ -794,7 +793,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
|
||||
|
||||
// Don't let a failure in an individual client thread crash the whole sim.
|
||||
m_log.ErrorFormat("[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e);
|
||||
m_log.ErrorFormat(
|
||||
"[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e);
|
||||
|
||||
try
|
||||
{
|
||||
|
|
|
@ -762,7 +762,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
Packet packet = item.Packet;
|
||||
|
||||
|
||||
// Assign sequence number here to prevent out of order packets
|
||||
if (packet.Header.Sequence == 0)
|
||||
{
|
||||
|
|
|
@ -413,10 +413,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
private static int ScaleThrottle(int value, int curmax, int newmax)
|
||||
{
|
||||
return (value / curmax) * newmax;
|
||||
return (int)((value / (float)curmax) * newmax);
|
||||
}
|
||||
|
||||
public byte[] GetThrottlesPacked(float multiplier)
|
||||
|
|
|
@ -268,10 +268,9 @@ namespace OpenSim.Region.Environment.Modules.Framework
|
|||
{
|
||||
return ProcessQueue(m_dhttpMethod,agentID, caps);
|
||||
}));
|
||||
|
||||
bool boolval = false;
|
||||
|
||||
// This will persist this beyond the expiry of the caps handlers
|
||||
boolval = m_scene.AddHTTPHandler(capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
|
||||
m_scene.AddHTTPHandler(capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
|
||||
|
||||
Random rnd = new Random(System.Environment.TickCount);
|
||||
lock (m_ids)
|
||||
|
@ -421,7 +420,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
|
|||
string capuuid = path.Replace("/CAPS/EQG/","");
|
||||
capuuid = capuuid.Substring(0, capuuid.Length - 1);
|
||||
|
||||
UUID AvatarID = UUID.Zero;
|
||||
// UUID AvatarID = UUID.Zero;
|
||||
UUID capUUID = UUID.Zero;
|
||||
if (UUID.TryParse(capuuid, out capUUID))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue