diff options
Diffstat (limited to 'OpenSim/Region')
4 files changed, 41 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index 35c2c8c..6ba024a 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -47,5 +47,10 @@ namespace OpenSim.Region.Communications.Local | |||
47 | } | 47 | } |
48 | } | 48 | } |
49 | } | 49 | } |
50 | |||
51 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) | ||
52 | { | ||
53 | this.AddFolder(folder); | ||
54 | } | ||
50 | } | 55 | } |
51 | } | 56 | } |
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index 47d3148..af239f7 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | |||
@@ -8,12 +8,17 @@ namespace OpenSim.Region.Communications.OGS1 | |||
8 | { | 8 | { |
9 | public class CommunicationsOGS1 : CommunicationsManager | 9 | public class CommunicationsOGS1 : CommunicationsManager |
10 | { | 10 | { |
11 | 11 | public OGS1InventoryService InvenService; | |
12 | |||
12 | public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache) | 13 | public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache) |
13 | { | 14 | { |
14 | OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); | 15 | OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); |
15 | GridServer = gridInterComms; | 16 | GridServer = gridInterComms; |
16 | InterRegion = gridInterComms; | 17 | InterRegion = gridInterComms; |
18 | |||
19 | InvenService = new OGS1InventoryService(); | ||
20 | InventoryServer = InvenService; | ||
21 | |||
17 | UserServer = new OGS1UserServices(this); | 22 | UserServer = new OGS1UserServices(this); |
18 | } | 23 | } |
19 | } | 24 | } |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs new file mode 100644 index 0000000..e8355c6 --- /dev/null +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -0,0 +1,28 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using libsecondlife; | ||
4 | using OpenSim.Framework.Communications; | ||
5 | using OpenSim.Framework.Data; | ||
6 | using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder; | ||
7 | |||
8 | namespace OpenSim.Region.Communications.OGS1 | ||
9 | { | ||
10 | public class OGS1InventoryService : IInventoryServices | ||
11 | { | ||
12 | |||
13 | public OGS1InventoryService() | ||
14 | { | ||
15 | |||
16 | } | ||
17 | |||
18 | public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) | ||
19 | { | ||
20 | |||
21 | } | ||
22 | |||
23 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) | ||
24 | { | ||
25 | |||
26 | } | ||
27 | } | ||
28 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f24def2..5123048 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -564,7 +564,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
564 | m_estateManager.sendRegionHandshake(client); | 564 | m_estateManager.sendRegionHandshake(client); |
565 | CreateAndAddScenePresence(client); | 565 | CreateAndAddScenePresence(client); |
566 | m_LandManager.sendParcelOverlay(client); | 566 | m_LandManager.sendParcelOverlay(client); |
567 | //commsManager.UserProfiles.AddNewUser(client.AgentId); | 567 | commsManager.UserProfiles.AddNewUser(client.AgentId); |
568 | } | 568 | } |
569 | 569 | ||
570 | protected virtual void SubscribeToClientEvents(IClientAPI client) | 570 | protected virtual void SubscribeToClientEvents(IClientAPI client) |
@@ -609,7 +609,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
609 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); | 609 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); |
610 | 610 | ||
611 | //client.OnCreateNewInventoryItem += CreateNewInventoryItem; | 611 | //client.OnCreateNewInventoryItem += CreateNewInventoryItem; |
612 | //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; | 612 | client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; |
613 | client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; | 613 | client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; |
614 | client.OnRequestTaskInventory += RequestTaskInventory; | 614 | client.OnRequestTaskInventory += RequestTaskInventory; |
615 | 615 | ||