diff options
author | Mike Mazur | 2009-02-03 05:20:26 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-03 05:20:26 +0000 |
commit | 9377c6f2b28c75a093fa554d64e0d63e6bdf2fa5 (patch) | |
tree | 8dbd671990b4d6c5a40d369b0d026df8851b3e1f /OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | |
parent | - move IAssetDataPlugin from OpenSim/Framework/IAssetProvider.cs to (diff) | |
download | opensim-SC_OLD-9377c6f2b28c75a093fa554d64e0d63e6bdf2fa5.zip opensim-SC_OLD-9377c6f2b28c75a093fa554d64e0d63e6bdf2fa5.tar.gz opensim-SC_OLD-9377c6f2b28c75a093fa554d64e0d63e6bdf2fa5.tar.bz2 opensim-SC_OLD-9377c6f2b28c75a093fa554d64e0d63e6bdf2fa5.tar.xz |
- move OpenSim/Framework/IInventoryData.cs to
OpenSim/Data/IInventoryData.cs
- trim trailing whitespace
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index 1663ac1..566d8d2 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | |||
@@ -30,6 +30,7 @@ using OpenSim.Framework.Communications; | |||
30 | using OpenSim.Framework.Communications.Cache; | 30 | using OpenSim.Framework.Communications.Cache; |
31 | using OpenSim.Framework.Servers; | 31 | using OpenSim.Framework.Servers; |
32 | using OpenSim.Region.Communications.Local; | 32 | using OpenSim.Region.Communications.Local; |
33 | using OpenSim.Data; | ||
33 | 34 | ||
34 | namespace OpenSim.Tests.Common.Mock | 35 | namespace OpenSim.Tests.Common.Mock |
35 | { | 36 | { |
@@ -40,36 +41,36 @@ namespace OpenSim.Tests.Common.Mock | |||
40 | get { return m_userDataPlugin; } | 41 | get { return m_userDataPlugin; } |
41 | } | 42 | } |
42 | private IUserDataPlugin m_userDataPlugin; | 43 | private IUserDataPlugin m_userDataPlugin; |
43 | 44 | ||
44 | public IInventoryDataPlugin InventoryDataPlugin | 45 | public IInventoryDataPlugin InventoryDataPlugin |
45 | { | 46 | { |
46 | get { return m_inventoryDataPlugin; } | 47 | get { return m_inventoryDataPlugin; } |
47 | } | 48 | } |
48 | private IInventoryDataPlugin m_inventoryDataPlugin; | 49 | private IInventoryDataPlugin m_inventoryDataPlugin; |
49 | 50 | ||
50 | public TestCommunicationsManager() | 51 | public TestCommunicationsManager() |
51 | : this(null) | 52 | : this(null) |
52 | { | 53 | { |
53 | } | 54 | } |
54 | 55 | ||
55 | public TestCommunicationsManager(NetworkServersInfo serversInfo) | 56 | public TestCommunicationsManager(NetworkServersInfo serversInfo) |
56 | : base(serversInfo, new BaseHttpServer(666), null, false, null) | 57 | : base(serversInfo, new BaseHttpServer(666), null, false, null) |
57 | { | 58 | { |
58 | m_userDataPlugin = new TestUserDataPlugin(); | 59 | m_userDataPlugin = new TestUserDataPlugin(); |
59 | m_inventoryDataPlugin = new TestInventoryDataPlugin(); | 60 | m_inventoryDataPlugin = new TestInventoryDataPlugin(); |
60 | 61 | ||
61 | LocalInventoryService lis = new LocalInventoryService(); | 62 | LocalInventoryService lis = new LocalInventoryService(); |
62 | lis.AddPlugin(m_inventoryDataPlugin); | 63 | lis.AddPlugin(m_inventoryDataPlugin); |
63 | m_interServiceInventoryService = lis; | 64 | m_interServiceInventoryService = lis; |
64 | AddInventoryService(lis); | 65 | AddInventoryService(lis); |
65 | 66 | ||
66 | LocalUserServices lus = new LocalUserServices(991, 992, lis); | 67 | LocalUserServices lus = new LocalUserServices(991, 992, lis); |
67 | lus.AddPlugin(m_userDataPlugin); | 68 | lus.AddPlugin(m_userDataPlugin); |
68 | m_userService = lus; | 69 | m_userService = lus; |
69 | m_userAdminService = lus; | 70 | m_userAdminService = lus; |
70 | 71 | ||
71 | LocalBackEndServices gs = new LocalBackEndServices(); | 72 | LocalBackEndServices gs = new LocalBackEndServices(); |
72 | m_gridService = gs; | 73 | m_gridService = gs; |
73 | m_interRegion = gs; | 74 | m_interRegion = gs; |
74 | } | 75 | } |
75 | } | 76 | } |