aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs44
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
237 private RequestPayPrice handlerRequestPayPrice = null; 237 private RequestPayPrice handlerRequestPayPrice = null;
238 private ObjectSaleInfo handlerObjectSaleInfo = null; 238 private ObjectSaleInfo handlerObjectSaleInfo = null;
239 private ObjectBuy handlerObjectBuy = null; 239 private ObjectBuy handlerObjectBuy = null;
240 private BuyObjectInventory handlerBuyObjectInventory = null; 240 //private BuyObjectInventory handlerBuyObjectInventory = null;
241 private ObjectDeselect handlerObjectDetach = null; 241 private ObjectDeselect handlerObjectDetach = null;
242 private AgentSit handlerOnUndo = null; 242 private AgentSit handlerOnUndo = null;
243 243
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
77 77
78 public class LLPacketHandler : IPacketHandler 78 public class LLPacketHandler : IPacketHandler
79 { 79 {
80 private static readonly ILog m_log = 80// private static readonly ILog m_log =
81 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 81// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
82 82
83 // Packet queues 83 // Packet queues
84 // 84 //
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
1584 remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false); 1584 remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false);
1585 return; 1585 return;
1586 } 1586 }
1587 1587
1588 bool transactionresult = doMoneyTransfer(remoteClient.AgentId, part.OwnerID, salePrice, 5000, "Object buy"); 1588 doMoneyTransfer(remoteClient.AgentId, part.OwnerID, salePrice, 5000, "Object buy");
1589 1589
1590 s.PerformObjectBuy(remoteClient, categoryID, localID, saleType); 1590 s.PerformObjectBuy(remoteClient, categoryID, localID, saleType);
1591 } 1591 }
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
206 206
207 RegionInfo reg = homeScene.RegionInfo; 207 RegionInfo reg = homeScene.RegionInfo;
208 ulong regionhandle = GetOSCompatibleRegionHandle(reg); 208 ulong regionhandle = GetOSCompatibleRegionHandle(reg);
209 string RegionURI = reg.ServerURI; 209 //string RegionURI = reg.ServerURI;
210 int RegionPort = (int)reg.HttpPort; 210 //int RegionPort = (int)reg.HttpPort;
211 211
212 LLUUID RemoteAgentID = requestMap["agent_id"].AsUUID(); 212 LLUUID RemoteAgentID = requestMap["agent_id"].AsUUID();
213 213
@@ -325,7 +325,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
325 homeScene.NewUserConnection(reg.RegionHandle, agentData); 325 homeScene.NewUserConnection(reg.RegionHandle, agentData);
326 326
327 327
328 string raCap = string.Empty; 328 //string raCap = string.Empty;
329 329
330 LLUUID AvatarRezCapUUID = LLUUID.Random(); 330 LLUUID AvatarRezCapUUID = LLUUID.Random();
331 string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar"; 331 string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar";
@@ -474,7 +474,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
474 474
475 m_log.ErrorFormat("DerezPath: {0}, Request: {1}", path, request.ToString()); 475 m_log.ErrorFormat("DerezPath: {0}, Request: {1}", path, request.ToString());
476 476
477 LLSD llsdResponse = null; 477 //LLSD llsdResponse = null;
478 LLSDMap responseMap = new LLSDMap(); 478 LLSDMap responseMap = new LLSDMap();
479 479
480 480
@@ -497,7 +497,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
497 if (userState.agent_id != LLUUID.Zero) 497 if (userState.agent_id != LLUUID.Zero)
498 { 498 {
499 499
500 LLSDMap outboundRequestMap = new LLSDMap(); 500 //LLSDMap outboundRequestMap = new LLSDMap();
501 LLSDMap inboundRequestMap = (LLSDMap)request; 501 LLSDMap inboundRequestMap = (LLSDMap)request;
502 string rezAvatarString = inboundRequestMap["rez_avatar"].AsString(); 502 string rezAvatarString = inboundRequestMap["rez_avatar"].AsString();
503 503
@@ -580,7 +580,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
580 return GenerateNoHandlerMessage(); 580 return GenerateNoHandlerMessage();
581 } 581 }
582 582
583 return responseMap; 583 //return responseMap;
584 } 584 }
585 585
586 private LLSDMap invokeRezAvatarCap(LLSDMap responseMap, string CapAddress, OGPState userState) 586 private LLSDMap invokeRezAvatarCap(LLSDMap responseMap, string CapAddress, OGPState userState)
@@ -740,30 +740,30 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
740 return Util.UIntsToLong(x, y); 740 return Util.UIntsToLong(x, y);
741 } 741 }
742 742
743 private ulong GetOSCompatibleRegionHandle(ulong regionhandle) 743// private ulong GetOSCompatibleRegionHandle(ulong regionhandle)
744 { 744// {
745 uint x,y; 745// uint x,y;
746 Helpers.LongToUInts(regionhandle,out x, out y); 746// Helpers.LongToUInts(regionhandle,out x, out y);
747 return GetOSCompatibleRegionHandle(x,y); 747// return GetOSCompatibleRegionHandle(x,y);
748 } 748// }
749 749
750 750
751 private ulong GetOGPCompatibleRegionHandle(RegionInfo reg) 751// private ulong GetOGPCompatibleRegionHandle(RegionInfo reg)
752 { 752// {
753 return Util.UIntsToLong((reg.RegionLocX * (uint)Constants.RegionSize), (reg.RegionLocY * (uint)Constants.RegionSize)); 753// return Util.UIntsToLong((reg.RegionLocX * (uint)Constants.RegionSize), (reg.RegionLocY * (uint)Constants.RegionSize));
754 } 754// }
755 755
756 private ulong GetOGPCompatibleRegionHandle(uint x, uint y) 756 private ulong GetOGPCompatibleRegionHandle(uint x, uint y)
757 { 757 {
758 return Util.UIntsToLong((x * (uint)Constants.RegionSize), (y * (uint)Constants.RegionSize)); 758 return Util.UIntsToLong((x * (uint)Constants.RegionSize), (y * (uint)Constants.RegionSize));
759 } 759 }
760 760
761 private ulong GetOGPCompatibleRegionHandle(ulong regionhandle) 761// private ulong GetOGPCompatibleRegionHandle(ulong regionhandle)
762 { 762// {
763 uint x, y; 763// uint x, y;
764 Helpers.LongToUInts(regionhandle, out x, out y); 764// Helpers.LongToUInts(regionhandle, out x, out y);
765 return GetOGPCompatibleRegionHandle(x, y); 765// return GetOGPCompatibleRegionHandle(x, y);
766 } 766// }
767 767
768 private OGPState InitializeNewState() 768 private OGPState InitializeNewState()
769 { 769 {