diff options
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index 941cc30..1281a44 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | |||
@@ -42,8 +42,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
42 | m_gridService = gridInterComms; | 42 | m_gridService = gridInterComms; |
43 | m_interRegion = gridInterComms; | 43 | m_interRegion = gridInterComms; |
44 | 44 | ||
45 | m_inventoryService = new OGS1InventoryService(); | 45 | m_inventoryService = new OGS1InventoryService(serversInfo.InventoryURL); |
46 | m_userService = new OGS1UserServices(this); | 46 | m_userService = new OGS1UserServices(this); |
47 | } | 47 | } |
48 | } | 48 | } |
49 | } \ No newline at end of file | 49 | } |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 49fdee9..85df353 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -25,7 +25,9 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | using System; | |
29 | using System.IO; | ||
30 | using System.Xml.Serialization; | ||
29 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
30 | using libsecondlife; | 32 | using libsecondlife; |
31 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
@@ -36,8 +38,11 @@ namespace OpenSim.Region.Communications.OGS1 | |||
36 | { | 38 | { |
37 | public class OGS1InventoryService : IInventoryServices | 39 | public class OGS1InventoryService : IInventoryServices |
38 | { | 40 | { |
39 | public OGS1InventoryService() | 41 | string _inventoryServerUrl; |
42 | |||
43 | public OGS1InventoryService(string inventoryServerUrl) | ||
40 | { | 44 | { |
45 | _inventoryServerUrl = inventoryServerUrl; | ||
41 | } | 46 | } |
42 | 47 | ||
43 | #region IInventoryServices Members | 48 | #region IInventoryServices Members |
@@ -45,6 +50,19 @@ namespace OpenSim.Region.Communications.OGS1 | |||
45 | public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, | 50 | public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, |
46 | InventoryItemInfo itemCallBack) | 51 | InventoryItemInfo itemCallBack) |
47 | { | 52 | { |
53 | //TODO! Uncomment when all is done | ||
54 | //SerializableInventory userInventory = null; | ||
55 | |||
56 | //RestClient inventoryServer = new RestClient(_inventoryServerUrl); | ||
57 | //inventoryServer.AddResourcePath("inventory"); | ||
58 | //inventoryServer.AddResourcePath("user"); | ||
59 | //inventoryServer.AddResourcePath(userID.ToStringHyphenated()); | ||
60 | |||
61 | //using (Stream userInventoryStream = inventoryServer.Request()) | ||
62 | //{ | ||
63 | // XmlSerializer x = new XmlSerializer(typeof(SerializableInventory)); | ||
64 | // userInventory = (SerializableInventory)x.Deserialize(userInventoryStream); | ||
65 | //} | ||
48 | } | 66 | } |
49 | 67 | ||
50 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder) | 68 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder) |
@@ -70,4 +88,4 @@ namespace OpenSim.Region.Communications.OGS1 | |||
70 | 88 | ||
71 | #endregion | 89 | #endregion |
72 | } | 90 | } |
73 | } \ No newline at end of file | 91 | } |