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

* zap compilation warnings

0.6.0-stable
Justin Clarke Casey 2008-08-25 21:35:22 +00:00
parent 7402c2d288
commit 3d2069f3d9
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,7 +237,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private RequestPayPrice handlerRequestPayPrice = null; private RequestPayPrice handlerRequestPayPrice = null;
private ObjectSaleInfo handlerObjectSaleInfo = null; private ObjectSaleInfo handlerObjectSaleInfo = null;
private ObjectBuy handlerObjectBuy = null; private ObjectBuy handlerObjectBuy = null;
private BuyObjectInventory handlerBuyObjectInventory = null; //private BuyObjectInventory handlerBuyObjectInventory = null;
private ObjectDeselect handlerObjectDetach = null; private ObjectDeselect handlerObjectDetach = null;
private AgentSit handlerOnUndo = null; private AgentSit handlerOnUndo = null;

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

@ -77,8 +77,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public class LLPacketHandler : IPacketHandler public class LLPacketHandler : IPacketHandler
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// Packet queues // Packet queues
// //

4
OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
View File

@ -1584,8 +1584,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false); remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false);
return; 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); s.PerformObjectBuy(remoteClient, categoryID, localID, saleType);
} }

44
OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
View File

@ -206,8 +206,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
RegionInfo reg = homeScene.RegionInfo; RegionInfo reg = homeScene.RegionInfo;
ulong regionhandle = GetOSCompatibleRegionHandle(reg); ulong regionhandle = GetOSCompatibleRegionHandle(reg);
string RegionURI = reg.ServerURI; //string RegionURI = reg.ServerURI;
int RegionPort = (int)reg.HttpPort; //int RegionPort = (int)reg.HttpPort;
LLUUID RemoteAgentID = requestMap["agent_id"].AsUUID(); LLUUID RemoteAgentID = requestMap["agent_id"].AsUUID();
@ -325,7 +325,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
homeScene.NewUserConnection(reg.RegionHandle, agentData); homeScene.NewUserConnection(reg.RegionHandle, agentData);
string raCap = string.Empty; //string raCap = string.Empty;
LLUUID AvatarRezCapUUID = LLUUID.Random(); LLUUID AvatarRezCapUUID = LLUUID.Random();
string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar"; 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()); m_log.ErrorFormat("DerezPath: {0}, Request: {1}", path, request.ToString());
LLSD llsdResponse = null; //LLSD llsdResponse = null;
LLSDMap responseMap = new LLSDMap(); LLSDMap responseMap = new LLSDMap();
@ -497,7 +497,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
if (userState.agent_id != LLUUID.Zero) if (userState.agent_id != LLUUID.Zero)
{ {
LLSDMap outboundRequestMap = new LLSDMap(); //LLSDMap outboundRequestMap = new LLSDMap();
LLSDMap inboundRequestMap = (LLSDMap)request; LLSDMap inboundRequestMap = (LLSDMap)request;
string rezAvatarString = inboundRequestMap["rez_avatar"].AsString(); string rezAvatarString = inboundRequestMap["rez_avatar"].AsString();
@ -580,7 +580,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
return GenerateNoHandlerMessage(); return GenerateNoHandlerMessage();
} }
return responseMap; //return responseMap;
} }
private LLSDMap invokeRezAvatarCap(LLSDMap responseMap, string CapAddress, OGPState userState) private LLSDMap invokeRezAvatarCap(LLSDMap responseMap, string CapAddress, OGPState userState)
@ -740,30 +740,30 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
return Util.UIntsToLong(x, y); return Util.UIntsToLong(x, y);
} }
private ulong GetOSCompatibleRegionHandle(ulong regionhandle) // private ulong GetOSCompatibleRegionHandle(ulong regionhandle)
{ // {
uint x,y; // uint x,y;
Helpers.LongToUInts(regionhandle,out x, out y); // Helpers.LongToUInts(regionhandle,out x, out y);
return GetOSCompatibleRegionHandle(x,y); // return GetOSCompatibleRegionHandle(x,y);
} // }
private ulong GetOGPCompatibleRegionHandle(RegionInfo reg) // private ulong GetOGPCompatibleRegionHandle(RegionInfo reg)
{ // {
return Util.UIntsToLong((reg.RegionLocX * (uint)Constants.RegionSize), (reg.RegionLocY * (uint)Constants.RegionSize)); // return Util.UIntsToLong((reg.RegionLocX * (uint)Constants.RegionSize), (reg.RegionLocY * (uint)Constants.RegionSize));
} // }
private ulong GetOGPCompatibleRegionHandle(uint x, uint y) private ulong GetOGPCompatibleRegionHandle(uint x, uint y)
{ {
return Util.UIntsToLong((x * (uint)Constants.RegionSize), (y * (uint)Constants.RegionSize)); return Util.UIntsToLong((x * (uint)Constants.RegionSize), (y * (uint)Constants.RegionSize));
} }
private ulong GetOGPCompatibleRegionHandle(ulong regionhandle) // private ulong GetOGPCompatibleRegionHandle(ulong regionhandle)
{ // {
uint x, y; // uint x, y;
Helpers.LongToUInts(regionhandle, out x, out y); // Helpers.LongToUInts(regionhandle, out x, out y);
return GetOGPCompatibleRegionHandle(x, y); // return GetOGPCompatibleRegionHandle(x, y);
} // }
private OGPState InitializeNewState() private OGPState InitializeNewState()
{ {