aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs67
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
2 files changed, 69 insertions, 2 deletions
diff --git a/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs
new file mode 100755
index 0000000..92a6ad8
--- /dev/null
+++ b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs
@@ -0,0 +1,67 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using libsecondlife;
31using OpenSim.Framework;
32using OpenSim.Framework.Communications;
33using OpenSim.Framework.Servers;
34
35namespace OpenSim.Grid.Communications.OGS1
36{
37 /// <summary>
38 /// OGS1 implementation of the inter-service inventory service
39 /// </summary>
40 public class OGS1InterServiceInventoryService : IInterServiceInventoryServices
41 {
42 protected string m_inventoryServerUrl;
43
44 public OGS1InterServiceInventoryService(string inventoryServerUrl)
45 {
46 m_inventoryServerUrl = inventoryServerUrl;
47 }
48
49 public bool CreateNewUserInventory(LLUUID userId)
50 {
51 return SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
52 "POST", m_inventoryServerUrl + "CreateInventory/", userId.UUID);
53 }
54
55 /// <summary>
56 /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
57 /// </summary>
58 /// <param name="userId"></param>
59 /// <returns></returns>
60 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
61 {
62 //m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!");
63
64 return new List<InventoryFolderBase>();
65 }
66 }
67}
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 4b4292d..6e970d5 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Communications.Cache;
39using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
40using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
42using OpenSim.Region.Communications.OGS1; 42using OpenSim.Grid.Communications.OGS1;
43 43
44namespace OpenSim.Grid.UserServer 44namespace OpenSim.Grid.UserServer
45{ 45{
@@ -103,7 +103,7 @@ namespace OpenSim.Grid.UserServer
103 m_loginService = new UserLoginService( 103 m_loginService = new UserLoginService(
104 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); 104 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
105 105
106 m_interServiceInventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl); 106 m_interServiceInventoryService = new OGS1InterServiceInventoryService(m_userManager._config.InventoryUrl);
107 107
108 m_messagesService = new MessageServersConnector(); 108 m_messagesService = new MessageServersConnector();
109 109