diff options
Diffstat (limited to '')
52 files changed, 357 insertions, 171 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs b/OpenSim/Data/MySQL/MySQLMuteListData.cs index c6f531e..a5935a3 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs +++ b/OpenSim/Data/MySQL/MySQLMuteListData.cs | |||
@@ -26,39 +26,42 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using System.Linq; | 31 | using System.Data; |
31 | using System.Text; | ||
32 | using OpenSim.Region.Framework.Scenes; | ||
33 | using System.IO; | ||
34 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | ||
34 | using MySql.Data.MySqlClient; | ||
35 | 35 | ||
36 | namespace OpenSim.Region.Framework.Interfaces | 36 | namespace OpenSim.Data.MySQL |
37 | { | 37 | { |
38 | public interface IRegionCombinerModule | 38 | public class MySqlMuteListData : MySQLGenericTableHandler<MuteData>, IMuteListData |
39 | { | 39 | { |
40 | /// <summary> | 40 | public MySqlMuteListData(string connectionString) |
41 | /// Does the given id belong to the root region of a megaregion? | 41 | : base(connectionString, "MuteList", "MuteListStore") |
42 | /// </summary> | 42 | { |
43 | bool IsRootForMegaregion(UUID regionId); | 43 | } |
44 | 44 | ||
45 | /// <summary> | 45 | public MuteData[] Get(UUID agentID) |
46 | /// Gets the size of megaregion. | 46 | { |
47 | /// </summary> | 47 | MuteData[] data = base.Get("AgentID", agentID.ToString()); |
48 | /// <remarks> | 48 | return data; |
49 | /// Returns size in meters. | 49 | } |
50 | /// Do not rely on this method remaining the same - this area is actively under development. | ||
51 | /// </remarks> | ||
52 | /// <param name="sceneId"> | ||
53 | /// The id of the root region for a megaregion. | ||
54 | /// This may change in the future to allow any region id that makes up a megaregion. | ||
55 | /// Currently, will throw an exception if this does not match a root region. | ||
56 | /// </param> | ||
57 | Vector2 GetSizeOfMegaregion(UUID regionId); | ||
58 | 50 | ||
59 | /// <summary> | 51 | public bool Delete(UUID agentID, UUID muteID, string muteName) |
60 | /// Tests to see of position (relative to the region) is within the megaregion | 52 | { |
61 | /// </summary> | 53 | string cmnd ="delete from MuteList where AgentID = ?AgentID and MuteID = ?MuteID and MuteName = ?MuteName"; |
62 | bool PositionIsInMegaregion(UUID currentRegion, int xx, int yy); | 54 | |
55 | using (MySqlCommand cmd = new MySqlCommand(cmnd)) | ||
56 | { | ||
57 | cmd.Parameters.AddWithValue("?AgentID", agentID.ToString()); | ||
58 | cmd.Parameters.AddWithValue("?MuteID", muteID.ToString()); | ||
59 | cmd.Parameters.AddWithValue("?MuteName", muteName); | ||
60 | |||
61 | if (ExecuteNonQuery(cmd) > 0) | ||
62 | return true; | ||
63 | return false; | ||
64 | } | ||
65 | } | ||
63 | } | 66 | } |
64 | } \ No newline at end of file | 67 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs index 0cc8fb6..b8278d6 100644 --- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs +++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs | |||
@@ -36,10 +36,10 @@ namespace OpenSim.Region.Framework.Interfaces | |||
36 | void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID, | 36 | void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID, |
37 | InventoryItemBase item); | 37 | InventoryItemBase item); |
38 | 38 | ||
39 | void HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID, | 39 | bool HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID, |
40 | uint callbackID, string description, string name, sbyte invType, | 40 | uint callbackID, string description, string name, sbyte invType, |
41 | sbyte type, byte wearableType, uint nextOwnerMask); | 41 | sbyte type, byte wearableType, uint nextOwnerMask); |
42 | 42 | ||
43 | void HandleTaskItemUpdateFromTransaction( | 43 | void HandleTaskItemUpdateFromTransaction( |
44 | IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item); | 44 | IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item); |
45 | 45 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index d9901bd..2f5ff9b 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Xml; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using OpenMetaverse; | 31 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -89,7 +90,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
89 | /// <param name="addToInventory">If true then add object to user inventory</param> | 90 | /// <param name="addToInventory">If true then add object to user inventory</param> |
90 | /// <param name="append">Append to attachment point rather than replace.</param> | 91 | /// <param name="append">Append to attachment point rather than replace.</param> |
91 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 92 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
92 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool addToInventory, bool append); | 93 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, |
94 | bool addToInventory, bool append); | ||
93 | 95 | ||
94 | /// <summary> | 96 | /// <summary> |
95 | /// Rez an attachment from user inventory and change inventory status to match. | 97 | /// Rez an attachment from user inventory and change inventory status to match. |
@@ -98,7 +100,11 @@ namespace OpenSim.Region.Framework.Interfaces | |||
98 | /// <param name="itemID"></param> | 100 | /// <param name="itemID"></param> |
99 | /// <param name="AttachmentPt"></param> | 101 | /// <param name="AttachmentPt"></param> |
100 | /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> | 102 | /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> |
101 | SceneObjectGroup RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt); | 103 | ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt); |
104 | |||
105 | // Same as above, but also load script states from a separate doc | ||
106 | ISceneEntity RezSingleAttachmentFromInventory( | ||
107 | IScenePresence presence, UUID itemID, uint AttachmentPt, XmlDocument doc); | ||
102 | 108 | ||
103 | /// <summary> | 109 | /// <summary> |
104 | /// Rez multiple attachments from a user's inventory | 110 | /// Rez multiple attachments from a user's inventory |
@@ -106,7 +112,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
106 | /// <param name="sp"></param> | 112 | /// <param name="sp"></param> |
107 | /// <param name="rezlist"></param> | 113 | /// <param name="rezlist"></param> |
108 | void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist); | 114 | void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist); |
109 | 115 | ||
110 | /// <summary> | 116 | /// <summary> |
111 | /// Detach the given item to the ground. | 117 | /// Detach the given item to the ground. |
112 | /// </summary> | 118 | /// </summary> |
@@ -129,8 +135,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
129 | /// <param name="sp">/param> | 135 | /// <param name="sp">/param> |
130 | /// <param name="grp">The attachment to detach.</param> | 136 | /// <param name="grp">The attachment to detach.</param> |
131 | void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup grp); | 137 | void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup grp); |
132 | 138 | ||
133 | /// <summary> | ||
134 | /// Update the position of an attachment. | 139 | /// Update the position of an attachment. |
135 | /// </summary> | 140 | /// </summary> |
136 | /// <param name="sog"></param> | 141 | /// <param name="sog"></param> |
diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs index b536a49..4d8409be 100644 --- a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs | |||
@@ -35,6 +35,9 @@ namespace OpenSim.Services.Interfaces | |||
35 | public interface IBakedTextureModule | 35 | public interface IBakedTextureModule |
36 | { | 36 | { |
37 | WearableCacheItem[] Get(UUID id); | 37 | WearableCacheItem[] Get(UUID id); |
38 | void Store(UUID id, WearableCacheItem[] data); | 38 | |
39 | void Store(UUID id); | ||
40 | void Store(UUID id, WearableCacheItem[] WearableCache); | ||
41 | void UpdateMeshAvatar(UUID id); | ||
39 | } | 42 | } |
40 | } | 43 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs b/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs index d1ce4c0..1bbf10e 100644 --- a/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs | |||
@@ -31,7 +31,7 @@ using OpenSim.Framework; | |||
31 | namespace OpenSim.Region.Framework.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | public interface IBuySellModule | 33 | public interface IBuySellModule |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// Try to buy an object | 36 | /// Try to buy an object |
37 | /// </summary> | 37 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs index 522c82d..761b1bb 100644 --- a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs | |||
@@ -40,30 +40,32 @@ namespace OpenSim.Region.Framework.Interfaces | |||
40 | /// </summary> | 40 | /// </summary> |
41 | /// <param name="agentId"></param> | 41 | /// <param name="agentId"></param> |
42 | /// <param name="capsObjectPath"></param> | 42 | /// <param name="capsObjectPath"></param> |
43 | void CreateCaps(UUID agentId); | 43 | void CreateCaps(UUID agentId, uint circuitCode); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Remove the caps handler for a given agent. | 46 | /// Remove the caps handler for a given agent. |
47 | /// </summary> | 47 | /// </summary> |
48 | /// <param name="agentId"></param> | 48 | /// <param name="agentId"></param> |
49 | void RemoveCaps(UUID agentId); | 49 | void RemoveCaps(UUID agentId, uint circuitCode); |
50 | 50 | ||
51 | /// <summary> | 51 | /// <summary> |
52 | /// Will return null if the agent doesn't have a caps handler registered | 52 | /// Will return null if the agent doesn't have a caps handler registered |
53 | /// </summary> | 53 | /// </summary> |
54 | /// <param name="agentId"></param> | 54 | /// <param name="agentId"></param> |
55 | Caps GetCapsForUser(UUID agentId); | 55 | Caps GetCapsForUser(uint circuitCode); |
56 | 56 | ||
57 | void SetAgentCapsSeeds(AgentCircuitData agent); | 57 | void SetAgentCapsSeeds(AgentCircuitData agent); |
58 | 58 | ||
59 | Dictionary<ulong, string> GetChildrenSeeds(UUID agentID); | 59 | Dictionary<ulong, string> GetChildrenSeeds(UUID agentID); |
60 | 60 | ||
61 | string GetChildSeed(UUID agentID, ulong handle); | 61 | string GetChildSeed(UUID agentID, ulong handle); |
62 | 62 | ||
63 | void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds); | 63 | void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds); |
64 | 64 | ||
65 | void DropChildSeed(UUID agentID, ulong handle); | 65 | void DropChildSeed(UUID agentID, ulong handle); |
66 | 66 | ||
67 | string GetCapsPath(UUID agentId); | 67 | string GetCapsPath(UUID agentId); |
68 | |||
69 | void ActivateCaps(uint circuitCode); | ||
68 | } | 70 | } |
69 | } | 71 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/ICloudModule.cs b/OpenSim/Region/Framework/Interfaces/ICloudModule.cs index 54172bd..a73b564 100644 --- a/OpenSim/Region/Framework/Interfaces/ICloudModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICloudModule.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | namespace OpenSim.Region.Framework.Interfaces | 28 | namespace OpenSim.Region.Framework.Interfaces |
29 | { | 29 | { |
30 | public interface ICloudModule | 30 | public interface ICloudModule |
31 | { | 31 | { |
32 | /// <summary> | 32 | /// <summary> |
33 | /// Retrieves the cloud density at the given region coordinates | 33 | /// Retrieves the cloud density at the given region coordinates |
diff --git a/OpenSim/Region/Framework/Interfaces/ICommander.cs b/OpenSim/Region/Framework/Interfaces/ICommander.cs index 6b872c1..5d6428a 100644 --- a/OpenSim/Region/Framework/Interfaces/ICommander.cs +++ b/OpenSim/Region/Framework/Interfaces/ICommander.cs | |||
@@ -40,12 +40,12 @@ namespace OpenSim.Region.Framework.Interfaces | |||
40 | /// Provide general help information about this commander. | 40 | /// Provide general help information about this commander. |
41 | /// </value> | 41 | /// </value> |
42 | string Help { get; } | 42 | string Help { get; } |
43 | 43 | ||
44 | /// <summary> | 44 | /// <summary> |
45 | /// The commands available for this commander | 45 | /// The commands available for this commander |
46 | /// </summary> | 46 | /// </summary> |
47 | Dictionary<string, ICommand> Commands { get; } | 47 | Dictionary<string, ICommand> Commands { get; } |
48 | 48 | ||
49 | void ProcessConsoleCommand(string function, string[] args); | 49 | void ProcessConsoleCommand(string function, string[] args); |
50 | void RegisterCommand(string commandName, ICommand command); | 50 | void RegisterCommand(string commandName, ICommand command); |
51 | void Run(string function, object[] args); | 51 | void Run(string function, object[] args); |
diff --git a/OpenSim/Region/Framework/Interfaces/IDwellModule.cs b/OpenSim/Region/Framework/Interfaces/IDwellModule.cs index db50439..ebef5a4 100644 --- a/OpenSim/Region/Framework/Interfaces/IDwellModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IDwellModule.cs | |||
@@ -33,5 +33,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
33 | public interface IDwellModule | 33 | public interface IDwellModule |
34 | { | 34 | { |
35 | int GetDwell(UUID parcelID); | 35 | int GetDwell(UUID parcelID); |
36 | int GetDwell(LandData land); | ||
36 | } | 37 | } |
37 | } | 38 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicFloaterModule.cs b/OpenSim/Region/Framework/Interfaces/IDynamicFloaterModule.cs index 7684ce3..1ff8fd2 100644 --- a/OpenSim/Region/Framework/Interfaces/IDynamicFloaterModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicFloaterModule.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
36 | 36 | ||
37 | public abstract class FloaterData | 37 | public abstract class FloaterData |
38 | { | 38 | { |
39 | public abstract int Channel { get; } | 39 | public abstract int Channel { get; } |
40 | public abstract string FloaterName { get; set; } | 40 | public abstract string FloaterName { get; set; } |
41 | public virtual string XmlName { get; set; } | 41 | public virtual string XmlName { get; set; } |
42 | public virtual string XmlText { get; set; } | 42 | public virtual string XmlText { get; set; } |
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs b/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs index 08b71e4..4d000b6 100644 --- a/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs | |||
@@ -43,6 +43,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
43 | public enum UserMode : int | 43 | public enum UserMode : int |
44 | { | 44 | { |
45 | Normal = 0, | 45 | Normal = 0, |
46 | RegionManager = 2, | ||
46 | God = 3 | 47 | God = 3 |
47 | } | 48 | } |
48 | 49 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs index 6df5cc2..093ea9c 100644 --- a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs | |||
@@ -44,14 +44,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
44 | /// <param name='isReuseable'></param> | 44 | /// <param name='isReuseable'></param> |
45 | void ReturnData(UUID id, IDynamicTexture texture); | 45 | void ReturnData(UUID id, IDynamicTexture texture); |
46 | 46 | ||
47 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams); | ||
47 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, | 48 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, |
48 | int updateTimer); | 49 | bool SetBlending, byte AlphaValue); |
49 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, | 50 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, |
50 | int updateTimer, bool SetBlending, byte AlphaValue); | 51 | bool SetBlending, int disp, byte AlphaValue, int face); |
51 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, | 52 | |
52 | int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face); | 53 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams); |
53 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams, | ||
54 | int updateTimer); | ||
55 | 54 | ||
56 | /// Apply a dynamically generated texture to all sides of the given prim. The texture is not persisted to the | 55 | /// Apply a dynamically generated texture to all sides of the given prim. The texture is not persisted to the |
57 | /// asset service. | 56 | /// asset service. |
@@ -62,8 +61,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
62 | /// based texture or "image" to create a texture from an image at a particular URL</param> | 61 | /// based texture or "image" to create a texture from an image at a particular URL</param> |
63 | /// <param name="data">The data for the generator</param> | 62 | /// <param name="data">The data for the generator</param> |
64 | /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param> | 63 | /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param> |
65 | /// <param name="updateTimer">If zero, the image is never updated after the first generation. If positive | ||
66 | /// the image is updated at the given interval. Not implemented for </param> | ||
67 | /// <param name="SetBlending"> | 64 | /// <param name="SetBlending"> |
68 | /// If true, the newly generated texture is blended with the appropriate existing ones on the prim | 65 | /// If true, the newly generated texture is blended with the appropriate existing ones on the prim |
69 | /// </param> | 66 | /// </param> |
@@ -76,7 +73,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
76 | /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID | 73 | /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID |
77 | /// </returns> | 74 | /// </returns> |
78 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams, | 75 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams, |
79 | int updateTimer, bool SetBlending, byte AlphaValue); | 76 | bool SetBlending, byte AlphaValue); |
80 | 77 | ||
81 | /// <summary> | 78 | /// <summary> |
82 | /// Apply a dynamically generated texture to the given prim. | 79 | /// Apply a dynamically generated texture to the given prim. |
@@ -87,8 +84,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
87 | /// based texture or "image" to create a texture from an image at a particular URL</param> | 84 | /// based texture or "image" to create a texture from an image at a particular URL</param> |
88 | /// <param name="data">The data for the generator</param> | 85 | /// <param name="data">The data for the generator</param> |
89 | /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param> | 86 | /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param> |
90 | /// <param name="updateTimer">If zero, the image is never updated after the first generation. If positive | ||
91 | /// the image is updated at the given interval. Not implemented for </param> | ||
92 | /// <param name="SetBlending"> | 87 | /// <param name="SetBlending"> |
93 | /// If true, the newly generated texture is blended with the appropriate existing ones on the prim | 88 | /// If true, the newly generated texture is blended with the appropriate existing ones on the prim |
94 | /// </param> | 89 | /// </param> |
@@ -109,10 +104,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
109 | /// to obtain it directly from the SceneObjectPart. For instance, if ALL_SIDES is set then this texture | 104 | /// to obtain it directly from the SceneObjectPart. For instance, if ALL_SIDES is set then this texture |
110 | /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID | 105 | /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID |
111 | /// </returns> | 106 | /// </returns> |
112 | UUID AddDynamicTextureData( | 107 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams, |
113 | UUID simID, UUID primID, string contentType, string data, string extraParams, | 108 | bool SetBlending, int disp, byte AlphaValue, int face); |
114 | int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face); | 109 | |
115 | |||
116 | void GetDrawStringSize(string contentType, string text, string fontName, int fontSize, | 110 | void GetDrawStringSize(string contentType, string text, string fontName, int fontSize, |
117 | out double xSize, out double ySize); | 111 | out double xSize, out double ySize); |
118 | } | 112 | } |
@@ -140,7 +134,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
140 | bool AsyncConvertUrl(UUID id, string url, string extraParams); | 134 | bool AsyncConvertUrl(UUID id, string url, string extraParams); |
141 | bool AsyncConvertData(UUID id, string bodyData, string extraParams); | 135 | bool AsyncConvertData(UUID id, string bodyData, string extraParams); |
142 | 136 | ||
143 | void GetDrawStringSize(string text, string fontName, int fontSize, | 137 | void GetDrawStringSize(string text, string fontName, int fontSize, |
144 | out double xSize, out double ySize); | 138 | out double xSize, out double ySize); |
145 | } | 139 | } |
146 | 140 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs index c39627c..1df6486 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
41 | /// </summary> | 41 | /// </summary> |
42 | /// <returns></returns> | 42 | /// <returns></returns> |
43 | PCode[] CreationCapabilities { get; } | 43 | PCode[] CreationCapabilities { get; } |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Create an entity | 46 | /// Create an entity |
47 | /// </summary> | 47 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index 9ffda51..e7c2428 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |||
@@ -36,8 +36,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
36 | /// <summary> | 36 | /// <summary> |
37 | /// Interface to an entity's (SceneObjectPart's) inventory | 37 | /// Interface to an entity's (SceneObjectPart's) inventory |
38 | /// </summary> | 38 | /// </summary> |
39 | /// | 39 | /// |
40 | /// This is not a finished 1.0 candidate interface | 40 | /// This is not a finished 1.0 candidate interface |
41 | public interface IEntityInventory | 41 | public interface IEntityInventory |
42 | { | 42 | { |
43 | /// <summary> | 43 | /// <summary> |
@@ -48,21 +48,21 @@ namespace OpenSim.Region.Framework.Interfaces | |||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Reset UUIDs for all the items in the prim's inventory. | 49 | /// Reset UUIDs for all the items in the prim's inventory. |
50 | /// </summary> | 50 | /// </summary> |
51 | /// | 51 | /// |
52 | /// This involves either generating | 52 | /// This involves either generating |
53 | /// new ones or setting existing UUIDs to the correct parent UUIDs. | 53 | /// new ones or setting existing UUIDs to the correct parent UUIDs. |
54 | /// | 54 | /// |
55 | /// If this method is called and there are inventory items, then we regard the inventory as having changed. | 55 | /// If this method is called and there are inventory items, then we regard the inventory as having changed. |
56 | /// | 56 | /// |
57 | /// <param name="linkNum">Link number for the part</param> | 57 | /// <param name="linkNum">Link number for the part</param> |
58 | void ResetInventoryIDs(); | 58 | void ResetInventoryIDs(); |
59 | 59 | ||
60 | /// <summary> | 60 | /// <summary> |
61 | /// Reset parent object UUID for all the items in the prim's inventory. | 61 | /// Reset parent object UUID for all the items in the prim's inventory. |
62 | /// </summary> | 62 | /// </summary> |
63 | /// | 63 | /// |
64 | /// If this method is called and there are inventory items, then we regard the inventory as having changed. | 64 | /// If this method is called and there are inventory items, then we regard the inventory as having changed. |
65 | /// | 65 | /// |
66 | /// <param name="linkNum">Link number for the part</param> | 66 | /// <param name="linkNum">Link number for the part</param> |
67 | void ResetObjectID(); | 67 | void ResetObjectID(); |
68 | 68 | ||
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
87 | /// <param name="stateSource"></param> | 87 | /// <param name="stateSource"></param> |
88 | /// <returns>Number of scripts started.</returns> | 88 | /// <returns>Number of scripts started.</returns> |
89 | int CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource); | 89 | int CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource); |
90 | 90 | ||
91 | ArrayList GetScriptErrors(UUID itemID); | 91 | ArrayList GetScriptErrors(UUID itemID); |
92 | void ResumeScripts(); | 92 | void ResumeScripts(); |
93 | 93 | ||
@@ -133,6 +133,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
133 | /// </returns> | 133 | /// </returns> |
134 | bool CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource); | 134 | bool CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource); |
135 | 135 | ||
136 | ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource); | ||
137 | |||
136 | /// <summary> | 138 | /// <summary> |
137 | /// Stop and remove a script which is in this prim's inventory from the scene. | 139 | /// Stop and remove a script which is in this prim's inventory from the scene. |
138 | /// </summary> | 140 | /// </summary> |
@@ -236,15 +238,15 @@ namespace OpenSim.Region.Framework.Interfaces | |||
236 | /// <summary> | 238 | /// <summary> |
237 | /// Get the scene object(s) referenced by an inventory item. | 239 | /// Get the scene object(s) referenced by an inventory item. |
238 | /// </summary> | 240 | /// </summary> |
239 | /// | 241 | /// |
240 | /// This is returned in a 'rez ready' state. That is, name, description, permissions and other details have | 242 | /// This is returned in a 'rez ready' state. That is, name, description, permissions and other details have |
241 | /// been adjusted to reflect the part and item from which it originates. | 243 | /// been adjusted to reflect the part and item from which it originates. |
242 | /// | 244 | /// |
243 | /// <param name="item">Inventory item</param> | 245 | /// <param name="item">Inventory item</param> |
244 | /// <param name="objlist">The scene objects</param> | 246 | /// <param name="objlist">The scene objects</param> |
245 | /// <param name="veclist">Relative offsets for each object</param> | 247 | /// <param name="veclist">Relative offsets for each object</param> |
246 | /// <returns>true = success, false = the scene object asset couldn't be found</returns> | 248 | /// <returns>true = success, false = the scene object asset couldn't be found</returns> |
247 | bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist); | 249 | bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist, out Vector3 bbox, out float offsetHeight); |
248 | 250 | ||
249 | /// <summary> | 251 | /// <summary> |
250 | /// Update an existing inventory item. | 252 | /// Update an existing inventory item. |
@@ -276,6 +278,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
276 | /// <param name="datastore"></param> | 278 | /// <param name="datastore"></param> |
277 | void ProcessInventoryBackup(ISimulationDataService datastore); | 279 | void ProcessInventoryBackup(ISimulationDataService datastore); |
278 | 280 | ||
281 | void AggregateInnerPerms(ref uint owner, ref uint group, ref uint everyone); | ||
282 | |||
279 | uint MaskEffectivePermissions(); | 283 | uint MaskEffectivePermissions(); |
280 | 284 | ||
281 | void ApplyNextOwnerPermissions(); | 285 | void ApplyNextOwnerPermissions(); |
@@ -310,7 +314,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
310 | /// </summary> | 314 | /// </summary> |
311 | /// <returns></returns> | 315 | /// <returns></returns> |
312 | List<UUID> GetInventoryList(); | 316 | List<UUID> GetInventoryList(); |
313 | 317 | ||
314 | /// <summary> | 318 | /// <summary> |
315 | /// Get the xml representing the saved states of scripts in this inventory. | 319 | /// Get the xml representing the saved states of scripts in this inventory. |
316 | /// </summary> | 320 | /// </summary> |
@@ -318,5 +322,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
318 | /// A <see cref="Dictionary`2"/> | 322 | /// A <see cref="Dictionary`2"/> |
319 | /// </returns> | 323 | /// </returns> |
320 | Dictionary<UUID, string> GetScriptStates(); | 324 | Dictionary<UUID, string> GetScriptStates(); |
325 | Dictionary<UUID, string> GetScriptStates(bool oldIDs); | ||
321 | } | 326 | } |
322 | } | 327 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs index d07b15a..1b690ba 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | |||
@@ -36,6 +36,7 @@ using OpenSim.Region.Framework.Scenes; | |||
36 | namespace OpenSim.Region.Framework.Interfaces | 36 | namespace OpenSim.Region.Framework.Interfaces |
37 | { | 37 | { |
38 | public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, EntityTransferContext ctx); | 38 | public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, EntityTransferContext ctx); |
39 | public delegate ScenePresence CrossAsyncDelegate(ScenePresence agent, bool isFlying); | ||
39 | 40 | ||
40 | public interface IEntityTransferModule | 41 | public interface IEntityTransferModule |
41 | { | 42 | { |
@@ -82,7 +83,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
82 | /// </summary> | 83 | /// </summary> |
83 | /// <param name='id'>The agent ID</para></param> | 84 | /// <param name='id'>The agent ID</para></param> |
84 | /// <returns>true if the agent is in the process of being teleported, false otherwise.</returns> | 85 | /// <returns>true if the agent is in the process of being teleported, false otherwise.</returns> |
85 | bool IsInTransit(UUID id); | 86 | bool IsInTransit(UUID id); |
86 | 87 | ||
87 | bool Cross(ScenePresence agent, bool isFlying); | 88 | bool Cross(ScenePresence agent, bool isFlying); |
88 | 89 | ||
@@ -94,11 +95,15 @@ namespace OpenSim.Region.Framework.Interfaces | |||
94 | 95 | ||
95 | GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, EntityTransferContext ctx, | 96 | GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, EntityTransferContext ctx, |
96 | out Vector3 newpos, out string reason); | 97 | out Vector3 newpos, out string reason); |
98 | GridRegion GetObjectDestination(SceneObjectGroup grp, Vector3 targetPosition, out Vector3 newpos); | ||
99 | bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, EntityTransferContext ctx, out string reason); | ||
97 | 100 | ||
98 | void Cross(SceneObjectGroup sog, Vector3 position, bool silent); | 101 | bool CrossPrimGroupIntoNewRegion(GridRegion destination, Vector3 newPosition, SceneObjectGroup grp, bool silent, bool removeScripts); |
99 | 102 | ||
100 | ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, EntityTransferContext ctx); | 103 | ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, EntityTransferContext ctx); |
101 | 104 | ||
105 | bool CrossAgentCreateFarChild(ScenePresence agent, GridRegion neighbourRegion, Vector3 pos, EntityTransferContext ctx); | ||
106 | |||
102 | bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition); | 107 | bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition); |
103 | } | 108 | } |
104 | 109 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs index 461c880..6b8b999 100644 --- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs | |||
@@ -39,6 +39,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
39 | event ChangeDelegate OnRegionInfoChange; | 39 | event ChangeDelegate OnRegionInfoChange; |
40 | event ChangeDelegate OnEstateInfoChange; | 40 | event ChangeDelegate OnEstateInfoChange; |
41 | event MessageDelegate OnEstateMessage; | 41 | event MessageDelegate OnEstateMessage; |
42 | event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest; | ||
43 | event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest; | ||
42 | 44 | ||
43 | uint GetRegionFlags(); | 45 | uint GetRegionFlags(); |
44 | bool IsManager(UUID avatarID); | 46 | bool IsManager(UUID avatarID); |
diff --git a/OpenSim/Region/Framework/Interfaces/IEtcdModule.cs b/OpenSim/Region/Framework/Interfaces/IEtcdModule.cs new file mode 100644 index 0000000..123cb67 --- /dev/null +++ b/OpenSim/Region/Framework/Interfaces/IEtcdModule.cs | |||
@@ -0,0 +1,37 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | |||
30 | public interface IEtcdModule | ||
31 | { | ||
32 | bool Store(string k, string v); | ||
33 | bool Store(string k, string v, int ttl); | ||
34 | string Get(string k); | ||
35 | void Watch(string k, Action<string> callback); | ||
36 | void Delete(string k); | ||
37 | } | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs index dfc269e..7edd75a 100644 --- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |||
@@ -30,6 +30,7 @@ using OpenMetaverse; | |||
30 | using OpenMetaverse.Packets; | 30 | using OpenMetaverse.Packets; |
31 | using OpenMetaverse.Messages.Linden; | 31 | using OpenMetaverse.Messages.Linden; |
32 | using OpenMetaverse.StructuredData; | 32 | using OpenMetaverse.StructuredData; |
33 | using OpenSim.Framework; | ||
33 | 34 | ||
34 | namespace OpenSim.Region.Framework.Interfaces | 35 | namespace OpenSim.Region.Framework.Interfaces |
35 | { | 36 | { |
@@ -38,26 +39,27 @@ namespace OpenSim.Region.Framework.Interfaces | |||
38 | bool Enqueue(OSD o, UUID avatarID); | 39 | bool Enqueue(OSD o, UUID avatarID); |
39 | 40 | ||
40 | // These are required to decouple Scenes from EventQueueHelper | 41 | // These are required to decouple Scenes from EventQueueHelper |
41 | void DisableSimulator(ulong handle, UUID avatarID); | 42 | // void DisableSimulator(ulong handle, UUID avatarID); |
42 | void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY); | 43 | void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY); |
43 | void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, | 44 | void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, |
44 | string capsPath, ulong regionHandle, int regionSizeX, int regionSizeY); | 45 | string capsPath, ulong regionHandle, int regionSizeX, int regionSizeY); |
45 | void TeleportFinishEvent(ulong regionHandle, byte simAccess, | 46 | void TeleportFinishEvent(ulong regionHandle, byte simAccess, |
46 | IPEndPoint regionExternalEndPoint, | 47 | IPEndPoint regionExternalEndPoint, |
47 | uint locationID, uint flags, string capsURL, | 48 | uint locationID, uint flags, string capsURL, |
48 | UUID agentID, int regionSizeX, int regionSizeY); | 49 | UUID agentID, int regionSizeX, int regionSizeY); |
49 | void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, | 50 | void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, |
50 | IPEndPoint newRegionExternalEndPoint, | 51 | IPEndPoint newRegionExternalEndPoint, |
51 | string capsURL, UUID avatarID, UUID sessionID, | 52 | string capsURL, UUID avatarID, UUID sessionID, |
52 | int regionSizeX, int regionSizeY); | 53 | int regionSizeX, int regionSizeY); |
53 | void ChatterboxInvitation(UUID sessionID, string sessionName, | 54 | void ChatterboxInvitation(UUID sessionID, string sessionName, |
54 | UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, | 55 | UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, |
55 | uint timeStamp, bool offline, int parentEstateID, Vector3 position, | 56 | uint timeStamp, bool offline, int parentEstateID, Vector3 position, |
56 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); | 57 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); |
57 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, | 58 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, |
58 | bool isModerator, bool textMute); | 59 | bool canVoiceChat, bool isModerator, bool textMute, bool isEnterorLeave); |
60 | void ChatterBoxForceClose(UUID toAgent, UUID sessionID, string reason); | ||
59 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); | 61 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); |
60 | void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); | 62 | void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data); |
61 | OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono); | 63 | OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono); |
62 | OSD BuildEvent(string eventName, OSD eventBody); | 64 | OSD BuildEvent(string eventName, OSD eventBody); |
63 | void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID); | 65 | void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID); |
diff --git a/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs index a730cfd..4ce150f 100644 --- a/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
37 | /// <summary> | 37 | /// <summary> |
38 | /// This function extends the simple URL configuration in the caps handlers | 38 | /// This function extends the simple URL configuration in the caps handlers |
39 | /// to facilitate more interesting computation when an external handler is | 39 | /// to facilitate more interesting computation when an external handler is |
40 | /// sent to the viewer. | 40 | /// sent to the viewer. |
41 | /// </summary> | 41 | /// </summary> |
42 | /// <param name="agentID">New user UUID</param> | 42 | /// <param name="agentID">New user UUID</param> |
43 | /// <param name="caps">Internal caps registry, where the external handler will be registered</param> | 43 | /// <param name="caps">Internal caps registry, where the external handler will be registered</param> |
diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs index 7e87006..ec014f4 100644 --- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Framework.Scenes; | ||
31 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; | 32 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; |
32 | 33 | ||
33 | namespace OpenSim.Region.Framework.Interfaces | 34 | namespace OpenSim.Region.Framework.Interfaces |
@@ -93,6 +94,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
93 | /// <param name="perms">These come from the FriendRights enum.</param> | 94 | /// <param name="perms">These come from the FriendRights enum.</param> |
94 | void GrantRights(IClientAPI remoteClient, UUID friendID, int perms); | 95 | void GrantRights(IClientAPI remoteClient, UUID friendID, int perms); |
95 | 96 | ||
97 | void IsNowRoot(ScenePresence sp); | ||
96 | bool SendFriendsOnlineIfNeeded(IClientAPI client); | 98 | bool SendFriendsOnlineIfNeeded(IClientAPI client); |
97 | } | 99 | } |
98 | } \ No newline at end of file | 100 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs index 552ce01..52615e3 100644 --- a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs | |||
@@ -43,16 +43,15 @@ namespace OpenSim.Region.Framework.Interfaces | |||
43 | /// <param name="token"></param> | 43 | /// <param name="token"></param> |
44 | /// <param name="godLike"></param> | 44 | /// <param name="godLike"></param> |
45 | /// <param name="controllingClient"></param> | 45 | /// <param name="controllingClient"></param> |
46 | void RequestGodlikePowers(UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient); | 46 | void RequestGodlikePowers(UUID agentID, UUID sessionID, UUID token, bool godLike); |
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Kicks User specified from the simulator. This logs them off of the grid. | 49 | /// Kicks User specified from the simulator. This logs them off of the grid. |
50 | /// </summary> | 50 | /// </summary> |
51 | /// <param name="godID">The person doing the kicking</param> | 51 | /// <param name="godID">The person doing the kicking</param> |
52 | /// <param name="sessionID">The session of the person doing the kicking</param> | ||
53 | /// <param name="agentID">the person that is being kicked</param> | 52 | /// <param name="agentID">the person that is being kicked</param> |
54 | /// <param name="kickflags">This isn't used apparently</param> | 53 | /// <param name="kickflags">This isn't used apparently</param> |
55 | /// <param name="reason">The message to send to the user after it's been turned into a field</param> | 54 | /// <param name="reason">The message to send to the user after it's been turned into a field</param> |
56 | void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason); | 55 | void KickUser(UUID godID, UUID agentID, uint kickflags, byte[] reason); |
57 | } | 56 | } |
58 | } | 57 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs index 7dc1552..46d6863 100644 --- a/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs | |||
@@ -34,9 +34,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
34 | /// <summary> | 34 | /// <summary> |
35 | /// Provide mechanisms for messaging groups. | 35 | /// Provide mechanisms for messaging groups. |
36 | /// </summary> | 36 | /// </summary> |
37 | /// | 37 | /// |
38 | /// TODO: Provide a mechanism for receiving group messages as well as sending them | 38 | /// TODO: Provide a mechanism for receiving group messages as well as sending them |
39 | /// | 39 | /// |
40 | public interface IGroupsMessagingModule | 40 | public interface IGroupsMessagingModule |
41 | { | 41 | { |
42 | /// <summary> | 42 | /// <summary> |
@@ -56,13 +56,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
56 | /// True if the chat session was started successfully, false otherwise. | 56 | /// True if the chat session was started successfully, false otherwise. |
57 | /// </returns> | 57 | /// </returns> |
58 | bool StartGroupChatSession(UUID agentID, UUID groupID); | 58 | bool StartGroupChatSession(UUID agentID, UUID groupID); |
59 | 59 | ||
60 | /// <summary> | 60 | /// <summary> |
61 | /// Send a message to each member of a group whose chat session is active. | 61 | /// Send a message to each member of a group whose chat session is active. |
62 | /// </summary> | 62 | /// </summary> |
63 | /// <param name="im"> | 63 | /// <param name="im"> |
64 | /// The message itself. The fields that must be populated are | 64 | /// The message itself. The fields that must be populated are |
65 | /// | 65 | /// |
66 | /// imSessionID - Populate this with the group ID (session ID and group ID are currently identical) | 66 | /// imSessionID - Populate this with the group ID (session ID and group ID are currently identical) |
67 | /// fromAgentName - Populate this with whatever arbitrary name you want to show up in the chat dialog | 67 | /// fromAgentName - Populate this with whatever arbitrary name you want to show up in the chat dialog |
68 | /// message - The message itself | 68 | /// message - The message itself |
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
76 | /// </summary> | 76 | /// </summary> |
77 | /// <param name="im"> | 77 | /// <param name="im"> |
78 | /// The message itself. The fields that must be populated are | 78 | /// The message itself. The fields that must be populated are |
79 | /// | 79 | /// |
80 | /// imSessionID - Populate this with the group ID (session ID and group ID are currently identical) | 80 | /// imSessionID - Populate this with the group ID (session ID and group ID are currently identical) |
81 | /// fromAgentName - Populate this with whatever arbitrary name you want to show up in the chat dialog | 81 | /// fromAgentName - Populate this with whatever arbitrary name you want to show up in the chat dialog |
82 | /// message - The message itself | 82 | /// message - The message itself |
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
84 | /// </param> | 84 | /// </param> |
85 | /// <param name="groupID"></param> | 85 | /// <param name="groupID"></param> |
86 | /// <param name="sendingAgentForGroupCalls"> | 86 | /// <param name="sendingAgentForGroupCalls"> |
87 | /// The requesting agent to use when querying the groups service. Sometimes this is different from | 87 | /// The requesting agent to use when querying the groups service. Sometimes this is different from |
88 | /// im.fromAgentID, with group notices, for example. | 88 | /// im.fromAgentID, with group notices, for example. |
89 | /// </param> | 89 | /// </param> |
90 | /// <param name="sendCondition"> | 90 | /// <param name="sendCondition"> |
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs index 9ae5e87..61db1b8 100644 --- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
51 | /// <param name="maturePublish"></param> | 51 | /// <param name="maturePublish"></param> |
52 | /// <returns>The UUID of the created group</returns> | 52 | /// <returns>The UUID of the created group</returns> |
53 | UUID CreateGroup( | 53 | UUID CreateGroup( |
54 | IClientAPI remoteClient, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, | 54 | IClientAPI remoteClient, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, |
55 | bool openEnrollment, bool allowPublish, bool maturePublish); | 55 | bool openEnrollment, bool allowPublish, bool maturePublish); |
56 | 56 | ||
57 | /// <summary> | 57 | /// <summary> |
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
67 | /// <param name="GroupID">ID of the group</param> | 67 | /// <param name="GroupID">ID of the group</param> |
68 | /// <returns>The group's data. Null if there is no such group.</returns> | 68 | /// <returns>The group's data. Null if there is no such group.</returns> |
69 | GroupRecord GetGroupRecord(UUID GroupID); | 69 | GroupRecord GetGroupRecord(UUID GroupID); |
70 | 70 | ||
71 | void ActivateGroup(IClientAPI remoteClient, UUID groupID); | 71 | void ActivateGroup(IClientAPI remoteClient, UUID groupID); |
72 | List<GroupTitlesData> GroupTitlesRequest(IClientAPI remoteClient, UUID groupID); | 72 | List<GroupTitlesData> GroupTitlesRequest(IClientAPI remoteClient, UUID groupID); |
73 | List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID); | 73 | List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID); |
@@ -76,13 +76,14 @@ namespace OpenSim.Region.Framework.Interfaces | |||
76 | GroupProfileData GroupProfileRequest(IClientAPI remoteClient, UUID groupID); | 76 | GroupProfileData GroupProfileRequest(IClientAPI remoteClient, UUID groupID); |
77 | GroupMembershipData[] GetMembershipData(UUID UserID); | 77 | GroupMembershipData[] GetMembershipData(UUID UserID); |
78 | GroupMembershipData GetMembershipData(UUID GroupID, UUID UserID); | 78 | GroupMembershipData GetMembershipData(UUID GroupID, UUID UserID); |
79 | GroupMembershipData GetActiveMembershipData(UUID UserID); | ||
79 | 80 | ||
80 | void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish); | 81 | void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish); |
81 | 82 | ||
82 | void SetGroupAcceptNotices(IClientAPI remoteClient, UUID groupID, bool acceptNotices, bool listInProfile); | 83 | void SetGroupAcceptNotices(IClientAPI remoteClient, UUID groupID, bool acceptNotices, bool listInProfile); |
83 | 84 | ||
84 | void GroupTitleUpdate(IClientAPI remoteClient, UUID GroupID, UUID TitleRoleID); | 85 | void GroupTitleUpdate(IClientAPI remoteClient, UUID GroupID, UUID TitleRoleID); |
85 | 86 | ||
86 | GroupNoticeData[] GroupNoticesListRequest(IClientAPI remoteClient, UUID GroupID); | 87 | GroupNoticeData[] GroupNoticesListRequest(IClientAPI remoteClient, UUID GroupID); |
87 | string GetGroupTitle(UUID avatarID); | 88 | string GetGroupTitle(UUID avatarID); |
88 | void GroupRoleUpdate(IClientAPI remoteClient, UUID GroupID, UUID RoleID, string name, string description, string title, ulong powers, byte updateType); | 89 | void GroupRoleUpdate(IClientAPI remoteClient, UUID GroupID, UUID RoleID, string name, string description, string title, ulong powers, byte updateType); |
@@ -91,6 +92,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
91 | GridInstantMessage CreateGroupNoticeIM(UUID agentID, UUID groupNoticeID, byte dialog); | 92 | GridInstantMessage CreateGroupNoticeIM(UUID agentID, UUID groupNoticeID, byte dialog); |
92 | void SendAgentGroupDataUpdate(IClientAPI remoteClient); | 93 | void SendAgentGroupDataUpdate(IClientAPI remoteClient); |
93 | void JoinGroupRequest(IClientAPI remoteClient, UUID GroupID); | 94 | void JoinGroupRequest(IClientAPI remoteClient, UUID GroupID); |
95 | void JoinGroup(string agentID, UUID GroupID); | ||
94 | void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID); | 96 | void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID); |
95 | void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID); | 97 | void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID); |
96 | void EjectGroupMember(IClientAPI remoteClient, UUID agentID, UUID GroupID, UUID EjecteeID); | 98 | void EjectGroupMember(IClientAPI remoteClient, UUID agentID, UUID GroupID, UUID EjecteeID); |
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs index 124504c..978c248 100644 --- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs +++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | |||
@@ -58,7 +58,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
58 | public interface IHttpRequestModule | 58 | public interface IHttpRequestModule |
59 | { | 59 | { |
60 | UUID MakeHttpRequest(string url, string parameters, string body); | 60 | UUID MakeHttpRequest(string url, string parameters, string body); |
61 | |||
62 | /// <summary> | 61 | /// <summary> |
63 | /// Starts the http request. | 62 | /// Starts the http request. |
64 | /// </summary> | 63 | /// </summary> |
@@ -78,15 +77,14 @@ namespace OpenSim.Region.Framework.Interfaces | |||
78 | /// then returned via IServiceRequest when the response is asynchronously fetched. | 77 | /// then returned via IServiceRequest when the response is asynchronously fetched. |
79 | /// </param> | 78 | /// </param> |
80 | UUID StartHttpRequest( | 79 | UUID StartHttpRequest( |
81 | uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body, | 80 | uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body, |
82 | out HttpInitialRequestStatus status); | 81 | out HttpInitialRequestStatus status); |
83 | 82 | ||
84 | /// <summary> | 83 | /// <summary> |
85 | /// Stop and remove all http requests for the given script. | 84 | /// Stop and remove all http requests for the given script. |
86 | /// </summary> | 85 | /// </summary> |
87 | /// <param name='id'></param> | 86 | /// <param name='id'></param> |
88 | void StopHttpRequestsForScript(UUID id); | 87 | void StopHttpRequest(uint m_localID, UUID m_itemID); |
89 | |||
90 | IServiceRequest GetNextCompletedRequest(); | 88 | IServiceRequest GetNextCompletedRequest(); |
91 | void RemoveCompletedRequest(UUID id); | 89 | void RemoveCompletedRequest(UUID id); |
92 | } | 90 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs index 6bad018..292b0d6 100644 --- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs | |||
@@ -70,6 +70,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
70 | /// </remarks> | 70 | /// </remarks> |
71 | /// <param name="remoteClient"></param> | 71 | /// <param name="remoteClient"></param> |
72 | /// <param name="itemID"></param> | 72 | /// <param name="itemID"></param> |
73 | /// <param name="rezGroupID"></param> | ||
73 | /// <param name="RayEnd"></param> | 74 | /// <param name="RayEnd"></param> |
74 | /// <param name="RayStart"></param> | 75 | /// <param name="RayStart"></param> |
75 | /// <param name="RayTargetID"></param> | 76 | /// <param name="RayTargetID"></param> |
@@ -81,6 +82,11 @@ namespace OpenSim.Region.Framework.Interfaces | |||
81 | /// <param name="attachment"></param> | 82 | /// <param name="attachment"></param> |
82 | /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns> | 83 | /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns> |
83 | SceneObjectGroup RezObject( | 84 | SceneObjectGroup RezObject( |
85 | IClientAPI remoteClient, UUID itemID, UUID rezGroupID, Vector3 RayEnd, Vector3 RayStart, | ||
86 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | ||
87 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | ||
88 | // compatibily do not use | ||
89 | SceneObjectGroup RezObject( | ||
84 | IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, | 90 | IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, |
85 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 91 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
86 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | 92 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); |
@@ -97,6 +103,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
97 | /// The item from which the object asset came. Can be null, in which case pre and post rez item adjustment and checks are not performed. | 103 | /// The item from which the object asset came. Can be null, in which case pre and post rez item adjustment and checks are not performed. |
98 | /// </param> | 104 | /// </param> |
99 | /// <param name="assetID">The asset id for the object to rez.</param> | 105 | /// <param name="assetID">The asset id for the object to rez.</param> |
106 | /// <param name="rezObjectID">The requested group id for the object to rez.</param> | ||
100 | /// <param name="RayEnd"></param> | 107 | /// <param name="RayEnd"></param> |
101 | /// <param name="RayStart"></param> | 108 | /// <param name="RayStart"></param> |
102 | /// <param name="RayTargetID"></param> | 109 | /// <param name="RayTargetID"></param> |
@@ -107,8 +114,16 @@ namespace OpenSim.Region.Framework.Interfaces | |||
107 | /// <param name="fromTaskID"></param> | 114 | /// <param name="fromTaskID"></param> |
108 | /// <param name="attachment"></param> | 115 | /// <param name="attachment"></param> |
109 | /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns> | 116 | /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns> |
117 | |||
118 | SceneObjectGroup RezObject(IClientAPI remoteClient, InventoryItemBase item, UUID rezGroupID, | ||
119 | UUID assetID, Vector3 RayEnd, Vector3 RayStart, | ||
120 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | ||
121 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | ||
122 | |||
123 | // compatibility do not use | ||
110 | SceneObjectGroup RezObject( | 124 | SceneObjectGroup RezObject( |
111 | IClientAPI remoteClient, InventoryItemBase item, UUID assetID, Vector3 RayEnd, Vector3 RayStart, | 125 | IClientAPI remoteClient, InventoryItemBase item, |
126 | UUID assetID, Vector3 RayEnd, Vector3 RayStart, | ||
112 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 127 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
113 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | 128 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); |
114 | 129 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs index 1a89721..86aca8e 100644 --- a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors | 2 | * Copyright (c) Contributors |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
40 | Array = 2, | 40 | Array = 2, |
41 | Value = 3 | 41 | Value = 3 |
42 | } | 42 | } |
43 | 43 | ||
44 | public enum JsonStoreValueType | 44 | public enum JsonStoreValueType |
45 | { | 45 | { |
46 | Undefined = 0, | 46 | Undefined = 0, |
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
50 | String = 4, | 50 | String = 4, |
51 | UUID = 5 | 51 | UUID = 5 |
52 | } | 52 | } |
53 | 53 | ||
54 | public struct JsonStoreStats | 54 | public struct JsonStoreStats |
55 | { | 55 | { |
56 | public int StoreCount; | 56 | public int StoreCount; |
diff --git a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs index 6a7d4a1..5151567 100644 --- a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs | |||
@@ -25,13 +25,18 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Drawing; | 28 | using OpenMetaverse; |
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using System.Drawing; | ||
30 | 31 | ||
31 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 33 | { |
33 | public interface IMapImageUploadModule | 34 | public interface IMapImageUploadModule |
34 | { | 35 | { |
36 | /// <summary> | ||
37 | /// Upload a new maptile | ||
38 | /// </summary> | ||
39 | void UploadMapTile(IScene scene); | ||
35 | void UploadMapTile(IScene scene, Bitmap mapTile); | 40 | void UploadMapTile(IScene scene, Bitmap mapTile); |
36 | } | 41 | } |
37 | } \ No newline at end of file | 42 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs index 290b826..b06ff2b 100644 --- a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs | |||
@@ -31,7 +31,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
31 | { | 31 | { |
32 | public delegate void MessageResultNotification(bool success); | 32 | public delegate void MessageResultNotification(bool success); |
33 | public delegate void UndeliveredMessage(GridInstantMessage im); | 33 | public delegate void UndeliveredMessage(GridInstantMessage im); |
34 | 34 | ||
35 | public interface IMessageTransferModule | 35 | public interface IMessageTransferModule |
36 | { | 36 | { |
37 | event UndeliveredMessage OnUndeliveredMessage; | 37 | event UndeliveredMessage OnUndeliveredMessage; |
diff --git a/OpenSim/Region/Framework/Interfaces/IMoapModule.cs b/OpenSim/Region/Framework/Interfaces/IMoapModule.cs index 1d3d240..e8be70f 100644 --- a/OpenSim/Region/Framework/Interfaces/IMoapModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IMoapModule.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
45 | /// <param name="face"></param> | 45 | /// <param name="face"></param> |
46 | /// <returns></returns> | 46 | /// <returns></returns> |
47 | MediaEntry GetMediaEntry(SceneObjectPart part, int face); | 47 | MediaEntry GetMediaEntry(SceneObjectPart part, int face); |
48 | 48 | ||
49 | /// <summary> | 49 | /// <summary> |
50 | /// Set the media entry for a given prim face. | 50 | /// Set the media entry for a given prim face. |
51 | /// </summary> | 51 | /// </summary> |
@@ -53,13 +53,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
53 | /// <param name="face"></param> | 53 | /// <param name="face"></param> |
54 | /// <param name="me"></param> | 54 | /// <param name="me"></param> |
55 | void SetMediaEntry(SceneObjectPart part, int face, MediaEntry me); | 55 | void SetMediaEntry(SceneObjectPart part, int face, MediaEntry me); |
56 | 56 | ||
57 | /// <summary> | 57 | /// <summary> |
58 | /// Clear the media entry for a given prim face. | 58 | /// Clear the media entry for a given prim face. |
59 | /// </summary> | 59 | /// </summary> |
60 | /// | 60 | /// |
61 | /// This is the equivalent of setting a media entry of null | 61 | /// This is the equivalent of setting a media entry of null |
62 | /// | 62 | /// |
63 | /// <param name="part"></param> | 63 | /// <param name="part"></param> |
64 | /// <param name="face">/param> | 64 | /// <param name="face">/param> |
65 | void ClearMediaEntry(SceneObjectPart part, int face); | 65 | void ClearMediaEntry(SceneObjectPart part, int face); |
diff --git a/OpenSim/Region/Framework/Interfaces/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs index 478833e..df872f4 100644 --- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs +++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs | |||
@@ -31,6 +31,17 @@ using OpenSim.Region.Framework.Scenes; | |||
31 | 31 | ||
32 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | // option flags for NPCs | ||
35 | public enum NPCOptionsFlags : int | ||
36 | { | ||
37 | None = 0x00, // no flags (max restriction) | ||
38 | AllowNotOwned = 0x01, // allow NPCs to be created not Owned | ||
39 | AllowSenseAsAvatar = 0x02, // allow NPCs to set to be sensed as Avatars | ||
40 | AllowCloneOtherAvatars = 0x04, // allow NPCs to created cloning a avatar in region | ||
41 | NoNPCGroup = 0x08, // NPCs will have no group title, otherwise will have "- NPC -" | ||
42 | objectGroup = 0x10 // NPC will have host sog groupID | ||
43 | } | ||
44 | |||
34 | /// <summary> | 45 | /// <summary> |
35 | /// Temporary interface. More methods to come at some point to make NPCs | 46 | /// Temporary interface. More methods to come at some point to make NPCs |
36 | /// more object oriented rather than controlling purely through module | 47 | /// more object oriented rather than controlling purely through module |
@@ -38,12 +49,18 @@ namespace OpenSim.Region.Framework.Interfaces | |||
38 | /// </summary> | 49 | /// </summary> |
39 | public interface INPC | 50 | public interface INPC |
40 | { | 51 | { |
52 | |||
41 | /// <summary> | 53 | /// <summary> |
42 | /// Should this NPC be sensed by LSL sensors as an 'agent' | 54 | /// Should this NPC be sensed by LSL sensors as an 'agent' |
43 | /// (interpreted here to mean a normal user) rather than an OpenSim | 55 | /// (interpreted here to mean a normal user) rather than an OpenSim |
44 | /// specific NPC extension? | 56 | /// specific NPC extension? |
45 | /// </summary> | 57 | /// </summary> |
46 | bool SenseAsAgent { get; } | 58 | bool SenseAsAgent { get; } |
59 | UUID ActiveGroupId { get; set; } | ||
60 | UUID Owner { get; } | ||
61 | string profileAbout { get; set; } | ||
62 | UUID profileImage { get; set; } | ||
63 | string Born { get; set; } | ||
47 | } | 64 | } |
48 | 65 | ||
49 | public interface INPCModule | 66 | public interface INPCModule |
@@ -94,7 +111,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
94 | /// failure. | 111 | /// failure. |
95 | /// </returns> | 112 | /// </returns> |
96 | UUID CreateNPC(string firstname, string lastname, | 113 | UUID CreateNPC(string firstname, string lastname, |
97 | Vector3 position, UUID agentID, UUID owner, bool senseAsAgent, Scene scene, | 114 | Vector3 position, UUID agentID, UUID owner, string groupTitle, UUID groupID, bool senseAsAgent, Scene scene, |
98 | AvatarAppearance appearance); | 115 | AvatarAppearance appearance); |
99 | 116 | ||
100 | /// <summary> | 117 | /// <summary> |
@@ -284,5 +301,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
284 | /// agent, the agent is unowned or the agent was not an NPC. | 301 | /// agent, the agent is unowned or the agent was not an NPC. |
285 | /// </returns> | 302 | /// </returns> |
286 | UUID GetOwner(UUID agentID); | 303 | UUID GetOwner(UUID agentID); |
304 | |||
305 | NPCOptionsFlags NPCOptionFlags {get;} | ||
287 | } | 306 | } |
288 | } | 307 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IPermissionsModule.cs b/OpenSim/Region/Framework/Interfaces/IPermissionsModule.cs index 1ed978b..933ca14 100644 --- a/OpenSim/Region/Framework/Interfaces/IPermissionsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IPermissionsModule.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
42 | 42 | ||
43 | public interface IPermissionsModule | 43 | public interface IPermissionsModule |
44 | { | 44 | { |
45 | 45 | ||
46 | /// <summary> | 46 | /// <summary> |
47 | /// Returns the type of permissions that the user has over an object. | 47 | /// Returns the type of permissions that the user has over an object. |
48 | /// </summary> | 48 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs index d44c1e1..398611c 100644 --- a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs | |||
@@ -33,11 +33,19 @@ namespace OpenSim.Region.Framework.Interfaces | |||
33 | { | 33 | { |
34 | public string UserID; | 34 | public string UserID; |
35 | public UUID RegionID; | 35 | public UUID RegionID; |
36 | 36 | public UUID SessionID; | |
37 | |||
38 | public PresenceInfo(string userID, UUID regionID, UUID sessionID) | ||
39 | { | ||
40 | UserID = userID; | ||
41 | RegionID = regionID; | ||
42 | SessionID = sessionID; | ||
43 | } | ||
37 | public PresenceInfo(string userID, UUID regionID) | 44 | public PresenceInfo(string userID, UUID regionID) |
38 | { | 45 | { |
39 | UserID = userID; | 46 | UserID = userID; |
40 | RegionID = regionID; | 47 | RegionID = regionID; |
48 | SessionID = UUID.Zero; | ||
41 | } | 49 | } |
42 | } | 50 | } |
43 | 51 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 99bc87d..9370ccd 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | |||
@@ -40,17 +40,17 @@ namespace OpenSim.Region.Framework.Interfaces | |||
40 | { | 40 | { |
41 | void HandleLoadOarConsoleCommand(string module, string[] cmdparams); | 41 | void HandleLoadOarConsoleCommand(string module, string[] cmdparams); |
42 | void HandleSaveOarConsoleCommand(string module, string[] cmdparams); | 42 | void HandleSaveOarConsoleCommand(string module, string[] cmdparams); |
43 | 43 | ||
44 | /// <summary> | 44 | /// <summary> |
45 | /// Archive the region to the given path | 45 | /// Archive the region to the given path |
46 | /// </summary> | 46 | /// </summary> |
47 | /// | 47 | /// |
48 | /// This method occurs asynchronously. If you want notification of when it has completed then subscribe to | 48 | /// This method occurs asynchronously. If you want notification of when it has completed then subscribe to |
49 | /// the EventManager.OnOarFileSaved event. | 49 | /// the EventManager.OnOarFileSaved event. |
50 | /// | 50 | /// |
51 | /// <param name="savePath"></param> | 51 | /// <param name="savePath"></param> |
52 | void ArchiveRegion(string savePath, Dictionary<string, object> options); | 52 | void ArchiveRegion(string savePath, Dictionary<string, object> options); |
53 | 53 | ||
54 | /// <summary> | 54 | /// <summary> |
55 | /// Archive the region to the given path | 55 | /// Archive the region to the given path |
56 | /// </summary> | 56 | /// </summary> |
@@ -94,35 +94,35 @@ namespace OpenSim.Region.Framework.Interfaces | |||
94 | /// </remarks> | 94 | /// </remarks> |
95 | /// <param name="loadPath"></param> | 95 | /// <param name="loadPath"></param> |
96 | void DearchiveRegion(string loadPath); | 96 | void DearchiveRegion(string loadPath); |
97 | 97 | ||
98 | /// <summary> | 98 | /// <summary> |
99 | /// Dearchive the given region archive. This replaces the existing scene. | 99 | /// Dearchive the given region archive. This replaces the existing scene. |
100 | /// </summary> | 100 | /// </summary> |
101 | /// | 101 | /// |
102 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. | 102 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. |
103 | /// | 103 | /// |
104 | /// <param name="loadPath"></param> | 104 | /// <param name="loadPath"></param> |
105 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> | 105 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> |
106 | /// <param name="options"> | 106 | /// <param name="options"> |
107 | /// Dictionary of options. | 107 | /// Dictionary of options. |
108 | /// </param> | 108 | /// </param> |
109 | void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options); | 109 | void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options); |
110 | 110 | ||
111 | /// <summary> | 111 | /// <summary> |
112 | /// Dearchive a region from a stream. This replaces the existing scene. | 112 | /// Dearchive a region from a stream. This replaces the existing scene. |
113 | /// </summary> | 113 | /// </summary> |
114 | /// | 114 | /// |
115 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. | 115 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. |
116 | /// | 116 | /// |
117 | /// <param name="loadStream"></param> | 117 | /// <param name="loadStream"></param> |
118 | void DearchiveRegion(Stream loadStream); | 118 | void DearchiveRegion(Stream loadStream); |
119 | 119 | ||
120 | /// <summary> | 120 | /// <summary> |
121 | /// Dearchive a region from a stream. This replaces the existing scene. | 121 | /// Dearchive a region from a stream. This replaces the existing scene. |
122 | /// </summary> | 122 | /// </summary> |
123 | /// | 123 | /// |
124 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. | 124 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. |
125 | /// | 125 | /// |
126 | /// <param name="loadStream"></param> | 126 | /// <param name="loadStream"></param> |
127 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> | 127 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> |
128 | /// <param name="options"> | 128 | /// <param name="options"> |
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs b/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs index 4d261d6..5d5ce34 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs | |||
@@ -30,8 +30,12 @@ using OpenSim.Framework; | |||
30 | 30 | ||
31 | namespace OpenSim.Region.Framework.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | public delegate void ConsoleMessage(UUID toAgentID, string message); | ||
34 | |||
33 | public interface IRegionConsole | 35 | public interface IRegionConsole |
34 | { | 36 | { |
37 | event ConsoleMessage OnConsoleMessage; | ||
38 | |||
35 | bool RunCommand(string command, UUID invokerID); | 39 | bool RunCommand(string command, UUID invokerID); |
36 | void SendConsoleOutput(UUID agentID, string message); | 40 | void SendConsoleOutput(UUID agentID, string message); |
37 | void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn); | 41 | void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn); |
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs index 2089bce..5b8f0f0 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
92 | /// this will be multiple times in one instance, while a nonshared | 92 | /// this will be multiple times in one instance, while a nonshared |
93 | /// module instance will only be called once. | 93 | /// module instance will only be called once. |
94 | /// This method is called after AddRegion has been called in all | 94 | /// This method is called after AddRegion has been called in all |
95 | /// modules for that scene, providing an opportunity to request | 95 | /// modules for that scene, providing an opportunity to request |
96 | /// another module's interface, or hook an event from another module. | 96 | /// another module's interface, or hook an event from another module. |
97 | /// </summary> | 97 | /// </summary> |
98 | /// <param name="scene"> | 98 | /// <param name="scene"> |
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs index c5b21a8..60586ff 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs | |||
@@ -102,9 +102,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
102 | /// <param name="min"></param> | 102 | /// <param name="min"></param> |
103 | /// <param name="max"></param> | 103 | /// <param name="max"></param> |
104 | void SavePrimListToXml2(EntityBase[] entityList, TextWriter stream, Vector3 min, Vector3 max); | 104 | void SavePrimListToXml2(EntityBase[] entityList, TextWriter stream, Vector3 min, Vector3 max); |
105 | 105 | ||
106 | void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName); | 106 | void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName); |
107 | 107 | ||
108 | /// <summary> | 108 | /// <summary> |
109 | /// Deserializes a scene object from its xml2 representation. This does not load the object into the scene. | 109 | /// Deserializes a scene object from its xml2 representation. This does not load the object into the scene. |
110 | /// </summary> | 110 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs index c68550f..9b25beb 100644 --- a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs | |||
@@ -35,5 +35,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
35 | TimeSpan TimeUntilRestart { get; } | 35 | TimeSpan TimeUntilRestart { get; } |
36 | void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice); | 36 | void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice); |
37 | void AbortRestart(string message); | 37 | void AbortRestart(string message); |
38 | void DelayRestart(int seconds, string message); | ||
38 | } | 39 | } |
39 | } | 40 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/ISearchModule.cs b/OpenSim/Region/Framework/Interfaces/ISearchModule.cs index 64bf72c..d56d188 100644 --- a/OpenSim/Region/Framework/Interfaces/ISearchModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISearchModule.cs | |||
@@ -31,6 +31,6 @@ namespace OpenSim.Framework | |||
31 | { | 31 | { |
32 | public interface ISearchModule | 32 | public interface ISearchModule |
33 | { | 33 | { |
34 | 34 | void Refresh(); | |
35 | } | 35 | } |
36 | } | 36 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs index 8948f04..f8a6b53 100644 --- a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs +++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs | |||
@@ -64,12 +64,19 @@ namespace OpenSim.Region.Framework.Interfaces | |||
64 | List<SceneObjectGroup> LoadObjects(UUID regionUUID); | 64 | List<SceneObjectGroup> LoadObjects(UUID regionUUID); |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
67 | /// Store a terrain revision in region storage | 67 | /// Store terrain in region storage |
68 | /// </summary> | 68 | /// </summary> |
69 | /// <param name="ter">HeightField data</param> | 69 | /// <param name="ter">HeightField data</param> |
70 | /// <param name="regionID">region UUID</param> | 70 | /// <param name="regionID">region UUID</param> |
71 | void StoreTerrain(TerrainData terrain, UUID regionID); | 71 | void StoreTerrain(TerrainData terrain, UUID regionID); |
72 | 72 | ||
73 | /// <summary> | ||
74 | /// Store baked terrain in region storage | ||
75 | /// </summary> | ||
76 | /// <param name="ter">HeightField data</param> | ||
77 | /// <param name="regionID">region UUID</param> | ||
78 | void StoreBakedTerrain(TerrainData terrain, UUID regionID); | ||
79 | |||
73 | // Legacy version kept for downward compabibility | 80 | // Legacy version kept for downward compabibility |
74 | void StoreTerrain(double[,] terrain, UUID regionID); | 81 | void StoreTerrain(double[,] terrain, UUID regionID); |
75 | 82 | ||
@@ -82,6 +89,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
82 | /// <param name="sizeZ">the Z dimension of the region being filled</param> | 89 | /// <param name="sizeZ">the Z dimension of the region being filled</param> |
83 | /// <returns>Heightfield data</returns> | 90 | /// <returns>Heightfield data</returns> |
84 | TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ); | 91 | TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ); |
92 | TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ); | ||
85 | 93 | ||
86 | // Legacy version kept for downward compabibility | 94 | // Legacy version kept for downward compabibility |
87 | double[,] LoadTerrain(UUID regionID); | 95 | double[,] LoadTerrain(UUID regionID); |
@@ -125,6 +133,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
125 | /// <param name="regionUUID">the region UUID</param> | 133 | /// <param name="regionUUID">the region UUID</param> |
126 | void RemoveRegionEnvironmentSettings(UUID regionUUID); | 134 | void RemoveRegionEnvironmentSettings(UUID regionUUID); |
127 | 135 | ||
136 | UUID[] GetObjectIDs(UUID regionID); | ||
137 | |||
128 | void SaveExtra(UUID regionID, string name, string value); | 138 | void SaveExtra(UUID regionID, string name, string value); |
129 | 139 | ||
130 | void RemoveExtra(UUID regionID, string name); | 140 | void RemoveExtra(UUID regionID, string name); |
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs index 917b5d1..19ba787 100644 --- a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs +++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
45 | /// Dispose the database | 45 | /// Dispose the database |
46 | /// </summary> | 46 | /// </summary> |
47 | void Dispose(); | 47 | void Dispose(); |
48 | 48 | ||
49 | /// <summary> | 49 | /// <summary> |
50 | /// Stores all object's details apart from inventory | 50 | /// Stores all object's details apart from inventory |
51 | /// </summary> | 51 | /// </summary> |
@@ -75,17 +75,25 @@ namespace OpenSim.Region.Framework.Interfaces | |||
75 | List<SceneObjectGroup> LoadObjects(UUID regionUUID); | 75 | List<SceneObjectGroup> LoadObjects(UUID regionUUID); |
76 | 76 | ||
77 | /// <summary> | 77 | /// <summary> |
78 | /// Store a terrain revision in region storage | 78 | /// Store a terrain in region storage |
79 | /// </summary> | 79 | /// </summary> |
80 | /// <param name="ter">HeightField data</param> | 80 | /// <param name="ter">HeightField data</param> |
81 | /// <param name="regionID">region UUID</param> | 81 | /// <param name="regionID">region UUID</param> |
82 | void StoreTerrain(TerrainData terrain, UUID regionID); | 82 | void StoreTerrain(TerrainData terrain, UUID regionID); |
83 | 83 | ||
84 | /// <summary> | ||
85 | /// Store baked terrain in region storage | ||
86 | /// </summary> | ||
87 | /// <param name="ter">HeightField data</param> | ||
88 | /// <param name="regionID">region UUID</param> | ||
89 | void StoreBakedTerrain(TerrainData terrain, UUID regionID); | ||
90 | |||
91 | |||
84 | // Legacy version kept for downward compabibility | 92 | // Legacy version kept for downward compabibility |
85 | void StoreTerrain(double[,] terrain, UUID regionID); | 93 | void StoreTerrain(double[,] terrain, UUID regionID); |
86 | 94 | ||
87 | /// <summary> | 95 | /// <summary> |
88 | /// Load the latest terrain revision from region storage | 96 | /// Load terrain from region storage |
89 | /// </summary> | 97 | /// </summary> |
90 | /// <param name="regionID">the region UUID</param> | 98 | /// <param name="regionID">the region UUID</param> |
91 | /// <param name="pSizeX">the X dimension of the terrain being filled</param> | 99 | /// <param name="pSizeX">the X dimension of the terrain being filled</param> |
@@ -93,12 +101,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
93 | /// <param name="pSizeZ">the Z dimension of the terrain being filled</param> | 101 | /// <param name="pSizeZ">the Z dimension of the terrain being filled</param> |
94 | /// <returns>Heightfield data</returns> | 102 | /// <returns>Heightfield data</returns> |
95 | TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ); | 103 | TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ); |
104 | TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ); | ||
96 | 105 | ||
97 | // Legacy version kept for downward compabibility | 106 | // Legacy version kept for downward compabibility |
98 | double[,] LoadTerrain(UUID regionID); | 107 | double[,] LoadTerrain(UUID regionID); |
99 | 108 | ||
100 | void StoreLandObject(ILandObject Parcel); | 109 | void StoreLandObject(ILandObject Parcel); |
101 | 110 | ||
102 | /// <summary> | 111 | /// <summary> |
103 | /// <list type="bullet"> | 112 | /// <list type="bullet"> |
104 | /// <item>delete from land where UUID=globalID</item> | 113 | /// <item>delete from land where UUID=globalID</item> |
@@ -107,7 +116,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
107 | /// </summary> | 116 | /// </summary> |
108 | /// <param name="globalID"></param> | 117 | /// <param name="globalID"></param> |
109 | void RemoveLandObject(UUID globalID); | 118 | void RemoveLandObject(UUID globalID); |
110 | 119 | ||
111 | List<LandData> LoadLandObjects(UUID regionUUID); | 120 | List<LandData> LoadLandObjects(UUID regionUUID); |
112 | 121 | ||
113 | void StoreRegionSettings(RegionSettings rs); | 122 | void StoreRegionSettings(RegionSettings rs); |
@@ -115,6 +124,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
115 | RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID); | 124 | RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID); |
116 | void StoreRegionWindlightSettings(RegionLightShareData wl); | 125 | void StoreRegionWindlightSettings(RegionLightShareData wl); |
117 | void RemoveRegionWindlightSettings(UUID regionID); | 126 | void RemoveRegionWindlightSettings(UUID regionID); |
127 | UUID[] GetObjectIDs(UUID regionID); | ||
118 | 128 | ||
119 | /// <summary> | 129 | /// <summary> |
120 | /// Load Environment settings from region storage | 130 | /// Load Environment settings from region storage |
diff --git a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs new file mode 100644 index 0000000..10f421b --- /dev/null +++ b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs | |||
@@ -0,0 +1,47 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using OpenSim.Region.Framework.Scenes; | ||
29 | |||
30 | public interface ISnmpModule | ||
31 | { | ||
32 | void Trap(int code, string Message, Scene scene); | ||
33 | void Critical(string Message, Scene scene); | ||
34 | void Warning(string Message, Scene scene); | ||
35 | void Major(string Message, Scene scene); | ||
36 | void ColdStart(int step , Scene scene); | ||
37 | void Shutdown(int step , Scene scene); | ||
38 | // | ||
39 | // Node Start/stop events | ||
40 | // | ||
41 | void LinkUp(Scene scene); | ||
42 | void LinkDown(Scene scene); | ||
43 | void BootInfo(string data, Scene scene); | ||
44 | void trapDebug(string Module,string data, Scene scene); | ||
45 | void trapXMRE(int data, string Message, Scene scene); | ||
46 | |||
47 | } | ||
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs index 8372ddd..f7c6513 100644 --- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs | |||
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
95 | /// <param name="radius">Sound radius</param> | 95 | /// <param name="radius">Sound radius</param> |
96 | /// <param name="isMaster">Set object to sync master if true</param> | 96 | /// <param name="isMaster">Set object to sync master if true</param> |
97 | void LoopSound(UUID objectID, UUID soundID, double gain, | 97 | void LoopSound(UUID objectID, UUID soundID, double gain, |
98 | double radius, bool isMaster); | 98 | double radius, bool isMaster, bool isSlave); |
99 | 99 | ||
100 | /// <summary> | 100 | /// <summary> |
101 | /// Trigger or play an attached sound in this part's inventory. | 101 | /// Trigger or play an attached sound in this part's inventory. |
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrain.cs b/OpenSim/Region/Framework/Interfaces/ITerrain.cs index 815a2d8..2fc954a 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrain.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrain.cs | |||
@@ -74,6 +74,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
74 | 74 | ||
75 | public interface IMapImageGenerator | 75 | public interface IMapImageGenerator |
76 | { | 76 | { |
77 | System.Drawing.Bitmap CreateMapTileForce(); | ||
77 | System.Drawing.Bitmap CreateMapTile(); | 78 | System.Drawing.Bitmap CreateMapTile(); |
78 | System.Drawing.Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures); | 79 | System.Drawing.Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures); |
79 | byte[] WriteJpeg2000Image(); | 80 | byte[] WriteJpeg2000Image(); |
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs index f660b8d..78db02a 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs | |||
@@ -59,5 +59,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
59 | void LoadFromXmlString(string data); | 59 | void LoadFromXmlString(string data); |
60 | // Merge some terrain into this channel | 60 | // Merge some terrain into this channel |
61 | void Merge(ITerrainChannel newTerrain, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement); | 61 | void Merge(ITerrainChannel newTerrain, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement); |
62 | |||
63 | /// </summary> | ||
64 | /// <param name="newTerrain"></param> | ||
65 | /// <param name="displacement"><x, y, z></param> | ||
66 | /// <param name="rotationDegrees"></param> | ||
67 | /// <param name="boundingOrigin"><x, y></param> | ||
68 | /// <param name="boundingSize"><x, y></param> | ||
69 | void MergeWithBounding(ITerrainChannel newTerrain, Vector3 displacement, float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize); | ||
62 | } | 70 | } |
63 | } | 71 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs index 28f797a..3fc5ce7 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |||
@@ -24,10 +24,9 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | using System.IO; | ||
28 | 27 | ||
28 | using System.IO; | ||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | |||
31 | using OpenMetaverse; | 30 | using OpenMetaverse; |
32 | 31 | ||
33 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
@@ -43,13 +42,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
43 | /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight) | 42 | /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight) |
44 | /// </summary> | 43 | /// </summary> |
45 | void TaintTerrain(); | 44 | void TaintTerrain(); |
46 | 45 | ||
47 | /// <summary> | 46 | /// <summary> |
48 | /// When a client initially connects, all the terrain must be pushed to the viewer. | 47 | /// When a client initially connects, all the terrain must be pushed to the viewer. |
49 | /// This call causes all the terrain patches to be sent to the client. | 48 | /// This call causes all the terrain patches to be sent to the client. |
50 | /// </summary> | 49 | /// </summary> |
51 | void PushTerrain(IClientAPI pClient); | 50 | void PushTerrain(IClientAPI pClient); |
52 | 51 | ||
53 | /// <summary> | 52 | /// <summary> |
54 | /// Load a terrain from a stream. | 53 | /// Load a terrain from a stream. |
55 | /// </summary> | 54 | /// </summary> |
@@ -58,8 +57,11 @@ namespace OpenSim.Region.Framework.Interfaces | |||
58 | /// </param> | 57 | /// </param> |
59 | /// <param name="stream"></param> | 58 | /// <param name="stream"></param> |
60 | void LoadFromStream(string filename, Stream stream); | 59 | void LoadFromStream(string filename, Stream stream); |
61 | void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream); | ||
62 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); | 60 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); |
61 | void LoadFromStream(string filename, Vector3 displacement, | ||
62 | float radianRotation, Vector2 rotationDisplacement, Stream stream); | ||
63 | void LoadFromStream(string filename, Vector3 displacement, | ||
64 | float rotationDegress, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream); | ||
63 | /// <summary> | 65 | /// <summary> |
64 | /// Save a terrain to a stream. | 66 | /// Save a terrain to a stream. |
65 | /// </summary> | 67 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Interfaces/IUrlModule.cs b/OpenSim/Region/Framework/Interfaces/IUrlModule.cs index 79e9f9d..3fc0c44 100644 --- a/OpenSim/Region/Framework/Interfaces/IUrlModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IUrlModule.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections; | ||
28 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 30 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
@@ -35,12 +36,12 @@ namespace OpenSim.Region.Framework.Interfaces | |||
35 | public interface IUrlModule | 36 | public interface IUrlModule |
36 | { | 37 | { |
37 | string ExternalHostNameForLSL { get; } | 38 | string ExternalHostNameForLSL { get; } |
38 | UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID); | 39 | UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID, Hashtable options); |
39 | UUID RequestSecureURL(IScriptModule engine, SceneObjectPart host, UUID itemID); | 40 | UUID RequestSecureURL(IScriptModule engine, SceneObjectPart host, UUID itemID, Hashtable options); |
40 | void ReleaseURL(string url); | 41 | void ReleaseURL(string url); |
41 | void HttpResponse(UUID request, int status, string body); | 42 | void HttpResponse(UUID request, int status, string body); |
42 | void HttpContentType(UUID request, string type); | 43 | void HttpContentType(UUID request, string type); |
43 | 44 | ||
44 | string GetHttpHeader(UUID request, string header); | 45 | string GetHttpHeader(UUID request, string header); |
45 | int GetFreeUrls(); | 46 | int GetFreeUrls(); |
46 | 47 | ||
diff --git a/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionData.cs b/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs index 42fca9f..027a7e2 100644 --- a/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionData.cs +++ b/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs | |||
@@ -25,16 +25,11 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenMetaverse; | ||
29 | using OpenSim.Region.Framework.Scenes; | 28 | using OpenSim.Region.Framework.Scenes; |
29 | using OpenMetaverse; | ||
30 | 30 | ||
31 | namespace OpenSim.Region.RegionCombinerModule | 31 | public interface IUserAccountCacheModule |
32 | { | 32 | { |
33 | public class RegionData | 33 | void Remove(string name); |
34 | { | 34 | void Remove(UUID id); |
35 | public UUID RegionId; | 35 | } |
36 | public Scene RegionScene; | ||
37 | // Offset of this region from the base of the root region. | ||
38 | public Vector3 Offset; | ||
39 | } | ||
40 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs b/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs index 2e555fa..2fe7454 100644 --- a/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs | |||
@@ -40,6 +40,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
40 | /// This is used by osSetParcelSIPAddress | 40 | /// This is used by osSetParcelSIPAddress |
41 | /// </summary> | 41 | /// </summary> |
42 | void setLandSIPAddress(string SIPAddress,UUID GlobalID); | 42 | void setLandSIPAddress(string SIPAddress,UUID GlobalID); |
43 | 43 | ||
44 | } | 44 | } |
45 | } | 45 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs index 16b6024..b4bc15c 100644 --- a/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs +++ b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
53 | /// <summary> | 53 | /// <summary> |
54 | /// Update wind. | 54 | /// Update wind. |
55 | /// </summary> | 55 | /// </summary> |
56 | void WindUpdate(uint frame); | 56 | bool WindUpdate(uint frame); |
57 | 57 | ||
58 | /// <summary> | 58 | /// <summary> |
59 | /// Returns the wind vector at the given local region coordinates. | 59 | /// Returns the wind vector at the given local region coordinates. |
diff --git a/OpenSim/Region/Framework/Interfaces/IWindModule.cs b/OpenSim/Region/Framework/Interfaces/IWindModule.cs index 4a26a71..424df87 100644 --- a/OpenSim/Region/Framework/Interfaces/IWindModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IWindModule.cs | |||
@@ -31,7 +31,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
31 | { | 31 | { |
32 | public interface IWindModule : INonSharedRegionModule | 32 | public interface IWindModule : INonSharedRegionModule |
33 | { | 33 | { |
34 | 34 | ||
35 | /// <summary> | 35 | /// <summary> |
36 | /// Retrieves the current wind speed at the given Region Coordinates | 36 | /// Retrieves the current wind speed at the given Region Coordinates |
37 | /// </summary> | 37 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs index d76a0d7..3da4130 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
140 | /// </summary> | 140 | /// </summary> |
141 | /// <returns>ListenerInfo with filter filled in</returns> | 141 | /// <returns>ListenerInfo with filter filled in</returns> |
142 | IWorldCommListenerInfo GetNextMessage(); | 142 | IWorldCommListenerInfo GetNextMessage(); |
143 | 143 | ||
144 | void ListenControl(UUID itemID, int handle, int active); | 144 | void ListenControl(UUID itemID, int handle, int active); |
145 | void ListenRemove(UUID itemID, int handle); | 145 | void ListenRemove(UUID itemID, int handle); |
146 | void DeleteListener(UUID itemID); | 146 | void DeleteListener(UUID itemID); |
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs index 9c781e1..ee7c4ec 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs | |||
@@ -36,7 +36,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
36 | /// Generate a map tile for the scene. a terrain texture for this scene | 36 | /// Generate a map tile for the scene. a terrain texture for this scene |
37 | /// </summary> | 37 | /// </summary> |
38 | void GenerateMaptile(); | 38 | void GenerateMaptile(); |
39 | List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag); | 39 | void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag); |
40 | MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag); | ||
41 | } | 40 | } |
42 | } | 41 | } |