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

* minor: remove warnings (the code cleaners strike again)

0.6.0-stable
Justin Clarke Casey 2008-10-03 14:18:17 +00:00
parent 36097a8198
commit 8c55f3eaa6
6 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Data/Tests/BasicRegionTest.cs
View File

@ -395,14 +395,14 @@ namespace OpenSim.Data.Tests
return i; return i;
} }
private InventoryFolderBase NewFolder(UUID id, UUID parent, UUID owner, string name) // private InventoryFolderBase NewFolder(UUID id, UUID parent, UUID owner, string name)
{ // {
InventoryFolderBase f = new InventoryFolderBase(); // InventoryFolderBase f = new InventoryFolderBase();
f.ID = id; // f.ID = id;
f.ParentID = parent; // f.ParentID = parent;
f.Owner = owner; // f.Owner = owner;
f.Name = name; // f.Name = name;
return f; // return f;
} // }
} }
} }

8
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -594,10 +594,10 @@ namespace OpenSim.Framework.Servers
case "application/xml": case "application/xml":
default: default:
// Point of note.. the DoWeHaveA methods check for an EXACT path // Point of note.. the DoWeHaveA methods check for an EXACT path
if (request.RawUrl.Contains("/CAPS/EQG")) // if (request.RawUrl.Contains("/CAPS/EQG"))
{ // {
int i = 1; // int i = 1;
} // }
if (DoWeHaveALLSDHandler(request.RawUrl)) if (DoWeHaveALLSDHandler(request.RawUrl))
{ {
HandleLLSDRequests(request, response); HandleLLSDRequests(request, response);

6
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -783,8 +783,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ClientLoop(); ClientLoop();
} }
} }
//Todo set as Generic Exception again.
catch (System.Exception e) catch (System.Exception e)
{ {
if (e is ThreadAbortException) if (e is ThreadAbortException)
@ -794,7 +793,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
StatsManager.SimExtraStats.AddAbnormalClientThreadTermination(); StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
// Don't let a failure in an individual client thread crash the whole sim. // 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 try
{ {

1
OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
View File

@ -762,7 +762,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
Packet packet = item.Packet; Packet packet = item.Packet;
// Assign sequence number here to prevent out of order packets // Assign sequence number here to prevent out of order packets
if (packet.Header.Sequence == 0) if (packet.Header.Sequence == 0)
{ {

3
OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
View File

@ -413,10 +413,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
private static int ScaleThrottle(int value, int curmax, int newmax) 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) public byte[] GetThrottlesPacked(float multiplier)

7
OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
View File

@ -268,10 +268,9 @@ namespace OpenSim.Region.Environment.Modules.Framework
{ {
return ProcessQueue(m_dhttpMethod,agentID, caps); return ProcessQueue(m_dhttpMethod,agentID, caps);
})); }));
bool boolval = false;
// This will persist this beyond the expiry of the caps handlers // 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); Random rnd = new Random(System.Environment.TickCount);
lock (m_ids) lock (m_ids)
@ -421,7 +420,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
string capuuid = path.Replace("/CAPS/EQG/",""); string capuuid = path.Replace("/CAPS/EQG/","");
capuuid = capuuid.Substring(0, capuuid.Length - 1); capuuid = capuuid.Substring(0, capuuid.Length - 1);
UUID AvatarID = UUID.Zero; // UUID AvatarID = UUID.Zero;
UUID capUUID = UUID.Zero; UUID capUUID = UUID.Zero;
if (UUID.TryParse(capuuid, out capUUID)) if (UUID.TryParse(capuuid, out capUUID))
{ {