diff options
author | Jeff Ames | 2008-05-16 01:22:11 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-16 01:22:11 +0000 |
commit | 65c5efe43b68700bad94076d4cd421160203c5de (patch) | |
tree | 589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Grid/InventoryServer/Main.cs | |
parent | Thank you very much, mjm for : (diff) | |
download | opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.zip opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2 opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/InventoryServer/Main.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index 2279191..b7c46c2 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.InventoryServer | |||
41 | public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback | 41 | public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | private InventoryConfig m_config; | 45 | private InventoryConfig m_config; |
46 | private GridInventoryService m_inventoryService; | 46 | private GridInventoryService m_inventoryService; |
47 | 47 | ||
@@ -73,7 +73,7 @@ namespace OpenSim.Grid.InventoryServer | |||
73 | m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); | 73 | m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); |
74 | 74 | ||
75 | m_log.Info("[" + LogName + "]: Starting HTTP server ..."); | 75 | m_log.Info("[" + LogName + "]: Starting HTTP server ..."); |
76 | 76 | ||
77 | m_httpServer = new BaseHttpServer(m_config.HttpPort); | 77 | m_httpServer = new BaseHttpServer(m_config.HttpPort); |
78 | AddHttpHandlers(); | 78 | AddHttpHandlers(); |
79 | m_httpServer.Start(); | 79 | m_httpServer.Start(); |
@@ -86,11 +86,11 @@ namespace OpenSim.Grid.InventoryServer | |||
86 | m_httpServer.AddStreamHandler( | 86 | m_httpServer.AddStreamHandler( |
87 | new RestDeserialisehandler<Guid, InventoryCollection>( | 87 | new RestDeserialisehandler<Guid, InventoryCollection>( |
88 | "POST", "/GetInventory/", m_inventoryService.GetUserInventory)); | 88 | "POST", "/GetInventory/", m_inventoryService.GetUserInventory)); |
89 | 89 | ||
90 | m_httpServer.AddStreamHandler( | 90 | m_httpServer.AddStreamHandler( |
91 | new RestDeserialisehandler<Guid, bool>( | 91 | new RestDeserialisehandler<Guid, bool>( |
92 | "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory)); | 92 | "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory)); |
93 | 93 | ||
94 | m_httpServer.AddStreamHandler( | 94 | m_httpServer.AddStreamHandler( |
95 | new RestDeserialisehandler<InventoryFolderBase, bool>( | 95 | new RestDeserialisehandler<InventoryFolderBase, bool>( |
96 | "POST", "/NewFolder/", m_inventoryService.AddFolder)); | 96 | "POST", "/NewFolder/", m_inventoryService.AddFolder)); |
@@ -98,15 +98,15 @@ namespace OpenSim.Grid.InventoryServer | |||
98 | m_httpServer.AddStreamHandler( | 98 | m_httpServer.AddStreamHandler( |
99 | new RestDeserialisehandler<InventoryFolderBase, bool>( | 99 | new RestDeserialisehandler<InventoryFolderBase, bool>( |
100 | "POST", "/MoveFolder/", m_inventoryService.MoveFolder)); | 100 | "POST", "/MoveFolder/", m_inventoryService.MoveFolder)); |
101 | 101 | ||
102 | m_httpServer.AddStreamHandler( | 102 | m_httpServer.AddStreamHandler( |
103 | new RestDeserialisehandler<InventoryFolderBase, bool>( | 103 | new RestDeserialisehandler<InventoryFolderBase, bool>( |
104 | "POST", "/PurgeFolder/", m_inventoryService.PurgeFolder)); | 104 | "POST", "/PurgeFolder/", m_inventoryService.PurgeFolder)); |
105 | 105 | ||
106 | m_httpServer.AddStreamHandler( | 106 | m_httpServer.AddStreamHandler( |
107 | new RestDeserialisehandler<InventoryItemBase, bool>( | 107 | new RestDeserialisehandler<InventoryItemBase, bool>( |
108 | "POST", "/NewItem/", m_inventoryService.AddItem)); | 108 | "POST", "/NewItem/", m_inventoryService.AddItem)); |
109 | 109 | ||
110 | m_httpServer.AddStreamHandler( | 110 | m_httpServer.AddStreamHandler( |
111 | new RestDeserialisehandler<InventoryItemBase, bool>( | 111 | new RestDeserialisehandler<InventoryItemBase, bool>( |
112 | "POST", "/DeleteItem/", m_inventoryService.DeleteItem)); | 112 | "POST", "/DeleteItem/", m_inventoryService.DeleteItem)); |
@@ -134,7 +134,7 @@ namespace OpenSim.Grid.InventoryServer | |||
134 | public override void RunCmd(string cmd, string[] cmdparams) | 134 | public override void RunCmd(string cmd, string[] cmdparams) |
135 | { | 135 | { |
136 | base.RunCmd(cmd, cmdparams); | 136 | base.RunCmd(cmd, cmdparams); |
137 | 137 | ||
138 | switch (cmd) | 138 | switch (cmd) |
139 | { | 139 | { |
140 | case "add-user": | 140 | case "add-user": |