mirror of
https://github.com/opensim/opensim.git
synced 2026-05-16 11:46:04 +08:00
* You may also need to clear your cache before seeing any effect. * These fixes may or may not affect inventory on the RC client. * These fixes should make non-root folders work better, stop inventory failure on first login, allow trash to be emptied and make texture picker in object edit view work properly * Fixes are 1) make initial root folder request wait for async inventory delivery, 2) deliver all folders in the initial login skeleton, not just the root child ones and 3) deal with situations where we receive child folders from the inventory service before their parent is received.
144 lines
5.6 KiB
C#
144 lines
5.6 KiB
C#
/*
|
|
* Copyright (c) Contributors, http://opensimulator.org/
|
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of the OpenSim Project nor the
|
|
* names of its contributors may be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using libsecondlife;
|
|
using OpenSim.Framework;
|
|
using OpenSim.Framework.Console;
|
|
using OpenSim.Framework.Servers;
|
|
|
|
namespace OpenSim.Grid.InventoryServer
|
|
{
|
|
public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback
|
|
{
|
|
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
|
|
|
private InventoryManager m_inventoryManager;
|
|
private InventoryConfig m_config;
|
|
private GridInventoryService m_inventoryService;
|
|
|
|
public const string LogName = "INVENTORY";
|
|
|
|
[STAThread]
|
|
public static void Main(string[] args)
|
|
{
|
|
log4net.Config.XmlConfigurator.Configure();
|
|
|
|
OpenInventory_Main theServer = new OpenInventory_Main();
|
|
theServer.Startup();
|
|
|
|
theServer.Work();
|
|
}
|
|
|
|
public OpenInventory_Main()
|
|
{
|
|
m_console = new ConsoleBase(LogName, this);
|
|
MainConsole.Instance = m_console;
|
|
}
|
|
|
|
public void Startup()
|
|
{
|
|
m_log.Info("Initialising inventory manager...");
|
|
m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
|
|
|
|
m_inventoryService = new GridInventoryService();
|
|
// m_inventoryManager = new InventoryManager();
|
|
m_inventoryService.AddPlugin(m_config.DatabaseProvider);
|
|
|
|
m_log.Info("[" + LogName + "]: Starting HTTP server ...");
|
|
|
|
m_httpServer = new BaseHttpServer(m_config.HttpPort);
|
|
AddHttpHandlers();
|
|
m_httpServer.Start();
|
|
|
|
m_log.Info("[" + LogName + "]: Started HTTP server");
|
|
}
|
|
|
|
protected void AddHttpHandlers()
|
|
{
|
|
m_httpServer.AddStreamHandler(
|
|
new RestDeserialisehandler<Guid, InventoryCollection>(
|
|
"POST", "/GetInventory/", m_inventoryService.GetUserInventory));
|
|
|
|
m_httpServer.AddStreamHandler(
|
|
new RestDeserialisehandler<Guid, bool>(
|
|
"POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory));
|
|
|
|
m_httpServer.AddStreamHandler(
|
|
new RestDeserialisehandler<InventoryFolderBase, bool>(
|
|
"POST", "/NewFolder/", m_inventoryService.AddInventoryFolder));
|
|
|
|
m_httpServer.AddStreamHandler(
|
|
new RestDeserialisehandler<InventoryFolderBase, bool>(
|
|
"POST", "/MoveFolder/", m_inventoryService.MoveInventoryFolder));
|
|
|
|
m_httpServer.AddStreamHandler(
|
|
new RestDeserialisehandler<InventoryItemBase, bool>(
|
|
"POST", "/NewItem/", m_inventoryService.AddInventoryItem));
|
|
|
|
m_httpServer.AddStreamHandler(
|
|
new RestDeserialisehandler<InventoryItemBase, bool>(
|
|
"POST", "/DeleteItem/", m_inventoryService.DeleteInvItem));
|
|
|
|
m_httpServer.AddStreamHandler(
|
|
new RestDeserialisehandler<Guid, List<InventoryFolderBase>>
|
|
("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton));
|
|
|
|
// httpServer.AddStreamHandler(new InventoryManager.GetInventory(m_inventoryManager));
|
|
}
|
|
|
|
private void Work()
|
|
{
|
|
m_console.Notice("Enter help for a list of commands\n");
|
|
|
|
while (true)
|
|
{
|
|
m_console.Prompt();
|
|
}
|
|
}
|
|
|
|
public override void RunCmd(string cmd, string[] cmdparams)
|
|
{
|
|
base.RunCmd(cmd, cmdparams);
|
|
|
|
switch (cmd)
|
|
{
|
|
case "quit":
|
|
case "add-user":
|
|
m_inventoryService.CreateUsersInventory(LLUUID.Random().UUID);
|
|
break;
|
|
case "shutdown":
|
|
m_console.Close();
|
|
Environment.Exit(0);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|