aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs6
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs4
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs2
7 files changed, 16 insertions, 14 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 8199598..c3dcc90 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Communications
118 bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && 118 bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") &&
119 (requestData.Contains("passwd") || requestData.Contains("web_login_key"))); 119 (requestData.Contains("passwd") || requestData.Contains("web_login_key")));
120 120
121 bool GoodLogin; 121 //bool GoodLogin;
122 122
123 string startLocationRequest = "last"; 123 string startLocationRequest = "last";
124 124
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 5433e41..d05a1d1 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -527,10 +527,10 @@ namespace OpenSim.Region.Communications.Hypergrid
527 527
528 public bool InformRegionOfUser(RegionInfo regInfo, AgentCircuitData agentData) 528 public bool InformRegionOfUser(RegionInfo regInfo, AgentCircuitData agentData)
529 { 529 {
530 ulong regionHandle = regInfo.RegionHandle; 530 //ulong regionHandle = regInfo.RegionHandle;
531 try 531 try
532 { 532 {
533 regionHandle = Convert.ToUInt64(regInfo.regionSecret); 533 //regionHandle = Convert.ToUInt64(regInfo.regionSecret);
534 m_log.Info("[HGrid]: InformRegionOfUser: Remote hyperlinked region " + regInfo.regionSecret); 534 m_log.Info("[HGrid]: InformRegionOfUser: Remote hyperlinked region " + regInfo.regionSecret);
535 } 535 }
536 catch 536 catch
@@ -883,7 +883,7 @@ namespace OpenSim.Region.Communications.Hypergrid
883 if (regInfo == null) 883 if (regInfo == null)
884 return false; 884 return false;
885 885
886 ulong realHandle = regionHandle; 886 //ulong realHandle = regionHandle;
887 887
888 CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID); 888 CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID);
889 if ((uinfo == null) || !IsGoingHome(uinfo, regInfo)) 889 if ((uinfo == null) || !IsGoingHome(uinfo, regInfo))
diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
index 9ef040b..136fea1 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Communications.Hypergrid
46 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 private string _inventoryServerUrl; 48 private string _inventoryServerUrl;
49 private Uri m_Uri; 49 //private Uri m_Uri;
50 private UserProfileCacheService m_userProfileCache; 50 private UserProfileCacheService m_userProfileCache;
51 private bool m_gridmode = false; 51 private bool m_gridmode = false;
52 52
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Communications.Hypergrid
61 public HGInventoryService(string inventoryServerUrl, UserProfileCacheService userProfileCacheService, bool gridmode) 61 public HGInventoryService(string inventoryServerUrl, UserProfileCacheService userProfileCacheService, bool gridmode)
62 { 62 {
63 _inventoryServerUrl = HGNetworkServersInfo.ServerURI(inventoryServerUrl); 63 _inventoryServerUrl = HGNetworkServersInfo.ServerURI(inventoryServerUrl);
64 m_Uri = new Uri(_inventoryServerUrl); 64 //m_Uri = new Uri(_inventoryServerUrl);
65 m_userProfileCache = userProfileCacheService; 65 m_userProfileCache = userProfileCacheService;
66 m_gridmode = gridmode; 66 m_gridmode = gridmode;
67 } 67 }
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index d9b44a1..0ac39e9 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -47,14 +47,14 @@ namespace OpenSim.Region.Communications.Hypergrid
47 /// </summary> 47 /// </summary>
48 public class HGUserServices : IUserService, IAvatarService, IMessagingService 48 public class HGUserServices : IUserService, IAvatarService, IMessagingService
49 { 49 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 50 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 51
52 private HGCommunicationsGridMode m_parent; 52 //private HGCommunicationsGridMode m_parent;
53 private OGS1UserServices m_remoteUserServices; 53 private OGS1UserServices m_remoteUserServices;
54 54
55 public HGUserServices(HGCommunicationsGridMode parent) 55 public HGUserServices(HGCommunicationsGridMode parent)
56 { 56 {
57 m_parent = parent; 57 //m_parent = parent;
58 m_remoteUserServices = new OGS1UserServices(parent); 58 m_remoteUserServices = new OGS1UserServices(parent);
59 } 59 }
60 60
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
index cfcda42..192904c 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid
53 private static bool enabled = false; 53 private static bool enabled = false;
54 54
55 Scene m_scene; 55 Scene m_scene;
56 AssetService m_assetService; 56 //AssetService m_assetService;
57 57
58 #region IRegionModule interface 58 #region IRegionModule interface
59 59
@@ -75,7 +75,8 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid
75 { 75 {
76 m_log.Info("[HGStandaloneAssetService]: Starting..."); 76 m_log.Info("[HGStandaloneAssetService]: Starting...");
77 77
78 m_assetService = new AssetService(m_scene); 78 //m_assetService = new AssetService(m_scene);
79 new AssetService(m_scene);
79 } 80 }
80 } 81 }
81 82
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
index 7203b88..7eeece9 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid
52 private static bool enabled = false; 52 private static bool enabled = false;
53 53
54 Scene m_scene; 54 Scene m_scene;
55 InventoryService m_inventoryService; 55 //InventoryService m_inventoryService;
56 56
57 #region IRegionModule interface 57 #region IRegionModule interface
58 58
@@ -73,7 +73,8 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid
73 if (enabled) 73 if (enabled)
74 { 74 {
75 m_log.Info("[HGStandaloneInvService]: Starting..."); 75 m_log.Info("[HGStandaloneInvService]: Starting...");
76 m_inventoryService = new InventoryService(m_scene); 76 //m_inventoryService = new InventoryService(m_scene);
77 new InventoryService(m_scene);
77 } 78 }
78 } 79 }
79 80
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
index 3e27b7c..1715ffe 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
262 262
263 private Dictionary<UUID, bool> SniffUUIDs(UUID assetID) 263 private Dictionary<UUID, bool> SniffUUIDs(UUID assetID)
264 { 264 {
265 Dictionary<UUID, bool> uuids = new Dictionary<UUID, bool>(); 265 //Dictionary<UUID, bool> uuids = new Dictionary<UUID, bool>();
266 266
267 AssetBase asset; 267 AssetBase asset;
268 m_scene.CommsManager.AssetCache.TryGetCachedAsset(assetID, out asset); 268 m_scene.CommsManager.AssetCache.TryGetCachedAsset(assetID, out asset);