aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs14
2 files changed, 7 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 4ddd9ea..eed21a4 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -58,12 +58,10 @@ namespace OpenSim.Region.Communications.Local
58 58
59 LocalInventoryService inventoryService = new LocalInventoryService(); 59 LocalInventoryService inventoryService = new LocalInventoryService();
60 inventoryService.AddPlugin(m_settings.InventoryPlugin); 60 inventoryService.AddPlugin(m_settings.InventoryPlugin);
61
62 m_inventoryService = inventoryService; 61 m_inventoryService = inventoryService;
63 62
64 LocalUserServices userService = new LocalUserServices(this, serversInfo); 63 LocalUserServices userService = new LocalUserServices(this, serversInfo);
65 userService.AddPlugin(m_settings.UserDatabasePlugin); 64 userService.AddPlugin(m_settings.UserDatabasePlugin);
66
67 m_userService = userService; 65 m_userService = userService;
68 66
69 InstanceServices = new LocalBackEndServices(); 67 InstanceServices = new LocalBackEndServices();
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index d5dbc46..9a113ff 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -16,35 +16,35 @@ namespace OpenSim.Region.Communications.OGS1
16 } 16 }
17 17
18 #region IInventoryServices Members 18 #region IInventoryServices Members
19 19
20 public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) 20 public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
21 { 21 {
22 throw new Exception("The method or operation is not implemented."); 22
23 } 23 }
24 24
25 public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) 25 public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
26 { 26 {
27 throw new Exception("The method or operation is not implemented."); 27
28 } 28 }
29 29
30 public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) 30 public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
31 { 31 {
32 throw new Exception("The method or operation is not implemented."); 32
33 } 33 }
34 34
35 public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) 35 public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
36 { 36 {
37 throw new Exception("The method or operation is not implemented."); 37
38 } 38 }
39 39
40 public void CreateNewUserInventory(LLUUID user) 40 public void CreateNewUserInventory(LLUUID user)
41 { 41 {
42 throw new Exception("The method or operation is not implemented."); 42
43 } 43 }
44 44
45 public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID) 45 public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
46 { 46 {
47 throw new Exception("The method or operation is not implemented."); 47 return new List<InventoryFolderBase>();
48 } 48 }
49 49
50 #endregion 50 #endregion