aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Interfaces
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Interfaces
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Region/Environment/Interfaces')
-rw-r--r--OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs8
-rw-r--r--OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs16
-rw-r--r--OpenSim/Region/Environment/Interfaces/IEmailModule.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs4
-rw-r--r--OpenSim/Region/Environment/Interfaces/IEstateModule.cs4
-rw-r--r--OpenSim/Region/Environment/Interfaces/IHttpRequests.cs10
-rw-r--r--OpenSim/Region/Environment/Interfaces/IInventoryModule.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ILandChannel.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ILandObject.cs18
-rw-r--r--OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs20
-rw-r--r--OpenSim/Region/Environment/Interfaces/IScriptModule.cs4
-rw-r--r--OpenSim/Region/Environment/Interfaces/IWorldComm.cs16
-rw-r--r--OpenSim/Region/Environment/Interfaces/IXMLRPC.cs16
14 files changed, 70 insertions, 70 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs
index c099fa1..90d1c12 100644
--- a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs
@@ -25,20 +25,20 @@
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
28using libsecondlife; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Environment.Interfaces
32{ 32{
33 public interface IAgentAssetTransactions 33 public interface IAgentAssetTransactions
34 { 34 {
35 void HandleItemUpdateFromTransaction(IClientAPI remoteClient, LLUUID transactionID, 35 void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID,
36 InventoryItemBase item); 36 InventoryItemBase item);
37 37
38 void HandleItemCreationFromTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID, 38 void HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID,
39 uint callbackID, string description, string name, sbyte invType, 39 uint callbackID, string description, string name, sbyte invType,
40 sbyte type, byte wearableType, uint nextOwnerMask); 40 sbyte type, byte wearableType, uint nextOwnerMask);
41 41
42 void RemoveAgentAssetTransactions(LLUUID userID); 42 void RemoveAgentAssetTransactions(UUID userID);
43 } 43 }
44} 44}
diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
index d03e167..a722833 100644
--- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
@@ -25,7 +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
28using libsecondlife; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
31 31
@@ -33,7 +33,7 @@ namespace OpenSim.Region.Environment.Interfaces
33{ 33{
34 public interface IAvatarFactory 34 public interface IAvatarFactory
35 { 35 {
36 bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance); 36 bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance);
37 void UpdateDatabase(LLUUID userID, AvatarAppearance avatAppearance); 37 void UpdateDatabase(UUID userID, AvatarAppearance avatAppearance);
38 } 38 }
39} 39}
diff --git a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs
index aeb47e1..c54c697 100644
--- a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs
+++ b/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs
@@ -26,22 +26,22 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Environment.Interfaces
32{ 32{
33 public interface IDynamicTextureManager 33 public interface IDynamicTextureManager
34 { 34 {
35 void RegisterRender(string handleType, IDynamicTextureRender render); 35 void RegisterRender(string handleType, IDynamicTextureRender render);
36 void ReturnData(LLUUID id, byte[] data); 36 void ReturnData(UUID id, byte[] data);
37 37
38 LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, string extraParams, 38 UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams,
39 int updateTimer); 39 int updateTimer);
40 LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, string extraParams, 40 UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams,
41 int updateTimer, bool SetBlending, byte AlphaValue); 41 int updateTimer, bool SetBlending, byte AlphaValue);
42 LLUUID AddDynamicTextureData(LLUUID simID, LLUUID primID, string contentType, string data, string extraParams, 42 UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams,
43 int updateTimer); 43 int updateTimer);
44 LLUUID AddDynamicTextureData(LLUUID simID, LLUUID primID, string contentType, string data, string extraParams, 44 UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams,
45 int updateTimer, bool SetBlending, byte AlphaValue); 45 int updateTimer, bool SetBlending, byte AlphaValue);
46 } 46 }
47 47
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Environment.Interfaces
52 bool SupportsAsynchronous(); 52 bool SupportsAsynchronous();
53 byte[] ConvertUrl(string url, string extraParams); 53 byte[] ConvertUrl(string url, string extraParams);
54 byte[] ConvertStream(Stream data, string extraParams); 54 byte[] ConvertStream(Stream data, string extraParams);
55 bool AsyncConvertUrl(LLUUID id, string url, string extraParams); 55 bool AsyncConvertUrl(UUID id, string url, string extraParams);
56 bool AsyncConvertData(LLUUID id, string bodyData, string extraParams); 56 bool AsyncConvertData(UUID id, string bodyData, string extraParams);
57 } 57 }
58} 58}
diff --git a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs b/OpenSim/Region/Environment/Interfaces/IEmailModule.cs
index 3726ba5..5f1bcf3 100644
--- a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IEmailModule.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using libsecondlife; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Environment.Interfaces
33{ 33{
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Interfaces
42 42
43 public interface IEmailModule : IRegionModule 43 public interface IEmailModule : IRegionModule
44 { 44 {
45 void SendEmail(LLUUID objectID, string address, string subject, string body); 45 void SendEmail(UUID objectID, string address, string subject, string body);
46 Email GetNextEmail(LLUUID objectID, string sender, string subject); 46 Email GetNextEmail(UUID objectID, string sender, string subject);
47 } 47 }
48} 48}
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs
index ecac2ca..f2d14a6 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using libsecondlife; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Environment.Interfaces
33{ 33{
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Interfaces
35 { 35 {
36 void Initialise(string connectstring); 36 void Initialise(string connectstring);
37 37
38 EstateSettings LoadEstateSettings(LLUUID regionID); 38 EstateSettings LoadEstateSettings(UUID regionID);
39 void StoreEstateSettings(EstateSettings es); 39 void StoreEstateSettings(EstateSettings es);
40 } 40 }
41} 41}
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
index bfe3591..70c5800 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
@@ -27,13 +27,13 @@
27 27
28using System; 28using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using libsecondlife; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Environment.Interfaces
33{ 33{
34 public interface IEstateModule : IRegionModule 34 public interface IEstateModule : IRegionModule
35 { 35 {
36 uint GetRegionFlags(); 36 uint GetRegionFlags();
37 bool IsManager(LLUUID avatarID); 37 bool IsManager(UUID avatarID);
38 } 38 }
39} 39}
diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
index 3a635de..216782b 100644
--- a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
@@ -26,17 +26,17 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; 30using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Environment.Interfaces
33{ 33{
34 public interface IHttpRequests 34 public interface IHttpRequests
35 { 35 {
36 LLUUID MakeHttpRequest(string url, string parameters, string body); 36 UUID MakeHttpRequest(string url, string parameters, string body);
37 LLUUID StartHttpRequest(uint localID, LLUUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body); 37 UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
38 void StopHttpRequest(uint m_localID, LLUUID m_itemID); 38 void StopHttpRequest(uint m_localID, UUID m_itemID);
39 HttpRequestClass GetNextCompletedRequest(); 39 HttpRequestClass GetNextCompletedRequest();
40 void RemoveCompletedRequest(LLUUID id); 40 void RemoveCompletedRequest(UUID id);
41 } 41 }
42} 42}
diff --git a/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs b/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs
index c93694a9..50f4af3 100644
--- a/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Region.Environment; 30using OpenSim.Region.Environment;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
32 32
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 /// </summary> 37 /// </summary>
38 public interface IInventoryModule 38 public interface IInventoryModule
39 { 39 {
40 void SetRootAgentScene(LLUUID agentID, Scene scene); 40 void SetRootAgentScene(UUID agentID, Scene scene);
41 bool NeedSceneCacheClear(LLUUID agentID, Scene scene); 41 bool NeedSceneCacheClear(UUID agentID, Scene scene);
42 } 42 }
43} 43}
diff --git a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
index c1f6f45..4a74949 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
32 32
@@ -35,13 +35,13 @@ namespace OpenSim.Region.Environment.Interfaces
35 public interface ILandChannel 35 public interface ILandChannel
36 { 36 {
37 37
38 List<ILandObject> ParcelsNearPoint(LLVector3 position); 38 List<ILandObject> ParcelsNearPoint(Vector3 position);
39 ILandObject GetLandObject(int x, int y); 39 ILandObject GetLandObject(int x, int y);
40 ILandObject GetLandObject(float x, float y); 40 ILandObject GetLandObject(float x, float y);
41 bool IsLandPrimCountTainted(); 41 bool IsLandPrimCountTainted();
42 bool IsForcefulBansAllowed(); 42 bool IsForcefulBansAllowed();
43 void UpdateLandObject(int localID, LandData data); 43 void UpdateLandObject(int localID, LandData data);
44 void ReturnObjectsInParcel(int localID, uint returnType, LLUUID[] agentIDs, LLUUID[] taskIDs, IClientAPI remoteClient); 44 void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient);
45 void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel); 45 void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
46 void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel); 46 void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
47 } 47 }
diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
index 750b387..96fa378 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandObject.cs
+++ b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
32 32
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Interfaces
42 42
43 LandData landData { get; set; } 43 LandData landData { get; set; }
44 bool[,] landBitmap { get; set; } 44 bool[,] landBitmap { get; set; }
45 LLUUID regionUUID { get; } 45 UUID regionUUID { get; }
46 bool containsPoint(int x, int y); 46 bool containsPoint(int x, int y);
47 ILandObject Copy(); 47 ILandObject Copy();
48 48
@@ -50,12 +50,12 @@ namespace OpenSim.Region.Environment.Interfaces
50 50
51 void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client); 51 void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client);
52 void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client); 52 void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client);
53 bool isEitherBannedOrRestricted(LLUUID avatar); 53 bool isEitherBannedOrRestricted(UUID avatar);
54 bool isBannedFromLand(LLUUID avatar); 54 bool isBannedFromLand(UUID avatar);
55 bool isRestrictedFromLand(LLUUID avatar); 55 bool isRestrictedFromLand(UUID avatar);
56 void sendLandUpdateToClient(IClientAPI remote_client); 56 void sendLandUpdateToClient(IClientAPI remote_client);
57 List<LLUUID> createAccessListArrayByFlag(ParcelManager.AccessList flag); 57 List<UUID> createAccessListArrayByFlag(ParcelManager.AccessList flag);
58 void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, IClientAPI remote_client); 58 void sendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
59 void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client); 59 void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);
60 void updateLandBitmapByteArray(); 60 void updateLandBitmapByteArray();
61 void setLandBitmapFromByteArray(); 61 void setLandBitmapFromByteArray();
@@ -71,11 +71,11 @@ namespace OpenSim.Region.Environment.Interfaces
71 void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client); 71 void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client);
72 void sendLandObjectOwners(IClientAPI remote_client); 72 void sendLandObjectOwners(IClientAPI remote_client);
73 void returnObject(SceneObjectGroup obj); 73 void returnObject(SceneObjectGroup obj);
74 void returnLandObjects(uint type, LLUUID[] owners, IClientAPI remote_client); 74 void returnLandObjects(uint type, UUID[] owners, IClientAPI remote_client);
75 void resetLandPrimCounts(); 75 void resetLandPrimCounts();
76 void addPrimToCount(SceneObjectGroup obj); 76 void addPrimToCount(SceneObjectGroup obj);
77 void removePrimFromCount(SceneObjectGroup obj); 77 void removePrimFromCount(SceneObjectGroup obj);
78 void updateLandSold(LLUUID avatarID, LLUUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area); 78 void updateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area);
79 79
80 void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel); 80 void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
81 void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel); 81 void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
index 4e716a2..5f10ec5 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
32 32
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Environment.Interfaces
46 /// </summary> 46 /// </summary>
47 /// <param name="obj"></param> 47 /// <param name="obj"></param>
48 /// <param name="regionUUID"></param> 48 /// <param name="regionUUID"></param>
49 void StoreObject(SceneObjectGroup obj, LLUUID regionUUID); 49 void StoreObject(SceneObjectGroup obj, UUID regionUUID);
50 50
51 /// <summary> 51 /// <summary>
52 /// Entirely removes the object, including inventory 52 /// Entirely removes the object, including inventory
@@ -54,25 +54,25 @@ namespace OpenSim.Region.Environment.Interfaces
54 /// <param name="uuid"></param> 54 /// <param name="uuid"></param>
55 /// <param name="regionUUID"></param> 55 /// <param name="regionUUID"></param>
56 /// <returns></returns> 56 /// <returns></returns>
57 void RemoveObject(LLUUID uuid, LLUUID regionUUID); 57 void RemoveObject(UUID uuid, UUID regionUUID);
58 58
59 /// <summary> 59 /// <summary>
60 /// Store a prim's inventory 60 /// Store a prim's inventory
61 /// </summary> 61 /// </summary>
62 /// <returns></returns> 62 /// <returns></returns>
63 void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items); 63 void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items);
64 64
65 List<SceneObjectGroup> LoadObjects(LLUUID regionUUID); 65 List<SceneObjectGroup> LoadObjects(UUID regionUUID);
66 66
67 void StoreTerrain(double[,] terrain, LLUUID regionID); 67 void StoreTerrain(double[,] terrain, UUID regionID);
68 double[,] LoadTerrain(LLUUID regionID); 68 double[,] LoadTerrain(UUID regionID);
69 69
70 void StoreLandObject(ILandObject Parcel); 70 void StoreLandObject(ILandObject Parcel);
71 void RemoveLandObject(LLUUID globalID); 71 void RemoveLandObject(UUID globalID);
72 List<LandData> LoadLandObjects(LLUUID regionUUID); 72 List<LandData> LoadLandObjects(UUID regionUUID);
73 73
74 void StoreRegionSettings(RegionSettings rs); 74 void StoreRegionSettings(RegionSettings rs);
75 RegionSettings LoadRegionSettings(LLUUID regionUUID); 75 RegionSettings LoadRegionSettings(UUID regionUUID);
76 76
77 void Shutdown(); 77 void Shutdown();
78 } 78 }
diff --git a/OpenSim/Region/Environment/Interfaces/IScriptModule.cs b/OpenSim/Region/Environment/Interfaces/IScriptModule.cs
index 8d3868e..efe7944 100644
--- a/OpenSim/Region/Environment/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IScriptModule.cs
@@ -27,12 +27,12 @@
27 27
28using System; 28using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using libsecondlife; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Environment.Interfaces
33{ 33{
34 public interface IScriptModule : IRegionModule 34 public interface IScriptModule : IRegionModule
35 { 35 {
36 bool GetScriptRunning(LLUUID objectID, LLUUID itemID); 36 bool GetScriptRunning(UUID objectID, UUID itemID);
37 } 37 }
38} 38}
diff --git a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs b/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
index c2a55eb..1a33450 100644
--- a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Modules.Scripting.WorldComm; 31using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
32 32
@@ -34,15 +34,15 @@ namespace OpenSim.Region.Environment.Interfaces
34{ 34{
35 public interface IWorldComm 35 public interface IWorldComm
36 { 36 {
37 int Listen(uint LocalID, LLUUID itemID, LLUUID hostID, int channel, string name, LLUUID id, string msg); 37 int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg);
38 void DeliverMessage(ChatTypeEnum type, int channel, string name, LLUUID id, string msg); 38 void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg);
39 bool HasMessages(); 39 bool HasMessages();
40 ListenerInfo GetNextMessage(); 40 ListenerInfo GetNextMessage();
41 void ListenControl(LLUUID itemID, int handle, int active); 41 void ListenControl(UUID itemID, int handle, int active);
42 void ListenRemove(LLUUID itemID, int handle); 42 void ListenRemove(UUID itemID, int handle);
43 void DeleteListener(LLUUID itemID); 43 void DeleteListener(UUID itemID);
44 Object[] GetSerializationData(LLUUID itemID); 44 Object[] GetSerializationData(UUID itemID);
45 void CreateFromData(uint localID, LLUUID itemID, LLUUID hostID, 45 void CreateFromData(uint localID, UUID itemID, UUID hostID,
46 Object[] data); 46 Object[] data);
47 } 47 }
48} 48}
diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
index a2c164f..88e9ab5 100644
--- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
@@ -25,24 +25,24 @@
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
28using libsecondlife; 28using OpenMetaverse;
29using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; 29using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Environment.Interfaces
32{ 32{
33 public interface IXMLRPC 33 public interface IXMLRPC
34 { 34 {
35 LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID, LLUUID channelID); 35 UUID OpenXMLRPCChannel(uint localID, UUID itemID, UUID channelID);
36 void CloseXMLRPCChannel(LLUUID channelKey); 36 void CloseXMLRPCChannel(UUID channelKey);
37 bool hasRequests(); 37 bool hasRequests();
38 void RemoteDataReply(string channel, string message_id, string sdata, int idata); 38 void RemoteDataReply(string channel, string message_id, string sdata, int idata);
39 bool IsEnabled(); 39 bool IsEnabled();
40 RPCRequestInfo GetNextCompletedRequest(); 40 RPCRequestInfo GetNextCompletedRequest();
41 void RemoveCompletedRequest(LLUUID id); 41 void RemoveCompletedRequest(UUID id);
42 void DeleteChannels(LLUUID itemID); 42 void DeleteChannels(UUID itemID);
43 LLUUID SendRemoteData(uint localID, LLUUID itemID, string channel, string dest, int idata, string sdata); 43 UUID SendRemoteData(uint localID, UUID itemID, string channel, string dest, int idata, string sdata);
44 SendRemoteDataRequest GetNextCompletedSRDRequest(); 44 SendRemoteDataRequest GetNextCompletedSRDRequest();
45 void RemoveCompletedSRDRequest(LLUUID id); 45 void RemoveCompletedSRDRequest(UUID id);
46 void CancelSRDRequests(LLUUID itemID); 46 void CancelSRDRequests(UUID itemID);
47 } 47 }
48} 48}