mirror of
https://github.com/opensim/opensim.git
synced 2026-08-10 03:06:05 +08:00
Merged
This commit is contained in:
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
/// <param name="rot"></param>
|
||||
/// <param name="attachPos"></param>
|
||||
/// <param name="silent"></param>
|
||||
/// <returns>true if the object was successfully attached, false otherwise</returns>
|
||||
/// <returns>true if the object was successfully attached, false otherwise</returns>
|
||||
bool AttachObject(
|
||||
IClientAPI remoteClient, SceneObjectGroup grp, uint AttachmentPt, bool silent);
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
/// Get a group
|
||||
/// </summary>
|
||||
/// <param name="GroupID">ID of the group</param>
|
||||
/// <returns>The group's data. Null if there is no such group.</returns>
|
||||
/// <returns>The group's data. Null if there is no such group.</returns>
|
||||
GroupRecord GetGroupRecord(UUID GroupID);
|
||||
|
||||
void ActivateGroup(IClientAPI remoteClient, UUID groupID);
|
||||
@@ -74,14 +74,14 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
List<GroupRolesData> GroupRoleDataRequest(IClientAPI remoteClient, UUID groupID);
|
||||
List<GroupRoleMembersData> GroupRoleMembersRequest(IClientAPI remoteClient, UUID groupID);
|
||||
GroupProfileData GroupProfileRequest(IClientAPI remoteClient, UUID groupID);
|
||||
GroupMembershipData[] GetMembershipData(UUID UserID);
|
||||
GroupMembershipData[] GetMembershipData(UUID UserID);
|
||||
GroupMembershipData GetMembershipData(UUID GroupID, UUID UserID);
|
||||
|
||||
void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish);
|
||||
|
||||
void SetGroupAcceptNotices(IClientAPI remoteClient, UUID groupID, bool acceptNotices, bool listInProfile);
|
||||
|
||||
void GroupTitleUpdate(IClientAPI remoteClient, UUID GroupID, UUID TitleRoleID);
|
||||
void GroupTitleUpdate(IClientAPI remoteClient, UUID GroupID, UUID TitleRoleID);
|
||||
|
||||
GroupNoticeData[] GroupNoticesListRequest(IClientAPI remoteClient, UUID GroupID);
|
||||
string GetGroupTitle(UUID avatarID);
|
||||
|
||||
@@ -43,14 +43,14 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
/// <param name="reportedException">Contains the exception generated if the save did not succeed</param>
|
||||
public delegate void InventoryArchiveSaved(
|
||||
Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, Exception reportedException);
|
||||
|
||||
|
||||
public interface IInventoryArchiverModule
|
||||
{
|
||||
/// <summary>
|
||||
/// Fired when an archive inventory save has been completed.
|
||||
/// </summary>
|
||||
event InventoryArchiveSaved OnInventoryArchiveSaved;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Dearchive a user's inventory folder from the given stream
|
||||
/// </summary>
|
||||
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
/// <param name="loadStream">The stream from which the inventory archive will be loaded</param>
|
||||
/// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
|
||||
bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Dearchive a user's inventory folder from the given stream
|
||||
/// </summary>
|
||||
@@ -72,8 +72,8 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
/// the loaded IAR with existing folders where possible.</param>
|
||||
/// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
|
||||
bool DearchiveInventory(
|
||||
string firstName, string lastName, string invPath, string pass, Stream loadStream,
|
||||
Dictionary<string, object> options);
|
||||
string firstName, string lastName, string invPath, string pass, Stream loadStream,
|
||||
Dictionary<string, object> options);
|
||||
|
||||
/// <summary>
|
||||
/// Archive a user's inventory folder to the given stream
|
||||
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
/// <param name="saveStream">The stream to which the inventory archive will be saved</param>
|
||||
/// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
|
||||
bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Archive a user's inventory folder to the given stream
|
||||
/// </summary>
|
||||
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
/// <param name="options">Archiving options. Currently, there are none.</param>
|
||||
/// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
|
||||
bool ArchiveInventory(
|
||||
Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream,
|
||||
Dictionary<string, object> options);
|
||||
Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream,
|
||||
Dictionary<string, object> options);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,5 +63,5 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
/// <param name="part"></param>
|
||||
/// <param name="face">/param>
|
||||
void ClearMediaEntry(SceneObjectPart part, int face);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -31,7 +31,7 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// Generate a map tile for the scene. a terrain texture for this scene
|
||||
/// </summary>
|
||||
/// </summary>
|
||||
void GenerateMaptile();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user