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

some cleanup

httptests
UbitUmarov 2018-01-20 12:11:07 +00:00
parent ccd47d0cf1
commit 49b4408782
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
View File

@ -120,10 +120,6 @@ namespace OpenSim.Capabilities.Handlers
{ {
LLSDInventoryFolderContents thiscontents = contentsToLLSD(icoll.Collection, icoll.Descendents); LLSDInventoryFolderContents thiscontents = contentsToLLSD(icoll.Collection, icoll.Descendents);
inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(thiscontents); inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(thiscontents);
// inventoryitemstr = inventoryitemstr.Replace("<llsd>", "");
// inventoryitemstr = inventoryitemstr.Replace("</llsd>", "");
// inventoryitemstr = inventoryitemstr.Substring(6,inventoryitemstr.Length - 13);
// tmpresponse.Append(inventoryitemstr);
tmpresponse.Append(inventoryitemstr.Substring(6,inventoryitemstr.Length - 13)); tmpresponse.Append(inventoryitemstr.Substring(6,inventoryitemstr.Length - 13));
} }

4
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
View File

@ -66,8 +66,6 @@ namespace OpenSim.Capabilities.Handlers
Hashtable ret = new Hashtable(); Hashtable ret = new Hashtable();
ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound; ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
ret["content_type"] = "text/plain"; ret["content_type"] = "text/plain";
ret["keepalive"] = false;
ret["reusecontext"] = false;
ret["int_bytes"] = 0; ret["int_bytes"] = 0;
string textureStr = (string)request["texture_id"]; string textureStr = (string)request["texture_id"];
string format = (string)request["format"]; string format = (string)request["format"];
@ -112,8 +110,6 @@ namespace OpenSim.Capabilities.Handlers
ret["error_status_text"] = "not found"; ret["error_status_text"] = "not found";
ret["str_response_string"] = "not found"; ret["str_response_string"] = "not found";
ret["content_type"] = "text/plain"; ret["content_type"] = "text/plain";
ret["keepalive"] = false;
ret["reusecontext"] = false;
ret["int_bytes"] = 0; ret["int_bytes"] = 0;
} }
} }

12
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -898,7 +898,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (packet.Type == PacketType.CoarseLocationUpdate && allowSplitting) if (packet.Type == PacketType.CoarseLocationUpdate && allowSplitting)
allowSplitting = false; allowSplitting = false;
bool packetQueued = false; // bool packetQueued = false;
if (allowSplitting && packet.HasVariableBlocks) if (allowSplitting && packet.HasVariableBlocks)
{ {
@ -911,15 +911,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
for (int i = 0; i < packetCount; i++) for (int i = 0; i < packetCount; i++)
{ {
byte[] data = datas[i]; byte[] data = datas[i];
if (!SendPacketData(udpClient, data, packet.Type, category, method)) // if (!SendPacketData(udpClient, data, packet.Type, category, method))
packetQueued = true; // packetQueued = true;
SendPacketData(udpClient, data, packet.Type, category, method);
} }
} }
else else
{ {
byte[] data = packet.ToBytes(); byte[] data = packet.ToBytes();
if (!SendPacketData(udpClient, data, packet.Type, category, method)) // if (!SendPacketData(udpClient, data, packet.Type, category, method))
packetQueued = true; // packetQueued = true;
SendPacketData(udpClient, data, packet.Type, category, method);
} }
PacketPool.Instance.ReturnPacket(packet); PacketPool.Instance.ReturnPacket(packet);

1
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -77,7 +77,6 @@ namespace OpenSim.Region.Framework.Scenes
public class ScenePresence : EntityBase, IScenePresence public class ScenePresence : EntityBase, IScenePresence
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly String LogHeader = "[SCENE PRESENCE]";
// ~ScenePresence() // ~ScenePresence()
// { // {

1
OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs
View File

@ -54,6 +54,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
using dReal = System.Single; using dReal = System.Single;
//#endif //#endif
[SuppressUnmanagedCodeSecurityAttribute]
internal static class SafeNativeMethods internal static class SafeNativeMethods
{ {
internal static dReal Infinity = dReal.MaxValue; internal static dReal Infinity = dReal.MaxValue;