aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Services/HGInventoryService.cs4
-rw-r--r--OpenSim/Framework/Util.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Services/HGInventoryService.cs b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
index d59d1ae..adc2056 100644
--- a/OpenSim/Framework/Communications/Services/HGInventoryService.cs
+++ b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
@@ -62,14 +62,14 @@ namespace OpenSim.Framework.Communications.Services
62 IAssetDataPlugin m_assetProvider = null; 62 IAssetDataPlugin m_assetProvider = null;
63 63
64 // These two used for remote access 64 // These two used for remote access
65 string m_UserServerURL = string.Empty; 65 //string m_UserServerURL = string.Empty;
66 string m_AssetServerURL = string.Empty; 66 string m_AssetServerURL = string.Empty;
67 SynchronousGridAssetClient m_AssetClient = null; 67 SynchronousGridAssetClient m_AssetClient = null;
68 68
69 // Constructor for grid inventory server 69 // Constructor for grid inventory server
70 public HGInventoryService(InventoryServiceBase invService, string assetServiceURL, string userServiceURL, IHttpServer httpserver, string thisurl) 70 public HGInventoryService(InventoryServiceBase invService, string assetServiceURL, string userServiceURL, IHttpServer httpserver, string thisurl)
71 { 71 {
72 m_UserServerURL = userServiceURL; 72 //m_UserServerURL = userServiceURL;
73 m_AssetServerURL = assetServiceURL; 73 m_AssetServerURL = assetServiceURL;
74 74
75 m_AssetClient = new SynchronousGridAssetClient(m_AssetServerURL); 75 m_AssetClient = new SynchronousGridAssetClient(m_AssetServerURL);
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index a0cac96..7019096 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1024,7 +1024,7 @@ namespace OpenSim.Framework
1024 { 1024 {
1025 byte[] hash = ComputeMD5Hash( data + salt ); 1025 byte[] hash = ComputeMD5Hash( data + salt );
1026 1026
1027 string s = BitConverter.ToString(hash); 1027 //string s = BitConverter.ToString(hash);
1028 1028
1029 Guid guid = new Guid( hash ); 1029 Guid guid = new Guid( hash );
1030 1030