Merge branch 'master' of /var/git/opensim/
commit
6f3fbca5a3
|
@ -34,8 +34,20 @@ using OpenSim.Services.Interfaces;
|
||||||
|
|
||||||
namespace OpenSim.Framework.Serialization.External
|
namespace OpenSim.Framework.Serialization.External
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Utilities for manipulating external representations of data structures in OpenSim
|
||||||
|
/// </summary>
|
||||||
public class ExternalRepresentationUtils
|
public class ExternalRepresentationUtils
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Takes a XML representation of a SceneObjectPart and returns another XML representation
|
||||||
|
/// with creator data added to it.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="xml">The SceneObjectPart represented in XML2</param>
|
||||||
|
/// <param name="profileURL">The URL of the profile service for the creator</param>
|
||||||
|
/// <param name="userService">The service for retrieving user account information</param>
|
||||||
|
/// <param name="scopeID">The scope of the user account information (Grid ID)</param>
|
||||||
|
/// <returns>The SceneObjectPart represented in XML2</returns>
|
||||||
public static string RewriteSOP(string xml, string profileURL, IUserAccountService userService, UUID scopeID)
|
public static string RewriteSOP(string xml, string profileURL, IUserAccountService userService, UUID scopeID)
|
||||||
{
|
{
|
||||||
if (xml == string.Empty || profileURL == string.Empty || userService == null)
|
if (xml == string.Empty || profileURL == string.Empty || userService == null)
|
||||||
|
|
|
@ -449,7 +449,10 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public string CreatorData // = <profile url>;<name>
|
/// <summary>
|
||||||
|
/// Data about the creator in the form profile_url;name
|
||||||
|
/// </summary>
|
||||||
|
public string CreatorData
|
||||||
{
|
{
|
||||||
get { return m_creatorData; }
|
get { return m_creatorData; }
|
||||||
set { m_creatorData = value; }
|
set { m_creatorData = value; }
|
||||||
|
|
|
@ -42,6 +42,11 @@ using OpenSim.Services.AssetService;
|
||||||
|
|
||||||
namespace OpenSim.Services.HypergridService
|
namespace OpenSim.Services.HypergridService
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Hypergrid asset service. It serves the IAssetService interface,
|
||||||
|
/// but implements it in ways that are appropriate for inter-grid
|
||||||
|
/// asset exchanges.
|
||||||
|
/// </summary>
|
||||||
public class HGAssetService : OpenSim.Services.AssetService.AssetService, IAssetService
|
public class HGAssetService : OpenSim.Services.AssetService.AssetService, IAssetService
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log =
|
private static readonly ILog m_log =
|
||||||
|
|
|
@ -40,6 +40,13 @@ using OpenSim.Server.Base;
|
||||||
|
|
||||||
namespace OpenSim.Services.HypergridService
|
namespace OpenSim.Services.HypergridService
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Hypergrid inventory service. It serves the IInventoryService interface,
|
||||||
|
/// but implements it in ways that are appropriate for inter-grid
|
||||||
|
/// inventory exchanges. Specifically, it does not performs deletions
|
||||||
|
/// and it responds to GetRootFolder requests with the ID of the
|
||||||
|
/// Suitcase folder, not the actual "My Inventory" folder.
|
||||||
|
/// </summary>
|
||||||
public class HGInventoryService : XInventoryService, IInventoryService
|
public class HGInventoryService : XInventoryService, IInventoryService
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log =
|
private static readonly ILog m_log =
|
||||||
|
|
Loading…
Reference in New Issue