diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs index 2402acd2d1..4b1a2290c9 100644 --- a/OpenSim/Framework/Monitoring/Stats/Stat.cs +++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs @@ -242,11 +242,7 @@ namespace OpenSim.Framework.Monitoring public virtual OSDMap ToBriefOSDMap() { OSDMap ret = new OSDMap(); - ret.Add("Value", OSD.FromReal(Value)); - - double lastChangeOverTime, averageChangeOverTime; - return ret; } diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 70930107d2..ae8b784908 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -2675,7 +2675,7 @@ namespace OpenSim.Framework callback(o); } - catch (ThreadAbortException e) + catch (ThreadAbortException) { } catch (Exception e) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 6f5775ad3d..daa40c404b 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs @@ -503,7 +503,6 @@ namespace OpenSim.Region.ClientStack.Linden errorResponse.state = "error"; errorResponse.error = resperror; return errorResponse; - break; case FileAgentInventoryState.waitUpload: // todo stop current uploader server break; diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 2ff6cedc07..ee7df5ae6d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -335,7 +335,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private readonly byte[] m_channelVersion = Utils.EmptyBytes; private readonly IGroupsModule m_GroupsModule; - private int m_cachedTextureSerial; +// private int m_cachedTextureSerial; private PriorityQueue m_entityUpdates; private PriorityQueue m_entityProps; private Prioritizer m_prioritizer; @@ -11039,9 +11039,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP if(muteListRequest.MuteData.MuteCRC == 0) SendEmpytMuteList(); else - SendUseCachedMuteList(); + SendUseCachedMuteList(); } - return true; + return true; } private bool HandleUpdateMuteListEntry(IClientAPI client, Packet Packet) diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 9f52a14ee4..39443c3196 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs @@ -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); XmlDocument doc = new XmlDocument(); - doc.XmlResolver=null; string stateData = String.Empty; IAttachmentsService attServ = m_scene.RequestModuleInterface(); @@ -369,11 +368,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments { string xmlData; XmlDocument d = null; - UUID asset; + if (itemData.TryGetValue(attach.ItemID, out xmlData)) { d = new XmlDocument(); - d.XmlResolver=null; d.LoadXml(xmlData); m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID); } diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 1e418df94d..f454908d9c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs @@ -196,8 +196,6 @@ namespace OpenSim.Region.Framework.Scenes public void SendSimOnlineNotification(ulong regionHandle) { - RegionInfo Result = null; - Scene s = m_localScenes.FindValue(delegate(Scene x) { if (x.RegionInfo.RegionHandle == regionHandle) diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs index b694270320..dddec86cfe 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs @@ -1589,14 +1589,12 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing f = new Face(k,l,m); newfaces.Add(f); } - return true; } catch { - return false; } - return false; + return true; } } }