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

pesty warnings

httptests
UbitUmarov 2018-01-17 07:04:07 +00:00
parent ade0d8a81f
commit e9d2d81880
7 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Monitoring/Stats/Stat.cs
View File

@ -242,11 +242,7 @@ namespace OpenSim.Framework.Monitoring
public virtual OSDMap ToBriefOSDMap() public virtual OSDMap ToBriefOSDMap()
{ {
OSDMap ret = new OSDMap(); OSDMap ret = new OSDMap();
ret.Add("Value", OSD.FromReal(Value)); ret.Add("Value", OSD.FromReal(Value));
double lastChangeOverTime, averageChangeOverTime;
return ret; return ret;
} }

2
OpenSim/Framework/Util.cs
View File

@ -2675,7 +2675,7 @@ namespace OpenSim.Framework
callback(o); callback(o);
} }
catch (ThreadAbortException e) catch (ThreadAbortException)
{ {
} }
catch (Exception e) catch (Exception e)

1
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -503,7 +503,6 @@ namespace OpenSim.Region.ClientStack.Linden
errorResponse.state = "error"; errorResponse.state = "error";
errorResponse.error = resperror; errorResponse.error = resperror;
return errorResponse; return errorResponse;
break;
case FileAgentInventoryState.waitUpload: case FileAgentInventoryState.waitUpload:
// todo stop current uploader server // todo stop current uploader server
break; break;

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

@ -335,7 +335,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private readonly byte[] m_channelVersion = Utils.EmptyBytes; private readonly byte[] m_channelVersion = Utils.EmptyBytes;
private readonly IGroupsModule m_GroupsModule; private readonly IGroupsModule m_GroupsModule;
private int m_cachedTextureSerial; // private int m_cachedTextureSerial;
private PriorityQueue m_entityUpdates; private PriorityQueue m_entityUpdates;
private PriorityQueue m_entityProps; private PriorityQueue m_entityProps;
private Prioritizer m_prioritizer; private Prioritizer m_prioritizer;
@ -11039,9 +11039,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if(muteListRequest.MuteData.MuteCRC == 0) if(muteListRequest.MuteData.MuteCRC == 0)
SendEmpytMuteList(); SendEmpytMuteList();
else else
SendUseCachedMuteList(); SendUseCachedMuteList();
} }
return true; return true;
} }
private bool HandleUpdateMuteListEntry(IClientAPI client, Packet Packet) private bool HandleUpdateMuteListEntry(IClientAPI client, Packet Packet)

4
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -306,7 +306,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name); m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name);
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
string stateData = String.Empty; string stateData = String.Empty;
IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>(); IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
@ -369,11 +368,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
{ {
string xmlData; string xmlData;
XmlDocument d = null; XmlDocument d = null;
UUID asset;
if (itemData.TryGetValue(attach.ItemID, out xmlData)) if (itemData.TryGetValue(attach.ItemID, out xmlData))
{ {
d = new XmlDocument(); d = new XmlDocument();
d.XmlResolver=null;
d.LoadXml(xmlData); d.LoadXml(xmlData);
m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID); m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID);
} }

2
OpenSim/Region/Framework/Scenes/SceneManager.cs
View File

@ -196,8 +196,6 @@ namespace OpenSim.Region.Framework.Scenes
public void SendSimOnlineNotification(ulong regionHandle) public void SendSimOnlineNotification(ulong regionHandle)
{ {
RegionInfo Result = null;
Scene s = m_localScenes.FindValue(delegate(Scene x) Scene s = m_localScenes.FindValue(delegate(Scene x)
{ {
if (x.RegionInfo.RegionHandle == regionHandle) if (x.RegionInfo.RegionHandle == regionHandle)

4
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@ -1589,14 +1589,12 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
f = new Face(k,l,m); f = new Face(k,l,m);
newfaces.Add(f); newfaces.Add(f);
} }
return true;
} }
catch catch
{ {
return false; return false;
} }
return false; return true;
} }
} }
} }