Moved some files around, so that it's easier to share code between standalone and the grid services. Should not affect any functionality.
diva
parent
d857cf1335
commit
08732b65be
|
|
@ -35,71 +35,18 @@ using Nini.Config;
|
|||
using OpenMetaverse;
|
||||
using OpenSim.Data;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications;
|
||||
//using OpenSim.Framework.Communications;
|
||||
using OpenSim.Framework.Communications.Cache;
|
||||
using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
|
||||
using LLSDHelpers = OpenSim.Framework.Communications.Capabilities.LLSDHelpers;
|
||||
using OpenSim.Framework.Servers;
|
||||
using OpenSim.Framework.Servers.Interfaces;
|
||||
using OpenSim.Region.Framework.Interfaces;
|
||||
using OpenSim.Region.Framework.Scenes;
|
||||
using OpenSim.Region.CoreModules.Communications.REST;
|
||||
|
||||
using OpenMetaverse.StructuredData;
|
||||
|
||||
namespace OpenSim.Region.CoreModules.Hypergrid
|
||||
namespace OpenSim.Framework.Communications.Services
|
||||
{
|
||||
public class HGStandaloneInventoryService : IRegionModule
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
private static bool initialized = false;
|
||||
private static bool enabled = false;
|
||||
|
||||
Scene m_scene;
|
||||
//InventoryService m_inventoryService;
|
||||
|
||||
#region IRegionModule interface
|
||||
|
||||
public void Initialise(Scene scene, IConfigSource config)
|
||||
{
|
||||
if (!initialized)
|
||||
{
|
||||
initialized = true;
|
||||
m_scene = scene;
|
||||
|
||||
// This module is only on for standalones
|
||||
enabled = !config.Configs["Startup"].GetBoolean("gridmode", true) && config.Configs["Startup"].GetBoolean("hypergrid", false);
|
||||
}
|
||||
}
|
||||
|
||||
public void PostInitialise()
|
||||
{
|
||||
if (enabled)
|
||||
{
|
||||
m_log.Info("[HGStandaloneInvService]: Starting...");
|
||||
//m_inventoryService = new InventoryService(m_scene);
|
||||
new InventoryService(m_scene);
|
||||
}
|
||||
}
|
||||
|
||||
public void Close()
|
||||
{
|
||||
}
|
||||
|
||||
public string Name
|
||||
{
|
||||
get { return "HGStandaloneInventoryService"; }
|
||||
}
|
||||
|
||||
public bool IsSharedModule
|
||||
{
|
||||
get { return true; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
public class InventoryService
|
||||
public class HGInventoryService
|
||||
{
|
||||
private static readonly ILog m_log
|
||||
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
|
@ -107,24 +54,17 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
private InventoryServiceBase m_inventoryService;
|
||||
private UserManagerBase m_userService;
|
||||
IAssetDataPlugin m_assetProvider;
|
||||
private Scene m_scene;
|
||||
private bool m_doLookup = false;
|
||||
IHttpServer httpServer;
|
||||
private string m_thisInventoryUrl = "http://localhost:9000";
|
||||
private string m_thisHostname = "127.0.0.1";
|
||||
private uint m_thisPort = 9000;
|
||||
|
||||
public bool DoLookup
|
||||
{
|
||||
get { return m_doLookup; }
|
||||
set { m_doLookup = value; }
|
||||
}
|
||||
|
||||
public InventoryService(Scene _m_scene)
|
||||
public HGInventoryService(InventoryServiceBase invService, IAssetDataPlugin assetService, UserManagerBase userService, IHttpServer httpserver, string url)
|
||||
{
|
||||
m_scene = _m_scene;
|
||||
m_inventoryService = (InventoryServiceBase)m_scene.CommsManager.SecureInventoryService;
|
||||
m_userService = (UserManagerBase)m_scene.CommsManager.UserService;
|
||||
m_thisInventoryUrl = m_scene.CommsManager.NetworkServersInfo.InventoryURL;
|
||||
m_inventoryService = invService;
|
||||
m_userService = userService;
|
||||
m_thisInventoryUrl = url;
|
||||
if (!m_thisInventoryUrl.EndsWith("/"))
|
||||
m_thisInventoryUrl += "/";
|
||||
|
||||
|
|
@ -135,130 +75,22 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
m_thisPort = (uint)uri.Port;
|
||||
}
|
||||
|
||||
m_assetProvider = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin;
|
||||
m_assetProvider = assetService;
|
||||
httpServer = httpserver;
|
||||
|
||||
AddHttpHandlers();
|
||||
}
|
||||
|
||||
protected void AddHttpHandlers()
|
||||
public virtual void AddHttpHandlers()
|
||||
{
|
||||
IHttpServer httpServer = m_scene.CommsManager.HttpServer;
|
||||
|
||||
httpServer.AddHTTPHandler("/InvCap/", CapHandler);
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<Guid, InventoryCollection>(
|
||||
"POST", "/GetInventory/", GetUserInventory, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
|
||||
"POST", "/NewFolder/", m_inventoryService.AddFolder, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
|
||||
"POST", "/UpdateFolder/", m_inventoryService.UpdateFolder, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
|
||||
"POST", "/MoveFolder/", m_inventoryService.MoveFolder, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
|
||||
"POST", "/PurgeFolder/", m_inventoryService.PurgeFolder, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
|
||||
"POST", "/NewItem/", m_inventoryService.AddItem, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
|
||||
"POST", "/DeleteItem/", m_inventoryService.DeleteItem, CheckAuthSession));
|
||||
|
||||
//// WARNING: Root folders no longer just delivers the root and immediate child folders (e.g
|
||||
//// system folders such as Objects, Textures), but it now returns the entire inventory skeleton.
|
||||
//// It would have been better to rename this request, but complexities in the BaseHttpServer
|
||||
//// (e.g. any http request not found is automatically treated as an xmlrpc request) make it easier
|
||||
//// to do this for now.
|
||||
//m_scene.AddStreamHandler(
|
||||
// new RestDeserialiseTrustedHandler<Guid, List<InventoryFolderBase>>
|
||||
// ("POST", "/RootFolders/", GetInventorySkeleton, CheckTrustSource));
|
||||
|
||||
//// for persistent active gestures
|
||||
//m_scene.AddStreamHandler(
|
||||
// new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>>
|
||||
// ("POST", "/ActiveGestures/", GetActiveGestures, CheckTrustSource));
|
||||
}
|
||||
|
||||
|
||||
///// <summary>
|
||||
///// Check that the source of an inventory request is one that we trust.
|
||||
///// </summary>
|
||||
///// <param name="peer"></param>
|
||||
///// <returns></returns>
|
||||
//public bool CheckTrustSource(IPEndPoint peer)
|
||||
//{
|
||||
// if (m_doLookup)
|
||||
// {
|
||||
// m_log.InfoFormat("[GRID AGENT INVENTORY]: Checking trusted source {0}", peer);
|
||||
// UriBuilder ub = new UriBuilder(m_userserver_url);
|
||||
// IPAddress[] uaddrs = Dns.GetHostAddresses(ub.Host);
|
||||
// foreach (IPAddress uaddr in uaddrs)
|
||||
// {
|
||||
// if (uaddr.Equals(peer.Address))
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
// }
|
||||
|
||||
// m_log.WarnFormat(
|
||||
// "[GRID AGENT INVENTORY]: Rejecting request since source {0} was not in the list of trusted sources",
|
||||
// peer);
|
||||
|
||||
// return false;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
//}
|
||||
|
||||
/// <summary>
|
||||
/// Check that the source of an inventory request for a particular agent is a current session belonging to
|
||||
/// that agent.
|
||||
/// </summary>
|
||||
/// <param name="session_id"></param>
|
||||
/// <param name="avatar_id"></param>
|
||||
/// <returns></returns>
|
||||
public bool CheckAuthSession(string session_id, string avatar_id)
|
||||
{
|
||||
if (m_doLookup)
|
||||
{
|
||||
m_log.InfoFormat("[HGStandaloneInvService]: checking authed session {0} {1}", session_id, avatar_id);
|
||||
UUID userID = UUID.Zero;
|
||||
UUID sessionID = UUID.Zero;
|
||||
UUID.TryParse(avatar_id, out userID);
|
||||
UUID.TryParse(session_id, out sessionID);
|
||||
if (userID.Equals(UUID.Zero) || sessionID.Equals(UUID.Zero))
|
||||
{
|
||||
m_log.Info("[HGStandaloneInvService]: Invalid user or session id " + avatar_id + "; " + session_id);
|
||||
return false;
|
||||
}
|
||||
UserProfileData userProfile = m_userService.GetUserProfile(userID);
|
||||
if (userProfile != null && userProfile.CurrentAgent != null &&
|
||||
userProfile.CurrentAgent.SessionID == sessionID)
|
||||
{
|
||||
m_log.Info("[HGStandaloneInvService]: user is logged in and session is valid. Authorizing access.");
|
||||
return true;
|
||||
}
|
||||
|
||||
m_log.Warn("[HGStandaloneInvService]: unknown user or session_id, request rejected");
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// In truth, this is not called from the outside, for standalones. I'm just making it
|
||||
// a handler already so that this can be reused for the InventoryServer.
|
||||
|
|
@ -271,7 +103,6 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
return url;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Return a user's entire inventory
|
||||
/// </summary>
|
||||
|
|
@ -281,18 +112,18 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
{
|
||||
UUID userID = new UUID(rawUserID);
|
||||
|
||||
m_log.Info("[HGStandaloneInvService]: Processing request for inventory of " + userID);
|
||||
m_log.Info("[HGStandaloneInvModule]: Processing request for inventory of " + userID);
|
||||
|
||||
// Uncomment me to simulate a slow responding inventory server
|
||||
//Thread.Sleep(16000);
|
||||
|
||||
InventoryCollection invCollection = new InventoryCollection();
|
||||
|
||||
List<InventoryFolderBase> allFolders = ((InventoryServiceBase)m_inventoryService).GetInventorySkeleton(userID);
|
||||
List<InventoryFolderBase> allFolders = m_inventoryService.GetInventorySkeleton(userID);
|
||||
|
||||
if (null == allFolders)
|
||||
{
|
||||
m_log.WarnFormat("[HGStandaloneInvService]: No inventory found for user {0}", rawUserID);
|
||||
m_log.WarnFormat("[HGStandaloneInvModule]: No inventory found for user {0}", rawUserID);
|
||||
|
||||
return invCollection;
|
||||
}
|
||||
|
|
@ -301,7 +132,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
|
||||
foreach (InventoryFolderBase folder in allFolders)
|
||||
{
|
||||
List<InventoryItemBase> items = ((InventoryServiceBase)m_inventoryService).RequestFolderItems(folder.ID);
|
||||
List<InventoryItemBase> items = m_inventoryService.RequestFolderItems(folder.ID);
|
||||
|
||||
if (items != null)
|
||||
{
|
||||
|
|
@ -324,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
// }
|
||||
|
||||
m_log.InfoFormat(
|
||||
"[HGStandaloneInvService]: Sending back inventory response to user {0} containing {1} folders and {2} items",
|
||||
"[HGStandaloneInvModule]: Sending back inventory response to user {0} containing {1} folders and {2} items",
|
||||
invCollection.UserID, invCollection.Folders.Count, invCollection.Items.Count);
|
||||
|
||||
return invCollection;
|
||||
|
|
@ -339,8 +170,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
|
||||
InventoryCollection invCollection = new InventoryCollection();
|
||||
|
||||
List<InventoryItemBase> items = ((InventoryServiceBase)m_inventoryService).RequestFolderItems(fb.ID);
|
||||
List<InventoryFolderBase> folders = ((InventoryServiceBase)m_inventoryService).RequestSubFolders(fb.ID);
|
||||
List<InventoryItemBase> items = m_inventoryService.RequestFolderItems(fb.ID);
|
||||
List<InventoryFolderBase> folders = m_inventoryService.RequestSubFolders(fb.ID);
|
||||
|
||||
invCollection.UserID = fb.Owner;
|
||||
invCollection.Folders = folders;
|
||||
|
|
@ -361,7 +192,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
{
|
||||
m_log.Info("[HGStandaloneInvService]: Get item " + item.ID);
|
||||
|
||||
item = ((InventoryServiceBase)m_inventoryService).GetInventoryItem(item.ID);
|
||||
item = m_inventoryService.GetInventoryItem(item.ID);
|
||||
if (item == null)
|
||||
m_log.Debug("[HGStandaloneInvService]: null item");
|
||||
return item;
|
||||
|
|
@ -483,7 +314,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
{
|
||||
m_log.Info("[HGStandaloneInvService]: Get asset " + item.AssetID + " for item " + item.ID);
|
||||
AssetBase asset = new AssetBase(item.AssetID, "NULL"); // send an asset with no data
|
||||
InventoryItemBase item2 = ((InventoryServiceBase)m_inventoryService).GetInventoryItem(item.ID);
|
||||
InventoryItemBase item2 = m_inventoryService.GetInventoryItem(item.ID);
|
||||
if (item2 == null)
|
||||
{
|
||||
m_log.Debug("[HGStandaloneInvService]: null item");
|
||||
|
|
@ -727,8 +558,6 @@ namespace OpenSim.Region.CoreModules.Hypergrid
|
|||
|
||||
Hashtable RegisterCaps(UUID userID, string authToken)
|
||||
{
|
||||
IHttpServer httpServer = m_scene.CommsManager.HttpServer;
|
||||
|
||||
lock (invCaps)
|
||||
{
|
||||
if (invCaps.ContainsKey(userID))
|
||||
|
|
@ -42,7 +42,7 @@ using log4net;
|
|||
using Nini.Config;
|
||||
using Nwc.XmlRpc;
|
||||
|
||||
namespace OpenSim.Framework.Communications
|
||||
namespace OpenSim.Framework.Communications.Services
|
||||
{
|
||||
public class HGLoginAuthService : LoginService
|
||||
{
|
||||
|
|
@ -36,6 +36,7 @@ using OpenMetaverse;
|
|||
using OpenSim.Data;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications;
|
||||
using OpenSim.Framework.Communications.Services;
|
||||
using OpenSim.Framework.Communications.Cache;
|
||||
using OpenSim.Framework.Communications.Capabilities;
|
||||
using OpenSim.Framework.Servers;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,165 @@
|
|||
/**
|
||||
* Copyright (c) 2008, Contributors. All rights reserved.
|
||||
* 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 Organizations nor the names of Individual
|
||||
* Contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR 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;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using log4net;
|
||||
using Nini.Config;
|
||||
using OpenMetaverse;
|
||||
using OpenSim.Data;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications;
|
||||
using OpenSim.Framework.Communications.Cache;
|
||||
using OpenSim.Framework.Communications.Services;
|
||||
using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
|
||||
using LLSDHelpers = OpenSim.Framework.Communications.Capabilities.LLSDHelpers;
|
||||
using OpenSim.Framework.Servers;
|
||||
using OpenSim.Framework.Servers.Interfaces;
|
||||
using OpenSim.Region.Framework.Interfaces;
|
||||
using OpenSim.Region.Framework.Scenes;
|
||||
using OpenSim.Region.CoreModules.Communications.REST;
|
||||
|
||||
using OpenMetaverse.StructuredData;
|
||||
|
||||
namespace OpenSim.Region.CoreModules.Hypergrid
|
||||
{
|
||||
public class HGStandaloneInventoryModule : IRegionModule
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
private static bool initialized = false;
|
||||
private static bool enabled = false;
|
||||
|
||||
private bool m_doLookup = false;
|
||||
Scene m_scene;
|
||||
HGInventoryService m_inventoryService;
|
||||
InventoryServiceBase m_inventoryBase;
|
||||
|
||||
public bool DoLookup
|
||||
{
|
||||
get { return m_doLookup; }
|
||||
set { m_doLookup = value; }
|
||||
}
|
||||
|
||||
#region IRegionModule interface
|
||||
|
||||
public void Initialise(Scene scene, IConfigSource config)
|
||||
{
|
||||
if (!initialized)
|
||||
{
|
||||
initialized = true;
|
||||
m_scene = scene;
|
||||
|
||||
// This module is only on for standalones
|
||||
enabled = !config.Configs["Startup"].GetBoolean("gridmode", true) && config.Configs["Startup"].GetBoolean("hypergrid", false);
|
||||
}
|
||||
}
|
||||
|
||||
public void PostInitialise()
|
||||
{
|
||||
if (enabled)
|
||||
{
|
||||
m_log.Info("[HGStandaloneInvModule]: Starting...");
|
||||
//m_inventoryService = new InventoryService(m_scene);
|
||||
m_inventoryBase = (InventoryServiceBase)m_scene.CommsManager.SecureInventoryService;
|
||||
|
||||
m_inventoryService = new HGInventoryService(m_inventoryBase,
|
||||
((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin,
|
||||
(UserManagerBase)m_scene.CommsManager.UserService, m_scene.CommsManager.HttpServer,
|
||||
m_scene.CommsManager.NetworkServersInfo.InventoryURL);
|
||||
|
||||
AddHttpHandlers(m_scene.CommsManager.HttpServer);
|
||||
m_inventoryService.AddHttpHandlers();
|
||||
}
|
||||
}
|
||||
|
||||
public void Close()
|
||||
{
|
||||
}
|
||||
|
||||
public string Name
|
||||
{
|
||||
get { return "HGStandaloneInventoryModule"; }
|
||||
}
|
||||
|
||||
public bool IsSharedModule
|
||||
{
|
||||
get { return true; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
public virtual void AddHttpHandlers(IHttpServer httpServer)
|
||||
{
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<Guid, InventoryCollection>(
|
||||
"POST", "/GetInventory/", m_inventoryService.GetUserInventory, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
|
||||
"POST", "/NewFolder/", m_inventoryBase.AddFolder, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
|
||||
"POST", "/UpdateFolder/", m_inventoryBase.UpdateFolder, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
|
||||
"POST", "/MoveFolder/", m_inventoryBase.MoveFolder, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
|
||||
"POST", "/PurgeFolder/", m_inventoryBase.PurgeFolder, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
|
||||
"POST", "/NewItem/", m_inventoryBase.AddItem, CheckAuthSession));
|
||||
|
||||
httpServer.AddStreamHandler(
|
||||
new RestDeserialiseSecureHandler<InventoryItemBase, bool>(
|
||||
"POST", "/DeleteItem/", m_inventoryBase.DeleteItem, CheckAuthSession));
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Check that the source of an inventory request for a particular agent is a current session belonging to
|
||||
/// that agent.
|
||||
/// </summary>
|
||||
/// <param name="session_id"></param>
|
||||
/// <param name="avatar_id"></param>
|
||||
/// <returns></returns>
|
||||
public bool CheckAuthSession(string session_id, string avatar_id)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -36,6 +36,7 @@ using Nini.Config;
|
|||
using OpenMetaverse;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications;
|
||||
using OpenSim.Framework.Communications.Services;
|
||||
using OpenSim.Framework.Communications.Cache;
|
||||
using OpenSim.Framework.Communications.Capabilities;
|
||||
using OpenSim.Framework.Servers.Interfaces;
|
||||
|
|
|
|||
Loading…
Reference in New Issue