From 3d2069f3d9cd01ec948563c64bd4f8ddd9d0167f Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 25 Aug 2008 21:35:22 +0000 Subject: * zap compilation warnings --- .../Region/ClientStack/LindenUDP/LLClientView.cs | 2 +- .../ClientStack/LindenUDP/LLPacketHandler.cs | 4 +- .../Currency/SampleMoney/SampleMoneyModule.cs | 4 +- .../Modules/InterGrid/OpenGridProtocolModule.cs | 44 +++++++++++----------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index a30cafd..62bcae7 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -237,7 +237,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private RequestPayPrice handlerRequestPayPrice = null; private ObjectSaleInfo handlerObjectSaleInfo = null; private ObjectBuy handlerObjectBuy = null; - private BuyObjectInventory handlerBuyObjectInventory = null; + //private BuyObjectInventory handlerBuyObjectInventory = null; private ObjectDeselect handlerObjectDetach = null; private AgentSit handlerOnUndo = null; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index 830074a..e874394 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs @@ -77,8 +77,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP public class LLPacketHandler : IPacketHandler { - private static readonly ILog m_log = - LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = +// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // Packet queues // diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index 2795358..77dd0f9 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs @@ -1584,8 +1584,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false); return; } - - bool transactionresult = doMoneyTransfer(remoteClient.AgentId, part.OwnerID, salePrice, 5000, "Object buy"); + + doMoneyTransfer(remoteClient.AgentId, part.OwnerID, salePrice, 5000, "Object buy"); s.PerformObjectBuy(remoteClient, categoryID, localID, saleType); } diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index 746828a..ab6fe75 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs @@ -206,8 +206,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid RegionInfo reg = homeScene.RegionInfo; ulong regionhandle = GetOSCompatibleRegionHandle(reg); - string RegionURI = reg.ServerURI; - int RegionPort = (int)reg.HttpPort; + //string RegionURI = reg.ServerURI; + //int RegionPort = (int)reg.HttpPort; LLUUID RemoteAgentID = requestMap["agent_id"].AsUUID(); @@ -325,7 +325,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid homeScene.NewUserConnection(reg.RegionHandle, agentData); - string raCap = string.Empty; + //string raCap = string.Empty; LLUUID AvatarRezCapUUID = LLUUID.Random(); string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar"; @@ -474,7 +474,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid m_log.ErrorFormat("DerezPath: {0}, Request: {1}", path, request.ToString()); - LLSD llsdResponse = null; + //LLSD llsdResponse = null; LLSDMap responseMap = new LLSDMap(); @@ -497,7 +497,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid if (userState.agent_id != LLUUID.Zero) { - LLSDMap outboundRequestMap = new LLSDMap(); + //LLSDMap outboundRequestMap = new LLSDMap(); LLSDMap inboundRequestMap = (LLSDMap)request; string rezAvatarString = inboundRequestMap["rez_avatar"].AsString(); @@ -580,7 +580,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid return GenerateNoHandlerMessage(); } - return responseMap; + //return responseMap; } private LLSDMap invokeRezAvatarCap(LLSDMap responseMap, string CapAddress, OGPState userState) @@ -740,30 +740,30 @@ namespace OpenSim.Region.Environment.Modules.InterGrid return Util.UIntsToLong(x, y); } - private ulong GetOSCompatibleRegionHandle(ulong regionhandle) - { - uint x,y; - Helpers.LongToUInts(regionhandle,out x, out y); - return GetOSCompatibleRegionHandle(x,y); - } +// private ulong GetOSCompatibleRegionHandle(ulong regionhandle) +// { +// uint x,y; +// Helpers.LongToUInts(regionhandle,out x, out y); +// return GetOSCompatibleRegionHandle(x,y); +// } - private ulong GetOGPCompatibleRegionHandle(RegionInfo reg) - { - return Util.UIntsToLong((reg.RegionLocX * (uint)Constants.RegionSize), (reg.RegionLocY * (uint)Constants.RegionSize)); - } +// private ulong GetOGPCompatibleRegionHandle(RegionInfo reg) +// { +// return Util.UIntsToLong((reg.RegionLocX * (uint)Constants.RegionSize), (reg.RegionLocY * (uint)Constants.RegionSize)); +// } private ulong GetOGPCompatibleRegionHandle(uint x, uint y) { return Util.UIntsToLong((x * (uint)Constants.RegionSize), (y * (uint)Constants.RegionSize)); } - private ulong GetOGPCompatibleRegionHandle(ulong regionhandle) - { - uint x, y; - Helpers.LongToUInts(regionhandle, out x, out y); - return GetOGPCompatibleRegionHandle(x, y); - } +// private ulong GetOGPCompatibleRegionHandle(ulong regionhandle) +// { +// uint x, y; +// Helpers.LongToUInts(regionhandle, out x, out y); +// return GetOGPCompatibleRegionHandle(x, y); +// } private OGPState InitializeNewState() { -- cgit v1.1