aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
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/Framework/Communications
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC-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/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs52
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs54
-rw-r--r--OpenSim/Framework/Communications/Cache/FileAssetClient.cs16
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs14
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs46
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs38
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs76
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSD.cs24
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs14
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs26
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs8
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs8
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs34
-rw-r--r--OpenSim/Framework/Communications/IAvatarService.cs6
-rw-r--r--OpenSim/Framework/Communications/IGridServices.cs4
-rw-r--r--OpenSim/Framework/Communications/IInterRegionCommunications.cs14
-rw-r--r--OpenSim/Framework/Communications/IInterServiceInventoryServices.cs6
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs8
-rw-r--r--OpenSim/Framework/Communications/ISecureInventoryService.cs22
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs40
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs58
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs32
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs28
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs68
31 files changed, 369 insertions, 365 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index e924b3f..3e88eba 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -29,14 +29,14 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading; 31using System.Threading;
32using libsecondlife; 32using OpenMetaverse;
33using libsecondlife.Packets; 33using OpenMetaverse.Packets;
34using log4net; 34using log4net;
35using OpenSim.Framework.Statistics; 35using OpenSim.Framework.Statistics;
36 36
37namespace OpenSim.Framework.Communications.Cache 37namespace OpenSim.Framework.Communications.Cache
38{ 38{
39 public delegate void AssetRequestCallback(LLUUID assetID, AssetBase asset); 39 public delegate void AssetRequestCallback(UUID assetID, AssetBase asset);
40 40
41 /// <summary> 41 /// <summary>
42 /// Manages local cache of assets and their sending to viewers. 42 /// Manages local cache of assets and their sending to viewers.
@@ -58,17 +58,17 @@ namespace OpenSim.Framework.Communications.Cache
58 /// <summary> 58 /// <summary>
59 /// The cache of assets. This does not include textures. 59 /// The cache of assets. This does not include textures.
60 /// </summary> 60 /// </summary>
61 private Dictionary<LLUUID, AssetInfo> Assets; 61 private Dictionary<UUID, AssetInfo> Assets;
62 62
63 /// <summary> 63 /// <summary>
64 /// The cache of textures. 64 /// The cache of textures.
65 /// </summary> 65 /// </summary>
66 private Dictionary<LLUUID, TextureImage> Textures; 66 private Dictionary<UUID, TextureImage> Textures;
67 67
68 /// <summary> 68 /// <summary>
69 /// Assets requests which are waiting for asset server data. This includes texture requests 69 /// Assets requests which are waiting for asset server data. This includes texture requests
70 /// </summary> 70 /// </summary>
71 private Dictionary<LLUUID, AssetRequest> RequestedAssets; 71 private Dictionary<UUID, AssetRequest> RequestedAssets;
72 72
73 /// <summary> 73 /// <summary>
74 /// Asset requests with data which are ready to be sent back to requesters. This includes textures. 74 /// Asset requests with data which are ready to be sent back to requesters. This includes textures.
@@ -78,7 +78,7 @@ namespace OpenSim.Framework.Communications.Cache
78 /// <summary> 78 /// <summary>
79 /// Until the asset request is fulfilled, each asset request is associated with a list of requesters 79 /// Until the asset request is fulfilled, each asset request is associated with a list of requesters
80 /// </summary> 80 /// </summary>
81 private Dictionary<LLUUID, AssetRequestsList> RequestLists; 81 private Dictionary<UUID, AssetRequestsList> RequestLists;
82 82
83 private readonly IAssetServer m_assetServer; 83 private readonly IAssetServer m_assetServer;
84 84
@@ -155,12 +155,12 @@ namespace OpenSim.Framework.Communications.Cache
155 /// </summary> 155 /// </summary>
156 private void Initialize() 156 private void Initialize()
157 { 157 {
158 Assets = new Dictionary<LLUUID, AssetInfo>(); 158 Assets = new Dictionary<UUID, AssetInfo>();
159 Textures = new Dictionary<LLUUID, TextureImage>(); 159 Textures = new Dictionary<UUID, TextureImage>();
160 AssetRequests = new List<AssetRequest>(); 160 AssetRequests = new List<AssetRequest>();
161 161
162 RequestedAssets = new Dictionary<LLUUID, AssetRequest>(); 162 RequestedAssets = new Dictionary<UUID, AssetRequest>();
163 RequestLists = new Dictionary<LLUUID, AssetRequestsList>(); 163 RequestLists = new Dictionary<UUID, AssetRequestsList>();
164 } 164 }
165 165
166 /// <summary> 166 /// <summary>
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.Communications.Cache
207 /// </summary> 207 /// </summary>
208 /// <param name="assetId"></param></param> 208 /// <param name="assetId"></param></param>
209 /// <returns></returns> 209 /// <returns></returns>
210 //private AssetBase GetCachedAsset(LLUUID assetId) 210 //private AssetBase GetCachedAsset(UUID assetId)
211 //{ 211 //{
212 // AssetBase asset = null; 212 // AssetBase asset = null;
213 213
@@ -223,7 +223,7 @@ namespace OpenSim.Framework.Communications.Cache
223 // return asset; 223 // return asset;
224 //} 224 //}
225 225
226 private bool TryGetCachedAsset(LLUUID assetId, out AssetBase asset) 226 private bool TryGetCachedAsset(UUID assetId, out AssetBase asset)
227 { 227 {
228 if (Textures.ContainsKey(assetId)) 228 if (Textures.ContainsKey(assetId))
229 { 229 {
@@ -248,7 +248,7 @@ namespace OpenSim.Framework.Communications.Cache
248 /// A callback invoked when the asset has either been found or not found. 248 /// A callback invoked when the asset has either been found or not found.
249 /// If the asset was found this is called with the asset UUID and the asset data 249 /// If the asset was found this is called with the asset UUID and the asset data
250 /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param> 250 /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param>
251 public void GetAsset(LLUUID assetId, AssetRequestCallback callback, bool isTexture) 251 public void GetAsset(UUID assetId, AssetRequestCallback callback, bool isTexture)
252 { 252 {
253 //m_log.DebugFormat("[ASSET CACHE]: Requesting {0} {1}", isTexture ? "texture" : "asset", assetId); 253 //m_log.DebugFormat("[ASSET CACHE]: Requesting {0} {1}", isTexture ? "texture" : "asset", assetId);
254 254
@@ -308,7 +308,7 @@ namespace OpenSim.Framework.Communications.Cache
308 /// <param name="assetID"></param> 308 /// <param name="assetID"></param>
309 /// <param name="isTexture"></param> 309 /// <param name="isTexture"></param>
310 /// <returns>null if the asset could not be retrieved</returns> 310 /// <returns>null if the asset could not be retrieved</returns>
311 public AssetBase GetAsset(LLUUID assetID, bool isTexture) 311 public AssetBase GetAsset(UUID assetID, bool isTexture)
312 { 312 {
313 // I'm not going over 3 seconds since this will be blocking processing of all the other inbound 313 // I'm not going over 3 seconds since this will be blocking processing of all the other inbound
314 // packets from the client. 314 // packets from the client.
@@ -390,7 +390,7 @@ namespace OpenSim.Framework.Communications.Cache
390 /// this is a stop gap measure until we have such a thing. 390 /// this is a stop gap measure until we have such a thing.
391 /// </summary> 391 /// </summary>
392 392
393 public void ExpireAsset(LLUUID uuid) 393 public void ExpireAsset(UUID uuid)
394 { 394 {
395 // uuid is unique, so no need to worry about it showing up 395 // uuid is unique, so no need to worry about it showing up
396 // in the 2 caches differently. Also, locks are probably 396 // in the 2 caches differently. Also, locks are probably
@@ -495,7 +495,7 @@ namespace OpenSim.Framework.Communications.Cache
495 } 495 }
496 496
497 // See IAssetReceiver 497 // See IAssetReceiver
498 public void AssetNotFound(LLUUID assetID, bool IsTexture) 498 public void AssetNotFound(UUID assetID, bool IsTexture)
499 { 499 {
500 //m_log.WarnFormat("[ASSET CACHE]: AssetNotFound for {0}", assetID); 500 //m_log.WarnFormat("[ASSET CACHE]: AssetNotFound for {0}", assetID);
501 501
@@ -567,17 +567,17 @@ namespace OpenSim.Framework.Communications.Cache
567 /// <param name="transferRequest"></param> 567 /// <param name="transferRequest"></param>
568 public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest) 568 public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest)
569 { 569 {
570 LLUUID requestID = null; 570 UUID requestID = null;
571 byte source = 2; 571 byte source = 2;
572 if (transferRequest.TransferInfo.SourceType == 2) 572 if (transferRequest.TransferInfo.SourceType == 2)
573 { 573 {
574 //direct asset request 574 //direct asset request
575 requestID = new LLUUID(transferRequest.TransferInfo.Params, 0); 575 requestID = new UUID(transferRequest.TransferInfo.Params, 0);
576 } 576 }
577 else if (transferRequest.TransferInfo.SourceType == 3) 577 else if (transferRequest.TransferInfo.SourceType == 3)
578 { 578 {
579 //inventory asset request 579 //inventory asset request
580 requestID = new LLUUID(transferRequest.TransferInfo.Params, 80); 580 requestID = new UUID(transferRequest.TransferInfo.Params, 80);
581 source = 3; 581 source = 3;
582 //Console.WriteLine("asset request " + requestID); 582 //Console.WriteLine("asset request " + requestID);
583 } 583 }
@@ -678,10 +678,10 @@ namespace OpenSim.Framework.Communications.Cache
678 public class AssetRequest 678 public class AssetRequest
679 { 679 {
680 public IClientAPI RequestUser; 680 public IClientAPI RequestUser;
681 public LLUUID RequestAssetID; 681 public UUID RequestAssetID;
682 public AssetInfo AssetInf; 682 public AssetInfo AssetInf;
683 public TextureImage ImageInfo; 683 public TextureImage ImageInfo;
684 public LLUUID TransferRequestID; 684 public UUID TransferRequestID;
685 public long DataPointer = 0; 685 public long DataPointer = 0;
686 public int NumPackets = 0; 686 public int NumPackets = 0;
687 public int PacketCounter = 0; 687 public int PacketCounter = 0;
@@ -731,10 +731,10 @@ namespace OpenSim.Framework.Communications.Cache
731 731
732 public class AssetRequestsList 732 public class AssetRequestsList
733 { 733 {
734 public LLUUID AssetID; 734 public UUID AssetID;
735 public List<NewAssetRequest> Requests = new List<NewAssetRequest>(); 735 public List<NewAssetRequest> Requests = new List<NewAssetRequest>();
736 736
737 public AssetRequestsList(LLUUID assetID) 737 public AssetRequestsList(UUID assetID)
738 { 738 {
739 AssetID = assetID; 739 AssetID = assetID;
740 } 740 }
@@ -742,10 +742,10 @@ namespace OpenSim.Framework.Communications.Cache
742 742
743 public class NewAssetRequest 743 public class NewAssetRequest
744 { 744 {
745 public LLUUID AssetID; 745 public UUID AssetID;
746 public AssetRequestCallback Callback; 746 public AssetRequestCallback Callback;
747 747
748 public NewAssetRequest(LLUUID assetID, AssetRequestCallback callback) 748 public NewAssetRequest(UUID assetID, AssetRequestCallback callback)
749 { 749 {
750 AssetID = assetID; 750 AssetID = assetID;
751 Callback = callback; 751 Callback = callback;
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 2c8e685..9f4f480 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Threading; 30using System.Threading;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework.AssetLoader.Filesystem; 33using OpenSim.Framework.AssetLoader.Filesystem;
34using OpenSim.Framework.Statistics; 34using OpenSim.Framework.Statistics;
@@ -146,7 +146,7 @@ namespace OpenSim.Framework.Communications.Cache
146 m_receiver = receiver; 146 m_receiver = receiver;
147 } 147 }
148 148
149 public void RequestAsset(LLUUID assetID, bool isTexture) 149 public void RequestAsset(UUID assetID, bool isTexture)
150 { 150 {
151 AssetRequest req = new AssetRequest(); 151 AssetRequest req = new AssetRequest();
152 req.AssetID = assetID; 152 req.AssetID = assetID;
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 8e3be81..339bb31 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -30,24 +30,24 @@ using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading; 31using System.Threading;
32 32
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35 35
36namespace OpenSim.Framework.Communications.Cache 36namespace OpenSim.Framework.Communications.Cache
37{ 37{
38 internal delegate void AddItemDelegate(InventoryItemBase itemInfo); 38 internal delegate void AddItemDelegate(InventoryItemBase itemInfo);
39 internal delegate void UpdateItemDelegate(InventoryItemBase itemInfo); 39 internal delegate void UpdateItemDelegate(InventoryItemBase itemInfo);
40 internal delegate void DeleteItemDelegate(LLUUID itemID); 40 internal delegate void DeleteItemDelegate(UUID itemID);
41 41
42 internal delegate void CreateFolderDelegate(string folderName, LLUUID folderID, ushort folderType, LLUUID parentID); 42 internal delegate void CreateFolderDelegate(string folderName, UUID folderID, ushort folderType, UUID parentID);
43 internal delegate void MoveFolderDelegate(LLUUID folderID, LLUUID parentID); 43 internal delegate void MoveFolderDelegate(UUID folderID, UUID parentID);
44 internal delegate void PurgeFolderDelegate(LLUUID folderID); 44 internal delegate void PurgeFolderDelegate(UUID folderID);
45 internal delegate void UpdateFolderDelegate(string name, LLUUID folderID, ushort type, LLUUID parentID); 45 internal delegate void UpdateFolderDelegate(string name, UUID folderID, ushort type, UUID parentID);
46 46
47 internal delegate void SendInventoryDescendentsDelegate( 47 internal delegate void SendInventoryDescendentsDelegate(
48 IClientAPI client, LLUUID folderID, bool fetchFolders, bool fetchItems); 48 IClientAPI client, UUID folderID, bool fetchFolders, bool fetchItems);
49 49
50 public delegate void OnItemReceivedDelegate(LLUUID itemID); 50 public delegate void OnItemReceivedDelegate(UUID itemID);
51 51
52 /// <summary> 52 /// <summary>
53 /// Stores user profile and inventory data received from backend services for a particular user. 53 /// Stores user profile and inventory data received from backend services for a particular user.
@@ -84,12 +84,12 @@ namespace OpenSim.Framework.Communications.Cache
84 public InventoryFolderImpl RootFolder { get { return m_rootFolder; } } 84 public InventoryFolderImpl RootFolder { get { return m_rootFolder; } }
85 private InventoryFolderImpl m_rootFolder; 85 private InventoryFolderImpl m_rootFolder;
86 86
87 public LLUUID SessionID 87 public UUID SessionID
88 { 88 {
89 get { return m_session_id; } 89 get { return m_session_id; }
90 set { m_session_id = value; } 90 set { m_session_id = value; }
91 } 91 }
92 private LLUUID m_session_id = LLUUID.Zero; 92 private UUID m_session_id = UUID.Zero;
93 93
94 /// <summary> 94 /// <summary>
95 /// Constructor 95 /// Constructor
@@ -127,9 +127,9 @@ namespace OpenSim.Framework.Communications.Cache
127 /// Helper function for InventoryReceive() - Store a folder temporarily until we've received entire folder list 127 /// Helper function for InventoryReceive() - Store a folder temporarily until we've received entire folder list
128 /// </summary> 128 /// </summary>
129 /// <param name="folder"></param> 129 /// <param name="folder"></param>
130 private void AddFolderToDictionary(InventoryFolderImpl folder, IDictionary<LLUUID, IList<InventoryFolderImpl>> dictionary) 130 private void AddFolderToDictionary(InventoryFolderImpl folder, IDictionary<UUID, IList<InventoryFolderImpl>> dictionary)
131 { 131 {
132 LLUUID parentFolderId = folder.ParentID; 132 UUID parentFolderId = folder.ParentID;
133 133
134 if (dictionary.ContainsKey(parentFolderId)) 134 if (dictionary.ContainsKey(parentFolderId))
135 dictionary[parentFolderId].Add(folder); 135 dictionary[parentFolderId].Add(folder);
@@ -148,9 +148,9 @@ namespace OpenSim.Framework.Communications.Cache
148 /// heirarchy 148 /// heirarchy
149 /// </summary> 149 /// </summary>
150 /// <param name="parentId"> 150 /// <param name="parentId">
151 /// A <see cref="LLUUID"/> 151 /// A <see cref="UUID"/>
152 /// </param> 152 /// </param>
153 private void ResolveReceivedFolders(InventoryFolderImpl parentFolder, IDictionary<LLUUID, IList<InventoryFolderImpl>> folderDictionary) 153 private void ResolveReceivedFolders(InventoryFolderImpl parentFolder, IDictionary<UUID, IList<InventoryFolderImpl>> folderDictionary)
154 { 154 {
155 if (folderDictionary.ContainsKey(parentFolder.ID)) 155 if (folderDictionary.ContainsKey(parentFolder.ID))
156 { 156 {
@@ -208,19 +208,19 @@ namespace OpenSim.Framework.Communications.Cache
208 try 208 try
209 { 209 {
210 // collection of all received folders, indexed by their parent ID 210 // collection of all received folders, indexed by their parent ID
211 IDictionary<LLUUID, IList<InventoryFolderImpl>> receivedFolders = 211 IDictionary<UUID, IList<InventoryFolderImpl>> receivedFolders =
212 new Dictionary<LLUUID, IList<InventoryFolderImpl>>(); 212 new Dictionary<UUID, IList<InventoryFolderImpl>>();
213 213
214 // Take all received folders, find the root folder, and put ther rest into 214 // Take all received folders, find the root folder, and put ther rest into
215 // the pendingCategorizationFolders collection 215 // the pendingCategorizationFolders collection
216 foreach (InventoryFolderImpl folder in folders) 216 foreach (InventoryFolderImpl folder in folders)
217 AddFolderToDictionary(folder, receivedFolders); 217 AddFolderToDictionary(folder, receivedFolders);
218 218
219 if (!receivedFolders.ContainsKey(LLUUID.Zero)) 219 if (!receivedFolders.ContainsKey(UUID.Zero))
220 throw new Exception("Database did not return a root inventory folder"); 220 throw new Exception("Database did not return a root inventory folder");
221 else 221 else
222 { 222 {
223 IList<InventoryFolderImpl> rootFolderList = receivedFolders[LLUUID.Zero]; 223 IList<InventoryFolderImpl> rootFolderList = receivedFolders[UUID.Zero];
224 m_rootFolder = rootFolderList[0]; 224 m_rootFolder = rootFolderList[0];
225 if (rootFolderList.Count > 1) 225 if (rootFolderList.Count > 1)
226 { 226 {
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Communications.Cache
231 rootFolderList[i].ID, RootFolder.ID); 231 rootFolderList[i].ID, RootFolder.ID);
232 } 232 }
233 } 233 }
234 receivedFolders.Remove(LLUUID.Zero); 234 receivedFolders.Remove(UUID.Zero);
235 } 235 }
236 236
237 // Now take the pendingCategorizationFolders collection, and turn that into a tree, 237 // Now take the pendingCategorizationFolders collection, and turn that into a tree,
@@ -240,7 +240,7 @@ namespace OpenSim.Framework.Communications.Cache
240 ResolveReceivedFolders(RootFolder, receivedFolders); 240 ResolveReceivedFolders(RootFolder, receivedFolders);
241 241
242 // Generate a warning for folders that are not part of the heirarchy 242 // Generate a warning for folders that are not part of the heirarchy
243 foreach (KeyValuePair<LLUUID, IList<InventoryFolderImpl>> folderList in receivedFolders) 243 foreach (KeyValuePair<UUID, IList<InventoryFolderImpl>> folderList in receivedFolders)
244 { 244 {
245 foreach (InventoryFolderImpl folder in folderList.Value) 245 foreach (InventoryFolderImpl folder in folderList.Value)
246 m_log.WarnFormat("[INVENTORY CACHE]: Malformed Database: Unresolved Pending Folder {0}", folder.Name); 246 m_log.WarnFormat("[INVENTORY CACHE]: Malformed Database: Unresolved Pending Folder {0}", folder.Name);
@@ -314,7 +314,7 @@ namespace OpenSim.Framework.Communications.Cache
314 /// </summary> 314 /// </summary>
315 /// <param name="parentID"></param> 315 /// <param name="parentID"></param>
316 /// <returns></returns> 316 /// <returns></returns>
317 public bool CreateFolder(string folderName, LLUUID folderID, ushort folderType, LLUUID parentID) 317 public bool CreateFolder(string folderName, UUID folderID, ushort folderType, UUID parentID)
318 { 318 {
319 // m_log.DebugFormat( 319 // m_log.DebugFormat(
320 // "[AGENT INVENTORY]: Creating inventory folder {0} {1} for {2} {3}", folderID, folderName, remoteClient.Name, remoteClient.AgentId); 320 // "[AGENT INVENTORY]: Creating inventory folder {0} {1} for {2} {3}", folderID, folderName, remoteClient.Name, remoteClient.AgentId);
@@ -389,7 +389,7 @@ namespace OpenSim.Framework.Communications.Cache
389 /// <param name="type"></param> 389 /// <param name="type"></param>
390 /// <param name="name"></param> 390 /// <param name="name"></param>
391 /// <param name="parentID"></param> 391 /// <param name="parentID"></param>
392 public bool UpdateFolder(string name, LLUUID folderID, ushort type, LLUUID parentID) 392 public bool UpdateFolder(string name, UUID folderID, ushort type, UUID parentID)
393 { 393 {
394 // m_log.DebugFormat( 394 // m_log.DebugFormat(
395 // "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId); 395 // "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId);
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Communications.Cache
440 /// 440 ///
441 /// <param name="folderID"></param> 441 /// <param name="folderID"></param>
442 /// <param name="parentID"></param> 442 /// <param name="parentID"></param>
443 public bool MoveFolder(LLUUID folderID, LLUUID parentID) 443 public bool MoveFolder(UUID folderID, UUID parentID)
444 { 444 {
445 // m_log.DebugFormat( 445 // m_log.DebugFormat(
446 // "[AGENT INVENTORY]: Moving inventory folder {0} into folder {1} for {2} {3}", 446 // "[AGENT INVENTORY]: Moving inventory folder {0} into folder {1} for {2} {3}",
@@ -487,7 +487,7 @@ namespace OpenSim.Framework.Communications.Cache
487 /// </summary> 487 /// </summary>
488 /// 488 ///
489 /// <param name="folderID"></param> 489 /// <param name="folderID"></param>
490 public bool PurgeFolder(LLUUID folderID) 490 public bool PurgeFolder(UUID folderID)
491 { 491 {
492 // m_log.InfoFormat("[AGENT INVENTORY]: Purging folder {0} for {1} uuid {2}", 492 // m_log.InfoFormat("[AGENT INVENTORY]: Purging folder {0} for {1} uuid {2}",
493 // folderID, remoteClient.Name, remoteClient.AgentId); 493 // folderID, remoteClient.Name, remoteClient.AgentId);
@@ -542,7 +542,7 @@ namespace OpenSim.Framework.Communications.Cache
542 { 542 {
543 if (m_hasReceivedInventory) 543 if (m_hasReceivedInventory)
544 { 544 {
545 if (item.Folder == LLUUID.Zero) 545 if (item.Folder == UUID.Zero)
546 { 546 {
547 InventoryFolderImpl f = FindFolderForType(item.AssetType); 547 InventoryFolderImpl f = FindFolderForType(item.AssetType);
548 if (f != null) 548 if (f != null)
@@ -607,7 +607,7 @@ namespace OpenSim.Framework.Communications.Cache
607 /// true on a successful delete or a if the request is queued. 607 /// true on a successful delete or a if the request is queued.
608 /// Returns false on an immediate failure 608 /// Returns false on an immediate failure
609 /// </returns> 609 /// </returns>
610 public bool DeleteItem(LLUUID itemID) 610 public bool DeleteItem(UUID itemID)
611 { 611 {
612 if (m_hasReceivedInventory) 612 if (m_hasReceivedInventory)
613 { 613 {
@@ -655,7 +655,7 @@ namespace OpenSim.Framework.Communications.Cache
655 /// <param name="fetchFolders"></param> 655 /// <param name="fetchFolders"></param>
656 /// <param name="fetchItems"></param> 656 /// <param name="fetchItems"></param>
657 /// <returns>true if the request was queued or successfully processed, false otherwise</returns> 657 /// <returns>true if the request was queued or successfully processed, false otherwise</returns>
658 public bool SendInventoryDecendents(IClientAPI client, LLUUID folderID, bool fetchFolders, bool fetchItems) 658 public bool SendInventoryDecendents(IClientAPI client, UUID folderID, bool fetchFolders, bool fetchItems)
659 { 659 {
660 if (m_hasReceivedInventory) 660 if (m_hasReceivedInventory)
661 { 661 {
diff --git a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs
index 3c74d4d..e793feb 100644
--- a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs
@@ -18,11 +18,13 @@ namespace OpenSim.Framework.Communications.Cache
18 } 18 }
19 public override void StoreAsset(AssetBase asset) 19 public override void StoreAsset(AssetBase asset)
20 { 20 {
21 string cdir = m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0] 21 byte[] idBytes = asset.FullID.Guid.ToByteArray();
22 + Path.DirectorySeparatorChar + asset.FullID.Data[1];
23 22
24 if (!Directory.Exists(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0])) 23 string cdir = m_dir + Path.DirectorySeparatorChar + idBytes[0]
25 Directory.CreateDirectory(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0]); 24 + Path.DirectorySeparatorChar + idBytes[1];
25
26 if (!Directory.Exists(m_dir + Path.DirectorySeparatorChar + idBytes[0]))
27 Directory.CreateDirectory(m_dir + Path.DirectorySeparatorChar + idBytes[0]);
26 28
27 if (!Directory.Exists(cdir)) 29 if (!Directory.Exists(cdir))
28 Directory.CreateDirectory(cdir); 30 Directory.CreateDirectory(cdir);
@@ -41,8 +43,10 @@ namespace OpenSim.Framework.Communications.Cache
41 43
42 protected override AssetBase GetAsset(AssetRequest req) 44 protected override AssetBase GetAsset(AssetRequest req)
43 { 45 {
44 string cdir = m_dir + Path.DirectorySeparatorChar + req.AssetID.Data[0] 46 byte[] idBytes = req.AssetID.Guid.ToByteArray();
45 + Path.DirectorySeparatorChar + req.AssetID.Data[1]; 47
48 string cdir = m_dir + Path.DirectorySeparatorChar + idBytes[0]
49 + Path.DirectorySeparatorChar + idBytes[1];
46 if (File.Exists(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml")) 50 if (File.Exists(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml"))
47 { 51 {
48 FileStream x = File.OpenRead(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml"); 52 FileStream x = File.OpenRead(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml");
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 61cfc1a..debcbfb 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using OpenMetaverse;
31//using System.Reflection; 31//using System.Reflection;
32 32
33//using log4net; 33//using log4net;
@@ -43,12 +43,12 @@ namespace OpenSim.Framework.Communications.Cache
43 /// <summary> 43 /// <summary>
44 /// Items that are contained in this folder 44 /// Items that are contained in this folder
45 /// </summary> 45 /// </summary>
46 public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); 46 public Dictionary<UUID, InventoryItemBase> Items = new Dictionary<UUID, InventoryItemBase>();
47 47
48 /// <summary> 48 /// <summary>
49 /// Child folders that are contained in this folder 49 /// Child folders that are contained in this folder
50 /// </summary> 50 /// </summary>
51 public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>(); 51 public Dictionary<UUID, InventoryFolderImpl> SubFolders = new Dictionary<UUID, InventoryFolderImpl>();
52 52
53 // Constructors 53 // Constructors
54 public InventoryFolderImpl(InventoryFolderBase folderbase) 54 public InventoryFolderImpl(InventoryFolderBase folderbase)
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Cache
72 /// <param name="folderName"></param> 72 /// <param name="folderName"></param>
73 /// <param name="type"></param> 73 /// <param name="type"></param>
74 /// <returns>The newly created subfolder. Returns null if the folder already exists</returns> 74 /// <returns>The newly created subfolder. Returns null if the folder already exists</returns>
75 public InventoryFolderImpl CreateChildFolder(LLUUID folderID, string folderName, ushort type) 75 public InventoryFolderImpl CreateChildFolder(UUID folderID, string folderName, ushort type)
76 { 76 {
77 lock (SubFolders) 77 lock (SubFolders)
78 { 78 {
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Communications.Cache
112 /// </summary> 112 /// </summary>
113 /// <param name="itemID"></param> 113 /// <param name="itemID"></param>
114 /// <returns>null if the item is not found</returns> 114 /// <returns>null if the item is not found</returns>
115 public InventoryItemBase FindItem(LLUUID itemID) 115 public InventoryItemBase FindItem(UUID itemID)
116 { 116 {
117 lock (Items) 117 lock (Items)
118 { 118 {
@@ -143,7 +143,7 @@ namespace OpenSim.Framework.Communications.Cache
143 /// </summary> 143 /// </summary>
144 /// <param name="folderID"></param> 144 /// <param name="folderID"></param>
145 /// <returns></returns> 145 /// <returns></returns>
146 public bool DeleteItem(LLUUID itemID) 146 public bool DeleteItem(UUID itemID)
147 { 147 {
148 bool found = false; 148 bool found = false;
149 149
@@ -177,7 +177,7 @@ namespace OpenSim.Framework.Communications.Cache
177 /// first. 177 /// first.
178 /// </summary> 178 /// </summary>
179 /// <returns>The requested folder if it exists, null if it does not.</returns> 179 /// <returns>The requested folder if it exists, null if it does not.</returns>
180 public InventoryFolderImpl FindFolder(LLUUID folderID) 180 public InventoryFolderImpl FindFolder(UUID folderID)
181 { 181 {
182 if (folderID == ID) 182 if (folderID == ID)
183 return this; 183 return this;
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 1ff6350..7e561b5 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using Nini.Config; 35using Nini.Config;
36 36
@@ -44,29 +44,29 @@ namespace OpenSim.Framework.Communications.Cache
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); 47 private UUID libOwner = new UUID("11111111-1111-0000-0000-000100bba000");
48 48
49 /// <summary> 49 /// <summary>
50 /// Holds the root library folder and all its descendents. This is really only used during inventory 50 /// Holds the root library folder and all its descendents. This is really only used during inventory
51 /// setup so that we don't have to repeatedly search the tree of library folders. 51 /// setup so that we don't have to repeatedly search the tree of library folders.
52 /// </summary> 52 /// </summary>
53 protected Dictionary<LLUUID, InventoryFolderImpl> libraryFolders 53 protected Dictionary<UUID, InventoryFolderImpl> libraryFolders
54 = new Dictionary<LLUUID, InventoryFolderImpl>(); 54 = new Dictionary<UUID, InventoryFolderImpl>();
55 55
56 public LibraryRootFolder() 56 public LibraryRootFolder()
57 { 57 {
58 m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); 58 m_log.Info("[LIBRARY INVENTORY]: Loading library inventory");
59 59
60 Owner = libOwner; 60 Owner = libOwner;
61 ID = new LLUUID("00000112-000f-0000-0000-000100bba000"); 61 ID = new UUID("00000112-000f-0000-0000-000100bba000");
62 Name = "OpenSim Library"; 62 Name = "OpenSim Library";
63 ParentID = LLUUID.Zero; 63 ParentID = UUID.Zero;
64 Type = (short) 8; 64 Type = (short) 8;
65 Version = (ushort) 1; 65 Version = (ushort) 1;
66 66
67 libraryFolders.Add(ID, this); 67 libraryFolders.Add(ID, this);
68 68
69 LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); 69 LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.Xml"));
70 70
71 // CreateLibraryItems(); 71 // CreateLibraryItems();
72 } 72 }
@@ -81,40 +81,40 @@ namespace OpenSim.Framework.Communications.Cache
81 //private void CreateLibraryItems() 81 //private void CreateLibraryItems()
82 //{ 82 //{
83 // InventoryItemBase item = 83 // InventoryItemBase item =
84 // CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), 84 // CreateItem(new UUID("66c41e39-38f9-f75a-024e-585989bfaba9"),
85 // new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", 85 // new UUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape",
86 // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); 86 // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID);
87 // item.inventoryCurrentPermissions = 0; 87 // item.inventoryCurrentPermissions = 0;
88 // item.inventoryNextPermissions = 0; 88 // item.inventoryNextPermissions = 0;
89 // Items.Add(item.inventoryID, item); 89 // Items.Add(item.inventoryID, item);
90 90
91 // item = 91 // item =
92 // CreateItem(new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"), 92 // CreateItem(new UUID("77c41e39-38f9-f75a-024e-585989bfabc9"),
93 // new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin", 93 // new UUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin",
94 // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); 94 // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID);
95 // item.inventoryCurrentPermissions = 0; 95 // item.inventoryCurrentPermissions = 0;
96 // item.inventoryNextPermissions = 0; 96 // item.inventoryNextPermissions = 0;
97 // Items.Add(item.inventoryID, item); 97 // Items.Add(item.inventoryID, item);
98 98
99 // item = 99 // item =
100 // CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"), 100 // CreateItem(new UUID("77c41e39-38f9-f75a-0000-585989bf0000"),
101 // new LLUUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt", 101 // new UUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt",
102 // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); 102 // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID);
103 // item.inventoryCurrentPermissions = 0; 103 // item.inventoryCurrentPermissions = 0;
104 // item.inventoryNextPermissions = 0; 104 // item.inventoryNextPermissions = 0;
105 // Items.Add(item.inventoryID, item); 105 // Items.Add(item.inventoryID, item);
106 106
107 // item = 107 // item =
108 // CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"), 108 // CreateItem(new UUID("77c41e39-38f9-f75a-0000-5859892f1111"),
109 // new LLUUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants", 109 // new UUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants",
110 // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); 110 // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID);
111 // item.inventoryCurrentPermissions = 0; 111 // item.inventoryCurrentPermissions = 0;
112 // item.inventoryNextPermissions = 0; 112 // item.inventoryNextPermissions = 0;
113 // Items.Add(item.inventoryID, item); 113 // Items.Add(item.inventoryID, item);
114 //} 114 //}
115 115
116 public InventoryItemBase CreateItem(LLUUID inventoryID, LLUUID assetID, string name, string description, 116 public InventoryItemBase CreateItem(UUID inventoryID, UUID assetID, string name, string description,
117 int assetType, int invType, LLUUID parentFolderID) 117 int assetType, int invType, UUID parentFolderID)
118 { 118 {
119 InventoryItemBase item = new InventoryItemBase(); 119 InventoryItemBase item = new InventoryItemBase();
120 item.Owner = libOwner; 120 item.Owner = libOwner;
@@ -173,9 +173,9 @@ namespace OpenSim.Framework.Communications.Cache
173 { 173 {
174 InventoryFolderImpl folderInfo = new InventoryFolderImpl(); 174 InventoryFolderImpl folderInfo = new InventoryFolderImpl();
175 175
176 folderInfo.ID = new LLUUID(config.GetString("folderID", ID.ToString())); 176 folderInfo.ID = new UUID(config.GetString("folderID", ID.ToString()));
177 folderInfo.Name = config.GetString("name", "unknown"); 177 folderInfo.Name = config.GetString("name", "unknown");
178 folderInfo.ParentID = new LLUUID(config.GetString("parentFolderID", ID.ToString())); 178 folderInfo.ParentID = new UUID(config.GetString("parentFolderID", ID.ToString()));
179 folderInfo.Type = (short)config.GetInt("type", 8); 179 folderInfo.Type = (short)config.GetInt("type", 8);
180 180
181 folderInfo.Owner = libOwner; 181 folderInfo.Owner = libOwner;
@@ -207,9 +207,9 @@ namespace OpenSim.Framework.Communications.Cache
207 InventoryItemBase item = new InventoryItemBase(); 207 InventoryItemBase item = new InventoryItemBase();
208 item.Owner = libOwner; 208 item.Owner = libOwner;
209 item.Creator = libOwner; 209 item.Creator = libOwner;
210 item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); 210 item.ID = new UUID(config.GetString("inventoryID", ID.ToString()));
211 item.AssetID = new LLUUID(config.GetString("assetID", item.ID.ToString())); 211 item.AssetID = new UUID(config.GetString("assetID", item.ID.ToString()));
212 item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); 212 item.Folder = new UUID(config.GetString("folderID", ID.ToString()));
213 item.Name = config.GetString("name", String.Empty); 213 item.Name = config.GetString("name", String.Empty);
214 item.Description = config.GetString("description", item.Name); 214 item.Description = config.GetString("description", item.Name);
215 item.InvType = config.GetInt("inventoryType", 0); 215 item.InvType = config.GetInt("inventoryType", 0);
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Communications.Cache
270 /// methods in the superclass 270 /// methods in the superclass
271 /// </summary> 271 /// </summary>
272 /// <returns></returns> 272 /// <returns></returns>
273 public Dictionary<LLUUID, InventoryFolderImpl> RequestSelfAndDescendentFolders() 273 public Dictionary<UUID, InventoryFolderImpl> RequestSelfAndDescendentFolders()
274 { 274 {
275 return libraryFolders; 275 return libraryFolders;
276 } 276 }
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 45f6c7e..3675053 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading; 31using System.Threading;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34 34
35namespace OpenSim.Framework.Communications.Cache 35namespace OpenSim.Framework.Communications.Cache
@@ -49,7 +49,7 @@ namespace OpenSim.Framework.Communications.Cache
49 /// <summary> 49 /// <summary>
50 /// Each user has a cached profile. 50 /// Each user has a cached profile.
51 /// </summary> 51 /// </summary>
52 private readonly Dictionary<LLUUID, CachedUserInfo> m_userProfiles = new Dictionary<LLUUID, CachedUserInfo>(); 52 private readonly Dictionary<UUID, CachedUserInfo> m_userProfiles = new Dictionary<UUID, CachedUserInfo>();
53 53
54 public readonly LibraryRootFolder libraryRoot = new LibraryRootFolder(); 54 public readonly LibraryRootFolder libraryRoot = new LibraryRootFolder();
55 55
@@ -63,9 +63,9 @@ namespace OpenSim.Framework.Communications.Cache
63 /// A new user has moved into a region in this instance so retrieve their profile from the user service. 63 /// A new user has moved into a region in this instance so retrieve their profile from the user service.
64 /// </summary> 64 /// </summary>
65 /// <param name="userID"></param> 65 /// <param name="userID"></param>
66 public void AddNewUser(LLUUID userID) 66 public void AddNewUser(UUID userID)
67 { 67 {
68 if (userID == LLUUID.Zero) 68 if (userID == UUID.Zero)
69 return; 69 return;
70 m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID); 70 m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID);
71 GetUserDetails(userID); 71 GetUserDetails(userID);
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Communications.Cache
76 /// </summary> 76 /// </summary>
77 /// <param name="userID"></param> 77 /// <param name="userID"></param>
78 /// <returns>true if the user was successfully removed, false otherwise</returns> 78 /// <returns>true if the user was successfully removed, false otherwise</returns>
79 public bool RemoveUser(LLUUID userId) 79 public bool RemoveUser(UUID userId)
80 { 80 {
81 lock (m_userProfiles) 81 lock (m_userProfiles)
82 { 82 {
@@ -99,7 +99,7 @@ namespace OpenSim.Framework.Communications.Cache
99 /// </summary> 99 /// </summary>
100 /// <param name="userID"></param> 100 /// <param name="userID"></param>
101 /// <param name="userInfo"></param> 101 /// <param name="userInfo"></param>
102 public void RequestInventoryForUser(LLUUID userID) 102 public void RequestInventoryForUser(UUID userID)
103 { 103 {
104 CachedUserInfo userInfo = GetUserDetails(userID); 104 CachedUserInfo userInfo = GetUserDetails(userID);
105 if (userInfo != null) 105 if (userInfo != null)
@@ -130,9 +130,9 @@ namespace OpenSim.Framework.Communications.Cache
130 /// </summary> 130 /// </summary>
131 /// <param name="userID"></param> 131 /// <param name="userID"></param>
132 /// <returns>null if no user details are found</returns> 132 /// <returns>null if no user details are found</returns>
133 public CachedUserInfo GetUserDetails(LLUUID userID) 133 public CachedUserInfo GetUserDetails(UUID userID)
134 { 134 {
135 if (userID == LLUUID.Zero) 135 if (userID == UUID.Zero)
136 return null; 136 return null;
137 137
138 lock (m_userProfiles) 138 lock (m_userProfiles)
@@ -164,9 +164,9 @@ namespace OpenSim.Framework.Communications.Cache
164 /// </summary> 164 /// </summary>
165 /// <param name="userID"></param> 165 /// <param name="userID"></param>
166 /// <param name="userData"></param> 166 /// <param name="userData"></param>
167 public void PreloadUserCache(LLUUID userID, UserProfileData userData) 167 public void PreloadUserCache(UUID userID, UserProfileData userData)
168 { 168 {
169 if (userID == LLUUID.Zero) 169 if (userID == UUID.Zero)
170 return; 170 return;
171 171
172 lock (m_userProfiles) 172 lock (m_userProfiles)
@@ -192,8 +192,8 @@ namespace OpenSim.Framework.Communications.Cache
192 /// <param name="folderType"></param> 192 /// <param name="folderType"></param>
193 /// <param name="folderName"></param> 193 /// <param name="folderName"></param>
194 /// <param name="parentID"></param> 194 /// <param name="parentID"></param>
195 public void HandleCreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, 195 public void HandleCreateInventoryFolder(IClientAPI remoteClient, UUID folderID, ushort folderType,
196 string folderName, LLUUID parentID) 196 string folderName, UUID parentID)
197 { 197 {
198 CachedUserInfo userProfile; 198 CachedUserInfo userProfile;
199 199
@@ -226,8 +226,8 @@ namespace OpenSim.Framework.Communications.Cache
226 /// <param name="type"></param> 226 /// <param name="type"></param>
227 /// <param name="name"></param> 227 /// <param name="name"></param>
228 /// <param name="parentID"></param> 228 /// <param name="parentID"></param>
229 public void HandleUpdateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort type, string name, 229 public void HandleUpdateInventoryFolder(IClientAPI remoteClient, UUID folderID, ushort type, string name,
230 LLUUID parentID) 230 UUID parentID)
231 { 231 {
232// m_log.DebugFormat( 232// m_log.DebugFormat(
233// "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId); 233// "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId);
@@ -257,7 +257,7 @@ namespace OpenSim.Framework.Communications.Cache
257 /// <param name="remoteClient"></param> 257 /// <param name="remoteClient"></param>
258 /// <param name="folderID"></param> 258 /// <param name="folderID"></param>
259 /// <param name="parentID"></param> 259 /// <param name="parentID"></param>
260 public void HandleMoveInventoryFolder(IClientAPI remoteClient, LLUUID folderID, LLUUID parentID) 260 public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID)
261 { 261 {
262 CachedUserInfo userProfile; 262 CachedUserInfo userProfile;
263 263
@@ -287,7 +287,7 @@ namespace OpenSim.Framework.Communications.Cache
287 /// <param name="fetchFolders"></param> 287 /// <param name="fetchFolders"></param>
288 /// <param name="fetchItems"></param> 288 /// <param name="fetchItems"></param>
289 /// <param name="sortOrder"></param> 289 /// <param name="sortOrder"></param>
290 public void HandleFetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, 290 public void HandleFetchInventoryDescendents(IClientAPI remoteClient, UUID folderID, UUID ownerID,
291 bool fetchFolders, bool fetchItems, int sortOrder) 291 bool fetchFolders, bool fetchItems, int sortOrder)
292 { 292 {
293 // FIXME MAYBE: We're not handling sortOrder! 293 // FIXME MAYBE: We're not handling sortOrder!
@@ -327,7 +327,7 @@ namespace OpenSim.Framework.Communications.Cache
327 /// <param name="fetchItems"></param> 327 /// <param name="fetchItems"></param>
328 /// <param name="sortOrder"></param> 328 /// <param name="sortOrder"></param>
329 /// <returns>null if the inventory look up failed</returns> 329 /// <returns>null if the inventory look up failed</returns>
330 public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, 330 public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
331 bool fetchFolders, bool fetchItems, int sortOrder) 331 bool fetchFolders, bool fetchItems, int sortOrder)
332 { 332 {
333// m_log.DebugFormat( 333// m_log.DebugFormat(
@@ -405,7 +405,7 @@ namespace OpenSim.Framework.Communications.Cache
405 /// </summary> 405 /// </summary>
406 /// <param name="remoteClient"></param> 406 /// <param name="remoteClient"></param>
407 /// <param name="folderID"></param> 407 /// <param name="folderID"></param>
408 public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, LLUUID folderID) 408 public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID)
409 { 409 {
410 CachedUserInfo userProfile; 410 CachedUserInfo userProfile;
411 411
@@ -426,7 +426,7 @@ namespace OpenSim.Framework.Communications.Cache
426 } 426 }
427 } 427 }
428 428
429 public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) 429 public void HandleFetchInventory(IClientAPI remoteClient, UUID itemID, UUID ownerID)
430 { 430 {
431 if (ownerID == libraryRoot.Owner) 431 if (ownerID == libraryRoot.Owner)
432 { 432 {
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a7486d6..e82a5e9 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
@@ -40,21 +40,21 @@ using OpenSim.Region.Interfaces;
40namespace OpenSim.Framework.Communications.Capabilities 40namespace OpenSim.Framework.Communications.Capabilities
41{ 41{
42 public delegate void UpLoadedAsset( 42 public delegate void UpLoadedAsset(
43 string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, 43 string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder,
44 byte[] data, string inventoryType, string assetType); 44 byte[] data, string inventoryType, string assetType);
45 45
46 public delegate LLUUID UpdateItem(LLUUID itemID, byte[] data); 46 public delegate UUID UpdateItem(UUID itemID, byte[] data);
47 47
48 public delegate void UpdateTaskScript(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data); 48 public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data);
49 49
50 public delegate void NewInventoryItem(LLUUID userID, InventoryItemBase item); 50 public delegate void NewInventoryItem(UUID userID, InventoryItemBase item);
51 51
52 public delegate LLUUID ItemUpdatedCallback(LLUUID userID, LLUUID itemID, byte[] data); 52 public delegate UUID ItemUpdatedCallback(UUID userID, UUID itemID, byte[] data);
53 53
54 public delegate void TaskScriptUpdatedCallback(LLUUID userID, LLUUID itemID, LLUUID primID, 54 public delegate void TaskScriptUpdatedCallback(UUID userID, UUID itemID, UUID primID,
55 bool isScriptRunning, byte[] data); 55 bool isScriptRunning, byte[] data);
56 56
57 public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, 57 public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
58 bool fetchFolders, bool fetchItems, int sortOrder); 58 bool fetchFolders, bool fetchItems, int sortOrder);
59 59
60 /// <summary> 60 /// <summary>
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Communications.Capabilities
62 /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want 62 /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want
63 /// to just pass the whole Scene into CAPS. 63 /// to just pass the whole Scene into CAPS.
64 /// </summary> 64 /// </summary>
65 public delegate IClientAPI GetClientDelegate(LLUUID agentID); 65 public delegate IClientAPI GetClientDelegate(UUID agentID);
66 66
67 public class Caps 67 public class Caps
68 { 68 {
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Communications.Capabilities
97 97
98 //private string eventQueue = "0100/"; 98 //private string eventQueue = "0100/";
99 private BaseHttpServer m_httpListener; 99 private BaseHttpServer m_httpListener;
100 private LLUUID m_agentID; 100 private UUID m_agentID;
101 private AssetCache m_assetCache; 101 private AssetCache m_assetCache;
102 private int m_eventQueueCount = 1; 102 private int m_eventQueueCount = 1;
103 private Queue<string> m_capsEventQueue = new Queue<string>(); 103 private Queue<string> m_capsEventQueue = new Queue<string>();
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Communications.Capabilities
113 public GetClientDelegate GetClient = null; 113 public GetClientDelegate GetClient = null;
114 114
115 public Caps(AssetCache assetCache, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, 115 public Caps(AssetCache assetCache, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath,
116 LLUUID agent, bool dumpAssetsToFile, string regionName) 116 UUID agent, bool dumpAssetsToFile, string regionName)
117 { 117 {
118 m_assetCache = assetCache; 118 m_assetCache = assetCache;
119 m_capsObjectPath = capsPath; 119 m_capsObjectPath = capsPath;
@@ -258,7 +258,7 @@ namespace OpenSim.Framework.Communications.Capabilities
258 Hashtable hash = new Hashtable(); 258 Hashtable hash = new Hashtable();
259 try 259 try
260 { 260 {
261 hash = (Hashtable)LLSD.LLSDDeserialize(Helpers.StringToField(request)); 261 hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
262 } 262 }
263 catch (LLSD.LLSDParseException pe) 263 catch (LLSD.LLSDParseException pe)
264 { 264 {
@@ -388,7 +388,7 @@ namespace OpenSim.Framework.Communications.Capabilities
388 llsdItem.permissions.creator_id = invItem.Creator; 388 llsdItem.permissions.creator_id = invItem.Creator;
389 llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions; 389 llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions;
390 llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions; 390 llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions;
391 llsdItem.permissions.group_id = LLUUID.Zero; 391 llsdItem.permissions.group_id = UUID.Zero;
392 llsdItem.permissions.group_mask = 0; 392 llsdItem.permissions.group_mask = 0;
393 llsdItem.permissions.is_owner_group = false; 393 llsdItem.permissions.is_owner_group = false;
394 llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions; 394 llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions;
@@ -423,7 +423,7 @@ namespace OpenSim.Framework.Communications.Capabilities
423 LLSDMapLayer mapLayer = new LLSDMapLayer(); 423 LLSDMapLayer mapLayer = new LLSDMapLayer();
424 mapLayer.Right = 5000; 424 mapLayer.Right = 5000;
425 mapLayer.Top = 5000; 425 mapLayer.Top = 5000;
426 mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006"); 426 mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006");
427 427
428 return mapLayer; 428 return mapLayer;
429 } 429 }
@@ -522,7 +522,7 @@ namespace OpenSim.Framework.Communications.Capabilities
522 m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName); 522 m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName);
523 //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param); 523 //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param);
524 524
525 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); 525 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
526 LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); 526 LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate();
527 LLSDHelpers.DeserialiseLLSDMap(hash, llsdUpdateRequest); 527 LLSDHelpers.DeserialiseLLSDMap(hash, llsdUpdateRequest);
528 528
@@ -573,8 +573,8 @@ namespace OpenSim.Framework.Communications.Capabilities
573 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 573 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
574 { 574 {
575 m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); 575 m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName);
576 //libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)libsecondlife.StructuredData.LLSDParser.DeserializeBinary(Helpers.StringToField(request)); 576 //OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request));
577 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); 577 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
578 LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); 578 LLSDItemUpdate llsdRequest = new LLSDItemUpdate();
579 LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); 579 LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
580 580
@@ -636,9 +636,9 @@ namespace OpenSim.Framework.Communications.Capabilities
636 string assetName = llsdRequest.name; 636 string assetName = llsdRequest.name;
637 string assetDes = llsdRequest.description; 637 string assetDes = llsdRequest.description;
638 string capsBase = "/CAPS/" + m_capsObjectPath; 638 string capsBase = "/CAPS/" + m_capsObjectPath;
639 LLUUID newAsset = LLUUID.Random(); 639 UUID newAsset = UUID.Random();
640 LLUUID newInvItem = LLUUID.Random(); 640 UUID newInvItem = UUID.Random();
641 LLUUID parentFolder = llsdRequest.folder_id; 641 UUID parentFolder = llsdRequest.folder_id;
642 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); 642 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
643 643
644 AssetUploader uploader = 644 AssetUploader uploader =
@@ -662,8 +662,8 @@ namespace OpenSim.Framework.Communications.Capabilities
662 /// <param name="assetID"></param> 662 /// <param name="assetID"></param>
663 /// <param name="inventoryItem"></param> 663 /// <param name="inventoryItem"></param>
664 /// <param name="data"></param> 664 /// <param name="data"></param>
665 public void UploadCompleteHandler(string assetName, string assetDescription, LLUUID assetID, 665 public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,
666 LLUUID inventoryItem, LLUUID parentFolder, byte[] data, string inventoryType, 666 UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
667 string assetType) 667 string assetType)
668 { 668 {
669 sbyte assType = 0; 669 sbyte assType = 0;
@@ -728,14 +728,14 @@ namespace OpenSim.Framework.Communications.Capabilities
728 /// <param name="itemID">Item to update</param> 728 /// <param name="itemID">Item to update</param>
729 /// <param name="data">New asset data</param> 729 /// <param name="data">New asset data</param>
730 /// <returns></returns> 730 /// <returns></returns>
731 public LLUUID ItemUpdated(LLUUID itemID, byte[] data) 731 public UUID ItemUpdated(UUID itemID, byte[] data)
732 { 732 {
733 if (ItemUpdatedCall != null) 733 if (ItemUpdatedCall != null)
734 { 734 {
735 return ItemUpdatedCall(m_agentID, itemID, data); 735 return ItemUpdatedCall(m_agentID, itemID, data);
736 } 736 }
737 737
738 return LLUUID.Zero; 738 return UUID.Zero;
739 } 739 }
740 740
741 /// <summary> 741 /// <summary>
@@ -745,7 +745,7 @@ namespace OpenSim.Framework.Communications.Capabilities
745 /// <param name="primID">Prim containing item to update</param> 745 /// <param name="primID">Prim containing item to update</param>
746 /// <param name="isScriptRunning">Signals whether the script to update is currently running</param> 746 /// <param name="isScriptRunning">Signals whether the script to update is currently running</param>
747 /// <param name="data">New asset data</param> 747 /// <param name="data">New asset data</param>
748 public void TaskScriptUpdated(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data) 748 public void TaskScriptUpdated(UUID itemID, UUID primID, bool isScriptRunning, byte[] data)
749 { 749 {
750 if (TaskScriptUpdatedCall != null) 750 if (TaskScriptUpdatedCall != null)
751 { 751 {
@@ -759,9 +759,9 @@ namespace OpenSim.Framework.Communications.Capabilities
759 private UpLoadedAsset handlerUpLoad = null; 759 private UpLoadedAsset handlerUpLoad = null;
760 760
761 private string uploaderPath = String.Empty; 761 private string uploaderPath = String.Empty;
762 private LLUUID newAssetID; 762 private UUID newAssetID;
763 private LLUUID inventoryItemID; 763 private UUID inventoryItemID;
764 private LLUUID parentFolder; 764 private UUID parentFolder;
765 private BaseHttpServer httpListener; 765 private BaseHttpServer httpListener;
766 private bool m_dumpAssetsToFile; 766 private bool m_dumpAssetsToFile;
767 private string m_assetName = String.Empty; 767 private string m_assetName = String.Empty;
@@ -770,8 +770,8 @@ namespace OpenSim.Framework.Communications.Capabilities
770 private string m_invType = String.Empty; 770 private string m_invType = String.Empty;
771 private string m_assetType = String.Empty; 771 private string m_assetType = String.Empty;
772 772
773 public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem, 773 public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem,
774 LLUUID parentFolderID, string invType, string assetType, string path, 774 UUID parentFolderID, string invType, string assetType, string path,
775 BaseHttpServer httpServer, bool dumpAssetsToFile) 775 BaseHttpServer httpServer, bool dumpAssetsToFile)
776 { 776 {
777 m_assetName = assetName; 777 m_assetName = assetName;
@@ -795,7 +795,7 @@ namespace OpenSim.Framework.Communications.Capabilities
795 /// <returns></returns> 795 /// <returns></returns>
796 public string uploaderCaps(byte[] data, string path, string param) 796 public string uploaderCaps(byte[] data, string path, string param)
797 { 797 {
798 LLUUID inv = inventoryItemID; 798 UUID inv = inventoryItemID;
799 string res = String.Empty; 799 string res = String.Empty;
800 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 800 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
801 uploadComplete.new_asset = newAssetID.ToString(); 801 uploadComplete.new_asset = newAssetID.ToString();
@@ -860,11 +860,11 @@ namespace OpenSim.Framework.Communications.Capabilities
860 private UpdateItem handlerUpdateItem = null; 860 private UpdateItem handlerUpdateItem = null;
861 861
862 private string uploaderPath = String.Empty; 862 private string uploaderPath = String.Empty;
863 private LLUUID inventoryItemID; 863 private UUID inventoryItemID;
864 private BaseHttpServer httpListener; 864 private BaseHttpServer httpListener;
865 private bool m_dumpAssetToFile; 865 private bool m_dumpAssetToFile;
866 866
867 public ItemUpdater(LLUUID inventoryItem, string path, BaseHttpServer httpServer, bool dumpAssetToFile) 867 public ItemUpdater(UUID inventoryItem, string path, BaseHttpServer httpServer, bool dumpAssetToFile)
868 { 868 {
869 m_dumpAssetToFile = dumpAssetToFile; 869 m_dumpAssetToFile = dumpAssetToFile;
870 870
@@ -882,10 +882,10 @@ namespace OpenSim.Framework.Communications.Capabilities
882 /// <returns></returns> 882 /// <returns></returns>
883 public string uploaderCaps(byte[] data, string path, string param) 883 public string uploaderCaps(byte[] data, string path, string param)
884 { 884 {
885 LLUUID inv = inventoryItemID; 885 UUID inv = inventoryItemID;
886 string res = String.Empty; 886 string res = String.Empty;
887 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 887 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
888 LLUUID assetID = LLUUID.Zero; 888 UUID assetID = UUID.Zero;
889 handlerUpdateItem = OnUpLoad; 889 handlerUpdateItem = OnUpLoad;
890 if (handlerUpdateItem != null) 890 if (handlerUpdateItem != null)
891 { 891 {
@@ -942,13 +942,13 @@ namespace OpenSim.Framework.Communications.Capabilities
942 private UpdateTaskScript handlerUpdateTaskScript = null; 942 private UpdateTaskScript handlerUpdateTaskScript = null;
943 943
944 private string uploaderPath = String.Empty; 944 private string uploaderPath = String.Empty;
945 private LLUUID inventoryItemID; 945 private UUID inventoryItemID;
946 private LLUUID primID; 946 private UUID primID;
947 private bool isScriptRunning; 947 private bool isScriptRunning;
948 private BaseHttpServer httpListener; 948 private BaseHttpServer httpListener;
949 private bool m_dumpAssetToFile; 949 private bool m_dumpAssetToFile;
950 950
951 public TaskInventoryScriptUpdater(LLUUID inventoryItemID, LLUUID primID, int isScriptRunning, 951 public TaskInventoryScriptUpdater(UUID inventoryItemID, UUID primID, int isScriptRunning,
952 string path, BaseHttpServer httpServer, bool dumpAssetToFile) 952 string path, BaseHttpServer httpServer, bool dumpAssetToFile)
953 { 953 {
954 m_dumpAssetToFile = dumpAssetToFile; 954 m_dumpAssetToFile = dumpAssetToFile;
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index aa9951c..44c4a05 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -32,7 +32,7 @@ using System.IO;
32using System.Security.Cryptography; 32using System.Security.Cryptography;
33using System.Text; 33using System.Text;
34using System.Xml; 34using System.Xml;
35using libsecondlife; 35using OpenMetaverse;
36 36
37namespace OpenSim.Framework.Communications.Capabilities 37namespace OpenSim.Framework.Communications.Capabilities
38{ 38{
@@ -158,9 +158,9 @@ namespace OpenSim.Framework.Communications.Capabilities
158 { 158 {
159 throw new Exception("ulong in LLSD is currently not implemented, fix me!"); 159 throw new Exception("ulong in LLSD is currently not implemented, fix me!");
160 } 160 }
161 else if (obj is LLUUID) 161 else if (obj is UUID)
162 { 162 {
163 LLUUID u = (LLUUID) obj; 163 UUID u = (UUID) obj;
164 writer.WriteStartElement(String.Empty, "uuid", String.Empty); 164 writer.WriteStartElement(String.Empty, "uuid", String.Empty);
165 writer.WriteString(u.ToString()); 165 writer.WriteString(u.ToString());
166 writer.WriteEndElement(); 166 writer.WriteEndElement();
@@ -294,11 +294,11 @@ namespace OpenSim.Framework.Communications.Capabilities
294 if (reader.IsEmptyElement) 294 if (reader.IsEmptyElement)
295 { 295 {
296 reader.Read(); 296 reader.Read();
297 return LLUUID.Zero; 297 return UUID.Zero;
298 } 298 }
299 299
300 reader.Read(); 300 reader.Read();
301 ret = new LLUUID(reader.ReadString().Trim()); 301 ret = new UUID(reader.ReadString().Trim());
302 break; 302 break;
303 } 303 }
304 case "string": 304 case "string":
@@ -476,9 +476,9 @@ namespace OpenSim.Framework.Communications.Capabilities
476 { 476 {
477 return GetSpaces(indent) + "- float " + obj.ToString() + "\n"; 477 return GetSpaces(indent) + "- float " + obj.ToString() + "\n";
478 } 478 }
479 else if (obj is LLUUID) 479 else if (obj is UUID)
480 { 480 {
481 return GetSpaces(indent) + "- uuid " + ((LLUUID) obj).ToString() + Environment.NewLine; 481 return GetSpaces(indent) + "- uuid " + ((UUID) obj).ToString() + Environment.NewLine;
482 } 482 }
483 else if (obj is Hashtable) 483 else if (obj is Hashtable)
484 { 484 {
@@ -509,7 +509,7 @@ namespace OpenSim.Framework.Communications.Capabilities
509 } 509 }
510 else if (obj is byte[]) 510 else if (obj is byte[])
511 { 511 {
512 return GetSpaces(indent) + "- binary\n" + Helpers.FieldToHexString((byte[]) obj, GetSpaces(indent)) + 512 return GetSpaces(indent) + "- binary\n" + Utils.BytesToHexString((byte[]) obj, GetSpaces(indent)) +
513 Environment.NewLine; 513 Environment.NewLine;
514 } 514 }
515 else 515 else
@@ -568,14 +568,14 @@ namespace OpenSim.Framework.Communications.Capabilities
568 } 568 }
569 case 'u': 569 case 'u':
570 { 570 {
571 if (llsd.Length < 17) throw new LLSDParseException("LLUUID value type with no value"); 571 if (llsd.Length < 17) throw new LLSDParseException("UUID value type with no value");
572 LLUUID value; 572 UUID value;
573 endPos = FindEnd(llsd, 1); 573 endPos = FindEnd(llsd, 1);
574 574
575 if (LLUUID.TryParse(llsd.Substring(1, endPos - 1), out value)) 575 if (UUID.TryParse(llsd.Substring(1, endPos - 1), out value))
576 return value; 576 return value;
577 else 577 else
578 throw new LLSDParseException("Failed to parse LLUUID value type"); 578 throw new LLSDParseException("Failed to parse UUID value type");
579 } 579 }
580 case 'b': 580 case 'b':
581 //byte[] value = new byte[llsd.Length - 1]; 581 //byte[] value = new byte[llsd.Length - 1];
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index 6c4db4b..680dcc8 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework.Communications.Capabilities 31namespace OpenSim.Framework.Communications.Capabilities
32{ 32{
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Communications.Capabilities
34 public class LLSDAssetUploadComplete 34 public class LLSDAssetUploadComplete
35 { 35 {
36 public string new_asset = String.Empty; 36 public string new_asset = String.Empty;
37 public LLUUID new_inventory_item = LLUUID.Zero; 37 public UUID new_inventory_item = UUID.Zero;
38 public string state = String.Empty; 38 public string state = String.Empty;
39 //public bool success = false; 39 //public bool success = false;
40 40
@@ -42,4 +42,4 @@ namespace OpenSim.Framework.Communications.Capabilities
42 { 42 {
43 } 43 }
44 } 44 }
45} \ No newline at end of file 45}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index 289cc93..5833b65 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework.Communications.Capabilities 31namespace OpenSim.Framework.Communications.Capabilities
32{ 32{
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Communications.Capabilities
35 { 35 {
36 public string asset_type = String.Empty; 36 public string asset_type = String.Empty;
37 public string description = String.Empty; 37 public string description = String.Empty;
38 public LLUUID folder_id = LLUUID.Zero; 38 public UUID folder_id = UUID.Zero;
39 public string inventory_type = String.Empty; 39 public string inventory_type = String.Empty;
40 public string name = String.Empty; 40 public string name = String.Empty;
41 41
@@ -43,4 +43,4 @@ namespace OpenSim.Framework.Communications.Capabilities
43 { 43 {
44 } 44 }
45 } 45 }
46} \ No newline at end of file 46}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
index 507f12b..b14bfdd 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
@@ -86,8 +86,8 @@ namespace OpenSim.Framework.Communications.Capabilities
86 writer.WriteString(fieldName); 86 writer.WriteString(fieldName);
87 writer.WriteEndElement(); 87 writer.WriteEndElement();
88 LLSD.LLSDWriteOne(writer, fieldValue); 88 LLSD.LLSDWriteOne(writer, fieldValue);
89 // libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( 89 // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
90 // writer, libsecondlife.StructuredData.LLSD.FromObject(fieldValue)); 90 // writer, OpenMetaverse.StructuredData.LLSD.FromObject(fieldValue));
91 } 91 }
92 } 92 }
93 writer.WriteEndElement(); 93 writer.WriteEndElement();
@@ -111,8 +111,8 @@ namespace OpenSim.Framework.Communications.Capabilities
111 else 111 else
112 { 112 {
113 LLSD.LLSDWriteOne(writer, obj); 113 LLSD.LLSDWriteOne(writer, obj);
114 //libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( 114 //OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
115 // writer, libsecondlife.StructuredData.LLSD.FromObject(obj)); 115 // writer, OpenMetaverse.StructuredData.LLSD.FromObject(obj));
116 } 116 }
117 } 117 }
118 118
@@ -133,12 +133,12 @@ namespace OpenSim.Framework.Communications.Capabilities
133 FieldInfo field = myType.GetField(keyName); 133 FieldInfo field = myType.GetField(keyName);
134 if (field != null) 134 if (field != null)
135 { 135 {
136 // if (enumerator.Value is libsecondlife.StructuredData.LLSDMap) 136 // if (enumerator.Value is OpenMetaverse.StructuredData.LLSDMap)
137 if (enumerator.Value is Hashtable) 137 if (enumerator.Value is Hashtable)
138 { 138 {
139 object fieldValue = field.GetValue(obj); 139 object fieldValue = field.GetValue(obj);
140 DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue); 140 DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
141 // DeserialiseLLSDMap((libsecondlife.StructuredData.LLSDMap) enumerator.Value, fieldValue); 141 // DeserialiseLLSDMap((OpenMetaverse.StructuredData.LLSDMap) enumerator.Value, fieldValue);
142 } 142 }
143 else if (enumerator.Value is ArrayList) 143 else if (enumerator.Value is ArrayList)
144 { 144 {
@@ -160,4 +160,4 @@ namespace OpenSim.Framework.Communications.Capabilities
160 return obj; 160 return obj;
161 } 161 }
162 } 162 }
163} \ No newline at end of file 163}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
index 1a75aba..ff36821 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
@@ -25,17 +25,17 @@
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;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDMap] 32 [LLSDMap]
33 public class LLSDInventoryItem 33 public class LLSDInventoryItem
34 { 34 {
35 public LLUUID parent_id; 35 public UUID parent_id;
36 36
37 public LLUUID asset_id; 37 public UUID asset_id;
38 public LLUUID item_id; 38 public UUID item_id;
39 public LLSDPermissions permissions; 39 public LLSDPermissions permissions;
40 public string type; 40 public string type;
41 public string inv_type; 41 public string inv_type;
@@ -50,9 +50,9 @@ namespace OpenSim.Framework.Communications.Capabilities
50 [LLSDMap] 50 [LLSDMap]
51 public class LLSDPermissions 51 public class LLSDPermissions
52 { 52 {
53 public LLUUID creator_id; 53 public UUID creator_id;
54 public LLUUID owner_id; 54 public UUID owner_id;
55 public LLUUID group_id; 55 public UUID group_id;
56 public int base_mask; 56 public int base_mask;
57 public int owner_mask; 57 public int owner_mask;
58 public int group_mask; 58 public int group_mask;
@@ -77,8 +77,8 @@ namespace OpenSim.Framework.Communications.Capabilities
77 [LLSDMap] 77 [LLSDMap]
78 public class LLSDFetchInventoryDescendents 78 public class LLSDFetchInventoryDescendents
79 { 79 {
80 public LLUUID folder_id; 80 public UUID folder_id;
81 public LLUUID owner_id; 81 public UUID owner_id;
82 public int sort_order; 82 public int sort_order;
83 public bool fetch_folders; 83 public bool fetch_folders;
84 public bool fetch_items; 84 public bool fetch_items;
@@ -87,11 +87,11 @@ namespace OpenSim.Framework.Communications.Capabilities
87 [LLSDMap] 87 [LLSDMap]
88 public class LLSDInventoryFolderContents 88 public class LLSDInventoryFolderContents
89 { 89 {
90 public LLUUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" 90 public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-"
91 public int descendents; 91 public int descendents;
92 public LLUUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names 92 public UUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names
93 public LLSDArray items = new LLSDArray(); 93 public LLSDArray items = new LLSDArray();
94 public LLUUID owner___id; // and of course we can't have field names with "-" in 94 public UUID owner___id; // and of course we can't have field names with "-" in
95 public int version; 95 public int version;
96 } 96 }
97} \ No newline at end of file 97}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
index 2c4b68f..c147bd3 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
@@ -25,17 +25,17 @@
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;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDMap] 32 [LLSDMap]
33 public class LLSDItemUpdate 33 public class LLSDItemUpdate
34 { 34 {
35 public LLUUID item_id; 35 public UUID item_id;
36 36
37 public LLSDItemUpdate() 37 public LLSDItemUpdate()
38 { 38 {
39 } 39 }
40 } 40 }
41} \ No newline at end of file 41}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
index 50f5241..fc381e4 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.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;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
@@ -36,10 +36,10 @@ namespace OpenSim.Framework.Communications.Capabilities
36 public int Right = 0; 36 public int Right = 0;
37 public int Top = 0; 37 public int Top = 0;
38 public int Bottom = 0; 38 public int Bottom = 0;
39 public LLUUID ImageID = LLUUID.Zero; 39 public UUID ImageID = UUID.Zero;
40 40
41 public LLSDMapLayer() 41 public LLSDMapLayer()
42 { 42 {
43 } 43 }
44 } 44 }
45} \ No newline at end of file 45}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs
index b0e2b8f..1220089 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs
@@ -26,14 +26,14 @@
26* 26*
27*/ 27*/
28 28
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework.Communications.Capabilities 31namespace OpenSim.Framework.Communications.Capabilities
32{ 32{
33 [LLSDType("MAP")] 33 [LLSDType("MAP")]
34 public class LLSDRemoteParcelResponse 34 public class LLSDRemoteParcelResponse
35 { 35 {
36 public LLUUID parcel_id; 36 public UUID parcel_id;
37 37
38 public LLSDRemoteParcelResponse() 38 public LLSDRemoteParcelResponse()
39 { 39 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index 36090e1..7fcbb81 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Framework.Communications.Capabilities
53 //string requestBody = streamReader.ReadToEnd(); 53 //string requestBody = streamReader.ReadToEnd();
54 //streamReader.Close(); 54 //streamReader.Close();
55 55
56 // libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap) 56 // OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)
57 // libsecondlife.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); 57 // OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));
58 58
59 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); 59 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);
60 TRequest llsdRequest = new TRequest(); 60 TRequest llsdRequest = new TRequest();
@@ -67,4 +67,4 @@ namespace OpenSim.Framework.Communications.Capabilities
67 return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); 67 return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
68 } 68 }
69 } 69 }
70} \ No newline at end of file 70}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
index 8bfd20c..b34cbf9 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.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;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
@@ -35,16 +35,16 @@ namespace OpenSim.Framework.Communications.Capabilities
35 /// <summary> 35 /// <summary>
36 /// The task inventory item that was updated 36 /// The task inventory item that was updated
37 /// </summary> 37 /// </summary>
38 public LLUUID item_id; 38 public UUID item_id;
39 39
40 /// <summary> 40 /// <summary>
41 /// The task that was updated 41 /// The task that was updated
42 /// </summary> 42 /// </summary>
43 public LLUUID task_id; 43 public UUID task_id;
44 44
45 /// <summary> 45 /// <summary>
46 /// State of the upload. So far have only even seen this set to "complete" 46 /// State of the upload. So far have only even seen this set to "complete"
47 /// </summary> 47 /// </summary>
48 public string state; 48 public string state;
49 } 49 }
50} \ No newline at end of file 50}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
index e45d9de..730e95b 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.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;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
@@ -35,16 +35,16 @@ namespace OpenSim.Framework.Communications.Capabilities
35 /// <summary> 35 /// <summary>
36 /// The item containing the script to update 36 /// The item containing the script to update
37 /// </summary> 37 /// </summary>
38 public LLUUID item_id; 38 public UUID item_id;
39 39
40 /// <summary> 40 /// <summary>
41 /// The task containing the script 41 /// The task containing the script
42 /// </summary> 42 /// </summary>
43 public LLUUID task_id; 43 public UUID task_id;
44 44
45 /// <summary> 45 /// <summary>
46 /// Signals whether the script is currently active 46 /// Signals whether the script is currently active
47 /// </summary> 47 /// </summary>
48 public int is_script_running; 48 public int is_script_running;
49 } 49 }
50} \ No newline at end of file 50}
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 08dbc80..e6413e8 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Communications
42 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 protected Dictionary<LLUUID, string[]> m_nameRequestCache = new Dictionary<LLUUID, string[]>(); 45 protected Dictionary<UUID, string[]> m_nameRequestCache = new Dictionary<UUID, string[]>();
46 46
47 public IUserService UserService 47 public IUserService UserService
48 { 48 {
@@ -238,8 +238,8 @@ namespace OpenSim.Framework.Communications
238 /// <param name="password"></param> 238 /// <param name="password"></param>
239 /// <param name="regX"></param> 239 /// <param name="regX"></param>
240 /// <param name="regY"></param> 240 /// <param name="regY"></param>
241 /// <returns>The UUID of the added user. Returns LLUUID.Zero if the add was unsuccessful</returns> 241 /// <returns>The UUID of the added user. Returns UUID.Zero if the add was unsuccessful</returns>
242 public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY) 242 public UUID AddUser(string firstName, string lastName, string password, uint regX, uint regY)
243 { 243 {
244 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); 244 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty);
245 245
@@ -247,7 +247,7 @@ namespace OpenSim.Framework.Communications
247 UserProfileData userProf = UserService.GetUserProfile(firstName, lastName); 247 UserProfileData userProf = UserService.GetUserProfile(firstName, lastName);
248 if (userProf == null) 248 if (userProf == null)
249 { 249 {
250 return LLUUID.Zero; 250 return UUID.Zero;
251 } 251 }
252 else 252 else
253 { 253 {
@@ -265,7 +265,7 @@ namespace OpenSim.Framework.Communications
265 /// <param name="friendlistowner">The agent that who's friends list is being added to</param> 265 /// <param name="friendlistowner">The agent that who's friends list is being added to</param>
266 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param> 266 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param>
267 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> 267 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
268 public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 268 public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
269 { 269 {
270 m_userService.AddNewUserFriend(friendlistowner, friend, perms); 270 m_userService.AddNewUserFriend(friendlistowner, friend, perms);
271 } 271 }
@@ -279,7 +279,7 @@ namespace OpenSim.Framework.Communications
279 /// <param name="posx"></param> 279 /// <param name="posx"></param>
280 /// <param name="posy"></param> 280 /// <param name="posy"></param>
281 /// <param name="posz"></param> 281 /// <param name="posz"></param>
282 public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz) 282 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
283 { 283 {
284 m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz); 284 m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
285 285
@@ -290,7 +290,7 @@ namespace OpenSim.Framework.Communications
290 /// </summary> 290 /// </summary>
291 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 291 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
292 /// <param name="friend">The Ex-friend agent</param> 292 /// <param name="friend">The Ex-friend agent</param>
293 public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 293 public void RemoveUserFriend(UUID friendlistowner, UUID friend)
294 { 294 {
295 m_userService.RemoveUserFriend(friendlistowner, friend); 295 m_userService.RemoveUserFriend(friendlistowner, friend);
296 } 296 }
@@ -301,16 +301,16 @@ namespace OpenSim.Framework.Communications
301 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 301 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
302 /// <param name="friend">The agent that is getting or loosing permissions</param> 302 /// <param name="friend">The agent that is getting or loosing permissions</param>
303 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> 303 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
304 public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 304 public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
305 { 305 {
306 m_userService.UpdateUserFriendPerms(friendlistowner, friend, perms); 306 m_userService.UpdateUserFriendPerms(friendlistowner, friend, perms);
307 } 307 }
308 308
309 /// <summary> 309 /// <summary>
310 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner 310 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
311 /// </summary> 311 /// </summary>
312 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 312 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
313 public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 313 public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
314 { 314 {
315 return m_userService.GetUserFriendList(friendlistowner); 315 return m_userService.GetUserFriendList(friendlistowner);
316 } 316 }
@@ -325,7 +325,7 @@ namespace OpenSim.Framework.Communications
325 return; 325 return;
326 } 326 }
327 327
328 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) 328 public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
329 { 329 {
330 if (uuid == m_userProfileCacheService.libraryRoot.Owner) 330 if (uuid == m_userProfileCacheService.libraryRoot.Owner)
331 { 331 {
@@ -342,7 +342,7 @@ namespace OpenSim.Framework.Communications
342 } 342 }
343 } 343 }
344 344
345 private string[] doUUIDNameRequest(LLUUID uuid) 345 private string[] doUUIDNameRequest(UUID uuid)
346 { 346 {
347 string[] returnstring = new string[0]; 347 string[] returnstring = new string[0];
348 bool doLookup = false; 348 bool doLookup = false;
@@ -366,7 +366,7 @@ namespace OpenSim.Framework.Communications
366 if (profileData != null) 366 if (profileData != null)
367 { 367 {
368 returnstring = new string[2]; 368 returnstring = new string[2];
369 // LLUUID profileId = profileData.ID; 369 // UUID profileId = profileData.ID;
370 returnstring[0] = profileData.FirstName; 370 returnstring[0] = profileData.FirstName;
371 returnstring[1] = profileData.SurName; 371 returnstring[1] = profileData.SurName;
372 lock (m_nameRequestCache) 372 lock (m_nameRequestCache)
@@ -380,13 +380,13 @@ namespace OpenSim.Framework.Communications
380 380
381 } 381 }
382 382
383 public bool UUIDNameCachedTest(LLUUID uuid) 383 public bool UUIDNameCachedTest(UUID uuid)
384 { 384 {
385 lock (m_nameRequestCache) 385 lock (m_nameRequestCache)
386 return m_nameRequestCache.ContainsKey(uuid); 386 return m_nameRequestCache.ContainsKey(uuid);
387 } 387 }
388 388
389 public string UUIDNameRequestString(LLUUID uuid) 389 public string UUIDNameRequestString(UUID uuid)
390 { 390 {
391 string[] names = doUUIDNameRequest(uuid); 391 string[] names = doUUIDNameRequest(uuid);
392 if (names.Length == 2) 392 if (names.Length == 2)
@@ -400,7 +400,7 @@ namespace OpenSim.Framework.Communications
400 return "(hippos)"; 400 return "(hippos)";
401 } 401 }
402 402
403 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) 403 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
404 { 404 {
405 List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query); 405 List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query);
406 return pickerlist; 406 return pickerlist;
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs
index 6c033e1..25b26dd 100644
--- a/OpenSim/Framework/Communications/IAvatarService.cs
+++ b/OpenSim/Framework/Communications/IAvatarService.cs
@@ -28,16 +28,16 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using OpenMetaverse;
32 32
33namespace OpenSim.Framework.Communications 33namespace OpenSim.Framework.Communications
34{ 34{
35 public interface IAvatarService 35 public interface IAvatarService
36 { 36 {
37 /// Get's the User Appearance 37 /// Get's the User Appearance
38 AvatarAppearance GetUserAppearance(LLUUID user); 38 AvatarAppearance GetUserAppearance(UUID user);
39 39
40 void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance); 40 void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
41 41
42 } 42 }
43} 43}
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index fcc0db5..6c5d2e2 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework.Communications 31namespace OpenSim.Framework.Communications
32{ 32{
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
53 List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); 53 List<SimpleRegionInfo> RequestNeighbours(uint x, uint y);
54 54
55 RegionInfo RequestNeighbourInfo(ulong regionHandle); 55 RegionInfo RequestNeighbourInfo(ulong regionHandle);
56 RegionInfo RequestNeighbourInfo(LLUUID regionID); 56 RegionInfo RequestNeighbourInfo(UUID regionID);
57 RegionInfo RequestClosestRegion(string regionName); 57 RegionInfo RequestClosestRegion(string regionName);
58 Dictionary<string, string> GetGridSettings(); 58 Dictionary<string, string> GetGridSettings();
59 List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY); 59 List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 57fb82d..3dd5561 100644
--- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.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;
29 29
30namespace OpenSim.Framework.Communications 30namespace OpenSim.Framework.Communications
31{ 31{
@@ -35,16 +35,16 @@ namespace OpenSim.Framework.Communications
35 35
36 bool CheckRegion(string address, uint port); 36 bool CheckRegion(string address, uint port);
37 bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); 37 bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
38 bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod); 38 bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod);
39 bool RegionUp(SerializableRegionInfo region, ulong regionhandle); 39 bool RegionUp(SerializableRegionInfo region, ulong regionhandle);
40 bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); 40 bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData);
41 41
42 bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); 42 bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying);
43 bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isFlying); 43 bool ExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isFlying);
44 44
45 bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId); 45 bool AcknowledgeAgentCrossed(ulong regionHandle, UUID agentId);
46 bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID); 46 bool AcknowledgePrimCrossed(ulong regionHandle, UUID primID);
47 47
48 bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID); 48 bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID);
49 } 49 }
50} 50}
diff --git a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
index a1f4c2e..5900f4e 100644
--- a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework.Communications 31namespace OpenSim.Framework.Communications
32{ 32{
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications
40 /// </summary> 40 /// </summary>
41 /// <param name="user"></param> 41 /// <param name="user"></param>
42 /// <returns>true if the inventory was successfully created, false otherwise</returns> 42 /// <returns>true if the inventory was successfully created, false otherwise</returns>
43 bool CreateNewUserInventory(LLUUID user); 43 bool CreateNewUserInventory(UUID user);
44 44
45 /// <summary> 45 /// <summary>
46 /// Returns a list of all the folders in a given user's inventory. 46 /// Returns a list of all the folders in a given user's inventory.
@@ -48,6 +48,6 @@ namespace OpenSim.Framework.Communications
48 /// <param name="userId"></param> 48 /// <param name="userId"></param>
49 /// <returns>A flat list of the user's inventory folder tree, 49 /// <returns>A flat list of the user's inventory folder tree,
50 /// null if there is no inventory for this user</returns> 50 /// null if there is no inventory for this user</returns>
51 List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId); 51 List<InventoryFolderBase> GetInventorySkeleton(UUID userId);
52 } 52 }
53} 53}
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index b00b1bf..aead3be 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
31 31
32namespace OpenSim.Framework.Communications 32namespace OpenSim.Framework.Communications
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
53 /// </summary> 53 /// </summary>
54 /// <param name="userID"></param> 54 /// <param name="userID"></param>
55 /// <param name="callback"></param> 55 /// <param name="callback"></param>
56 void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback); 56 void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback);
57 57
58 /// <summary> 58 /// <summary>
59 /// Add a new folder to the user's inventory 59 /// Add a new folder to the user's inventory
@@ -109,13 +109,13 @@ namespace OpenSim.Framework.Communications
109 /// </summary> 109 /// </summary>
110 /// <param name="userID"></param> 110 /// <param name="userID"></param>
111 /// <returns></returns> 111 /// <returns></returns>
112 bool HasInventoryForUser(LLUUID userID); 112 bool HasInventoryForUser(UUID userID);
113 113
114 /// <summary> 114 /// <summary>
115 /// Retrieve the root inventory folder for the given user. 115 /// Retrieve the root inventory folder for the given user.
116 /// </summary> 116 /// </summary>
117 /// <param name="userID"></param> 117 /// <param name="userID"></param>
118 /// <returns>null if no root folder was found</returns> 118 /// <returns>null if no root folder was found</returns>
119 InventoryFolderBase RequestRootFolder(LLUUID userID); 119 InventoryFolderBase RequestRootFolder(UUID userID);
120 } 120 }
121} 121}
diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs
index bd962d1..6d4ce46 100644
--- a/OpenSim/Framework/Communications/ISecureInventoryService.cs
+++ b/OpenSim/Framework/Communications/ISecureInventoryService.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
31 31
32namespace OpenSim.Framework.Communications 32namespace OpenSim.Framework.Communications
@@ -47,69 +47,69 @@ namespace OpenSim.Framework.Communications
47 /// </summary> 47 /// </summary>
48 /// <param name="userID"></param> 48 /// <param name="userID"></param>
49 /// <param name="callback"></param> 49 /// <param name="callback"></param>
50 void RequestInventoryForUser(LLUUID userID, LLUUID session_id, InventoryReceiptCallback callback); 50 void RequestInventoryForUser(UUID userID, UUID session_id, InventoryReceiptCallback callback);
51 51
52 /// <summary> 52 /// <summary>
53 /// Add a new folder to the user's inventory 53 /// Add a new folder to the user's inventory
54 /// </summary> 54 /// </summary>
55 /// <param name="folder"></param> 55 /// <param name="folder"></param>
56 /// <returns>true if the folder was successfully added</returns> 56 /// <returns>true if the folder was successfully added</returns>
57 bool AddFolder(InventoryFolderBase folder, LLUUID session_id); 57 bool AddFolder(InventoryFolderBase folder, UUID session_id);
58 58
59 /// <summary> 59 /// <summary>
60 /// Update a folder in the user's inventory 60 /// Update a folder in the user's inventory
61 /// </summary> 61 /// </summary>
62 /// <param name="folder"></param> 62 /// <param name="folder"></param>
63 /// <returns>true if the folder was successfully updated</returns> 63 /// <returns>true if the folder was successfully updated</returns>
64 bool UpdateFolder(InventoryFolderBase folder, LLUUID session_id); 64 bool UpdateFolder(InventoryFolderBase folder, UUID session_id);
65 65
66 /// <summary> 66 /// <summary>
67 /// Move an inventory folder to a new location 67 /// Move an inventory folder to a new location
68 /// </summary> 68 /// </summary>
69 /// <param name="folder">A folder containing the details of the new location</param> 69 /// <param name="folder">A folder containing the details of the new location</param>
70 /// <returns>true if the folder was successfully moved</returns> 70 /// <returns>true if the folder was successfully moved</returns>
71 bool MoveFolder(InventoryFolderBase folder, LLUUID session_id); 71 bool MoveFolder(InventoryFolderBase folder, UUID session_id);
72 72
73 /// <summary> 73 /// <summary>
74 /// Purge an inventory folder of all its items and subfolders. 74 /// Purge an inventory folder of all its items and subfolders.
75 /// </summary> 75 /// </summary>
76 /// <param name="folder"></param> 76 /// <param name="folder"></param>
77 /// <returns>true if the folder was successfully purged</returns> 77 /// <returns>true if the folder was successfully purged</returns>
78 bool PurgeFolder(InventoryFolderBase folder, LLUUID session_id); 78 bool PurgeFolder(InventoryFolderBase folder, UUID session_id);
79 79
80 /// <summary> 80 /// <summary>
81 /// Add a new item to the user's inventory 81 /// Add a new item to the user's inventory
82 /// </summary> 82 /// </summary>
83 /// <param name="item"></param> 83 /// <param name="item"></param>
84 /// <returns>true if the item was successfully added</returns> 84 /// <returns>true if the item was successfully added</returns>
85 bool AddItem(InventoryItemBase item, LLUUID session_id); 85 bool AddItem(InventoryItemBase item, UUID session_id);
86 86
87 /// <summary> 87 /// <summary>
88 /// Update an item in the user's inventory 88 /// Update an item in the user's inventory
89 /// </summary> 89 /// </summary>
90 /// <param name="item"></param> 90 /// <param name="item"></param>
91 /// <returns>true if the item was successfully updated</returns> 91 /// <returns>true if the item was successfully updated</returns>
92 bool UpdateItem(InventoryItemBase item, LLUUID session_id); 92 bool UpdateItem(InventoryItemBase item, UUID session_id);
93 93
94 /// <summary> 94 /// <summary>
95 /// Delete an item from the user's inventory 95 /// Delete an item from the user's inventory
96 /// </summary> 96 /// </summary>
97 /// <param name="item"></param> 97 /// <param name="item"></param>
98 /// <returns>true if the item was successfully deleted</returns> 98 /// <returns>true if the item was successfully deleted</returns>
99 bool DeleteItem(InventoryItemBase item, LLUUID session_id); 99 bool DeleteItem(InventoryItemBase item, UUID session_id);
100 100
101 /// <summary> 101 /// <summary>
102 /// Does the given user have an inventory structure? 102 /// Does the given user have an inventory structure?
103 /// </summary> 103 /// </summary>
104 /// <param name="userID"></param> 104 /// <param name="userID"></param>
105 /// <returns></returns> 105 /// <returns></returns>
106 bool HasInventoryForUser(LLUUID userID); 106 bool HasInventoryForUser(UUID userID);
107 107
108 /// <summary> 108 /// <summary>
109 /// Retrieve the root inventory folder for the given user. 109 /// Retrieve the root inventory folder for the given user.
110 /// </summary> 110 /// </summary>
111 /// <param name="userID"></param> 111 /// <param name="userID"></param>
112 /// <returns>null if no root folder was found</returns> 112 /// <returns>null if no root folder was found</returns>
113 InventoryFolderBase RequestRootFolder(LLUUID userID); 113 InventoryFolderBase RequestRootFolder(UUID userID);
114 } 114 }
115} 115}
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index c1ae0e2..07ea437 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework.Communications 31namespace OpenSim.Framework.Communications
32{ 32{
@@ -47,22 +47,22 @@ namespace OpenSim.Framework.Communications
47 /// </summary> 47 /// </summary>
48 /// <param name="uuid">The target UUID</param> 48 /// <param name="uuid">The target UUID</param>
49 /// <returns>A user profile. Returns null if no user profile is found.</returns> 49 /// <returns>A user profile. Returns null if no user profile is found.</returns>
50 UserProfileData GetUserProfile(LLUUID userId); 50 UserProfileData GetUserProfile(UUID userId);
51 51
52 UserAgentData GetAgentByUUID(LLUUID userId); 52 UserAgentData GetAgentByUUID(UUID userId);
53 53
54 void ClearUserAgent(LLUUID avatarID); 54 void ClearUserAgent(UUID avatarID);
55 List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID QueryID, string Query); 55 List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID QueryID, string Query);
56 56
57 UserProfileData SetupMasterUser(string firstName, string lastName); 57 UserProfileData SetupMasterUser(string firstName, string lastName);
58 UserProfileData SetupMasterUser(string firstName, string lastName, string password); 58 UserProfileData SetupMasterUser(string firstName, string lastName, string password);
59 UserProfileData SetupMasterUser(LLUUID userId); 59 UserProfileData SetupMasterUser(UUID userId);
60 60
61 /// <summary> 61 /// <summary>
62 /// 62 ///
63 /// </summary> 63 /// </summary>
64 /// <param name="user"></param> 64 /// <param name="user"></param>
65 LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY); 65 UUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY);
66 66
67 /// <summary> 67 /// <summary>
68 /// Update the user's profile. 68 /// Update the user's profile.
@@ -78,14 +78,14 @@ namespace OpenSim.Framework.Communications
78 /// <param name="friendlistowner">The agent that who's friends list is being added to</param> 78 /// <param name="friendlistowner">The agent that who's friends list is being added to</param>
79 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param> 79 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param>
80 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> 80 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
81 void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms); 81 void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
82 82
83 /// <summary> 83 /// <summary>
84 /// Delete friend on friendlistowner's friendlist. 84 /// Delete friend on friendlistowner's friendlist.
85 /// </summary> 85 /// </summary>
86 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 86 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
87 /// <param name="friend">The Ex-friend agent</param> 87 /// <param name="friend">The Ex-friend agent</param>
88 void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend); 88 void RemoveUserFriend(UUID friendlistowner, UUID friend);
89 89
90 /// <summary> 90 /// <summary>
91 /// Update permissions for friend on friendlistowner's friendlist. 91 /// Update permissions for friend on friendlistowner's friendlist.
@@ -93,7 +93,7 @@ namespace OpenSim.Framework.Communications
93 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 93 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
94 /// <param name="friend">The agent that is getting or loosing permissions</param> 94 /// <param name="friend">The agent that is getting or loosing permissions</param>
95 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> 95 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
96 void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms); 96 void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
97 97
98 /// <summary> 98 /// <summary>
99 /// Updates a user profile 99 /// Updates a user profile
@@ -110,31 +110,31 @@ namespace OpenSim.Framework.Communications
110 /// <param name="posx">final position x</param> 110 /// <param name="posx">final position x</param>
111 /// <param name="posy">final position y</param> 111 /// <param name="posy">final position y</param>
112 /// <param name="posz">final position z</param> 112 /// <param name="posz">final position z</param>
113 void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz); 113 void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz);
114 114
115 /// <summary> 115 /// <summary>
116 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner 116 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
117 /// </summary> 117 /// </summary>
118 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 118 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
119 List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); 119 List<FriendListItem> GetUserFriendList(UUID friendlistowner);
120 120
121 /// <summary> 121 /// <summary>
122 /// Updates the current region the User is in 122 /// Updates the current region the User is in
123 /// </summary> 123 /// </summary>
124 /// <param name="avatarid">User Region the Avatar is IN</param> 124 /// <param name="avatarid">User Region the Avatar is IN</param>
125 /// <param name="retionuuid">User Region the Avatar is IN</param> 125 /// <param name="retionuuid">User Region the Avatar is IN</param>
126 void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle); 126 void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
127 127
128 /// <summary> 128 /// <summary>
129 /// Get's the User Appearance 129 /// Get's the User Appearance
130 // AvatarAppearance GetUserAppearance(LLUUID user); 130 // AvatarAppearance GetUserAppearance(UUID user);
131 131
132 // void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance); 132 // void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
133 133
134 // void AddAttachment(LLUUID user, LLUUID attach); 134 // void AddAttachment(UUID user, UUID attach);
135 135
136 // void RemoveAttachment(LLUUID user, LLUUID attach); 136 // void RemoveAttachment(UUID user, UUID attach);
137 137
138 // List<LLUUID> GetAttachments(LLUUID user); 138 // List<UUID> GetAttachments(UUID user);
139 } 139 }
140} \ No newline at end of file 140}
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index c76c078..3239268 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading; 31using System.Threading;
32 32
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35 35
36namespace OpenSim.Framework.Communications 36namespace OpenSim.Framework.Communications
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications
57 new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); 57 new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect));
58 58
59 // loader will try to load all providers (MySQL, MSSQL, etc) 59 // loader will try to load all providers (MySQL, MSSQL, etc)
60 // unless it is constrainted to the correct "Provider" entry in the addin.xml 60 // unless it is constrainted to the correct "Provider" entry in the addin.Xml
61 loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); 61 loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider));
62 loader.Load(); 62 loader.Load();
63 63
@@ -74,7 +74,7 @@ namespace OpenSim.Framework.Communications
74 } 74 }
75 75
76 // See IInventoryServices 76 // See IInventoryServices
77 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId) 77 public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
78 { 78 {
79// m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId); 79// m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId);
80 80
@@ -105,13 +105,13 @@ namespace OpenSim.Framework.Communications
105 } 105 }
106 106
107 // See IInventoryServices 107 // See IInventoryServices
108 public virtual bool HasInventoryForUser(LLUUID userID) 108 public virtual bool HasInventoryForUser(UUID userID)
109 { 109 {
110 return false; 110 return false;
111 } 111 }
112 112
113 // See IInventoryServices 113 // See IInventoryServices
114 public InventoryFolderBase RequestRootFolder(LLUUID userID) 114 public InventoryFolderBase RequestRootFolder(UUID userID)
115 { 115 {
116 // FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin 116 // FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin
117 foreach (IInventoryDataPlugin plugin in m_plugins) 117 foreach (IInventoryDataPlugin plugin in m_plugins)
@@ -122,7 +122,7 @@ namespace OpenSim.Framework.Communications
122 } 122 }
123 123
124 // See IInventoryServices 124 // See IInventoryServices
125 public bool CreateNewUserInventory(LLUUID user) 125 public bool CreateNewUserInventory(UUID user)
126 { 126 {
127 InventoryFolderBase existingRootFolder = RequestRootFolder(user); 127 InventoryFolderBase existingRootFolder = RequestRootFolder(user);
128 128
@@ -146,13 +146,13 @@ namespace OpenSim.Framework.Communications
146 } 146 }
147 147
148 // See IInventoryServices 148 // See IInventoryServices
149 public abstract void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback); 149 public abstract void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback);
150 150
151 #endregion 151 #endregion
152 152
153 #region Methods used by GridInventoryService 153 #region Methods used by GridInventoryService
154 154
155 public List<InventoryFolderBase> RequestSubFolders(LLUUID parentFolderID) 155 public List<InventoryFolderBase> RequestSubFolders(UUID parentFolderID)
156 { 156 {
157 List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>(); 157 List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
158 foreach (IInventoryDataPlugin plugin in m_plugins) 158 foreach (IInventoryDataPlugin plugin in m_plugins)
@@ -162,7 +162,7 @@ namespace OpenSim.Framework.Communications
162 return inventoryList; 162 return inventoryList;
163 } 163 }
164 164
165 public List<InventoryItemBase> RequestFolderItems(LLUUID folderID) 165 public List<InventoryItemBase> RequestFolderItems(UUID folderID)
166 { 166 {
167 List<InventoryItemBase> itemsList = new List<InventoryItemBase>(); 167 List<InventoryItemBase> itemsList = new List<InventoryItemBase>();
168 foreach (IInventoryDataPlugin plugin in m_plugins) 168 foreach (IInventoryDataPlugin plugin in m_plugins)
@@ -313,27 +313,27 @@ namespace OpenSim.Framework.Communications
313 /// </summary> 313 /// </summary>
314 private class UsersInventory 314 private class UsersInventory
315 { 315 {
316 public Dictionary<LLUUID, InventoryFolderBase> Folders = new Dictionary<LLUUID, InventoryFolderBase>(); 316 public Dictionary<UUID, InventoryFolderBase> Folders = new Dictionary<UUID, InventoryFolderBase>();
317 public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); 317 public Dictionary<UUID, InventoryItemBase> Items = new Dictionary<UUID, InventoryItemBase>();
318 318
319 public virtual void CreateNewInventorySet(LLUUID user) 319 public virtual void CreateNewInventorySet(UUID user)
320 { 320 {
321 InventoryFolderBase folder = new InventoryFolderBase(); 321 InventoryFolderBase folder = new InventoryFolderBase();
322 322
323 folder.ParentID = LLUUID.Zero; 323 folder.ParentID = UUID.Zero;
324 folder.Owner = user; 324 folder.Owner = user;
325 folder.ID = LLUUID.Random(); 325 folder.ID = UUID.Random();
326 folder.Name = "My Inventory"; 326 folder.Name = "My Inventory";
327 folder.Type = (short)AssetType.Folder; 327 folder.Type = (short)AssetType.Folder;
328 folder.Version = 1; 328 folder.Version = 1;
329 Folders.Add(folder.ID, folder); 329 Folders.Add(folder.ID, folder);
330 330
331 LLUUID rootFolder = folder.ID; 331 UUID rootFolder = folder.ID;
332 332
333 folder = new InventoryFolderBase(); 333 folder = new InventoryFolderBase();
334 folder.ParentID = rootFolder; 334 folder.ParentID = rootFolder;
335 folder.Owner = user; 335 folder.Owner = user;
336 folder.ID = LLUUID.Random(); 336 folder.ID = UUID.Random();
337 folder.Name = "Animations"; 337 folder.Name = "Animations";
338 folder.Type = (short)AssetType.Animation; 338 folder.Type = (short)AssetType.Animation;
339 folder.Version = 1; 339 folder.Version = 1;
@@ -342,7 +342,7 @@ namespace OpenSim.Framework.Communications
342 folder = new InventoryFolderBase(); 342 folder = new InventoryFolderBase();
343 folder.ParentID = rootFolder; 343 folder.ParentID = rootFolder;
344 folder.Owner = user; 344 folder.Owner = user;
345 folder.ID = LLUUID.Random(); 345 folder.ID = UUID.Random();
346 folder.Name = "Body Parts"; 346 folder.Name = "Body Parts";
347 folder.Type = (short)AssetType.Bodypart; 347 folder.Type = (short)AssetType.Bodypart;
348 folder.Version = 1; 348 folder.Version = 1;
@@ -351,7 +351,7 @@ namespace OpenSim.Framework.Communications
351 folder = new InventoryFolderBase(); 351 folder = new InventoryFolderBase();
352 folder.ParentID = rootFolder; 352 folder.ParentID = rootFolder;
353 folder.Owner = user; 353 folder.Owner = user;
354 folder.ID = LLUUID.Random(); 354 folder.ID = UUID.Random();
355 folder.Name = "Calling Cards"; 355 folder.Name = "Calling Cards";
356 folder.Type = (short)AssetType.CallingCard; 356 folder.Type = (short)AssetType.CallingCard;
357 folder.Version = 1; 357 folder.Version = 1;
@@ -360,7 +360,7 @@ namespace OpenSim.Framework.Communications
360 folder = new InventoryFolderBase(); 360 folder = new InventoryFolderBase();
361 folder.ParentID = rootFolder; 361 folder.ParentID = rootFolder;
362 folder.Owner = user; 362 folder.Owner = user;
363 folder.ID = LLUUID.Random(); 363 folder.ID = UUID.Random();
364 folder.Name = "Clothing"; 364 folder.Name = "Clothing";
365 folder.Type = (short)AssetType.Clothing; 365 folder.Type = (short)AssetType.Clothing;
366 folder.Version = 1; 366 folder.Version = 1;
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Communications
369 folder = new InventoryFolderBase(); 369 folder = new InventoryFolderBase();
370 folder.ParentID = rootFolder; 370 folder.ParentID = rootFolder;
371 folder.Owner = user; 371 folder.Owner = user;
372 folder.ID = LLUUID.Random(); 372 folder.ID = UUID.Random();
373 folder.Name = "Gestures"; 373 folder.Name = "Gestures";
374 folder.Type = (short)AssetType.Gesture; 374 folder.Type = (short)AssetType.Gesture;
375 folder.Version = 1; 375 folder.Version = 1;
@@ -378,7 +378,7 @@ namespace OpenSim.Framework.Communications
378 folder = new InventoryFolderBase(); 378 folder = new InventoryFolderBase();
379 folder.ParentID = rootFolder; 379 folder.ParentID = rootFolder;
380 folder.Owner = user; 380 folder.Owner = user;
381 folder.ID = LLUUID.Random(); 381 folder.ID = UUID.Random();
382 folder.Name = "Landmarks"; 382 folder.Name = "Landmarks";
383 folder.Type = (short)AssetType.Landmark; 383 folder.Type = (short)AssetType.Landmark;
384 folder.Version = 1; 384 folder.Version = 1;
@@ -387,7 +387,7 @@ namespace OpenSim.Framework.Communications
387 folder = new InventoryFolderBase(); 387 folder = new InventoryFolderBase();
388 folder.ParentID = rootFolder; 388 folder.ParentID = rootFolder;
389 folder.Owner = user; 389 folder.Owner = user;
390 folder.ID = LLUUID.Random(); 390 folder.ID = UUID.Random();
391 folder.Name = "Lost And Found"; 391 folder.Name = "Lost And Found";
392 folder.Type = (short)AssetType.LostAndFoundFolder; 392 folder.Type = (short)AssetType.LostAndFoundFolder;
393 folder.Version = 1; 393 folder.Version = 1;
@@ -396,7 +396,7 @@ namespace OpenSim.Framework.Communications
396 folder = new InventoryFolderBase(); 396 folder = new InventoryFolderBase();
397 folder.ParentID = rootFolder; 397 folder.ParentID = rootFolder;
398 folder.Owner = user; 398 folder.Owner = user;
399 folder.ID = LLUUID.Random(); 399 folder.ID = UUID.Random();
400 folder.Name = "Notecards"; 400 folder.Name = "Notecards";
401 folder.Type = (short)AssetType.Notecard; 401 folder.Type = (short)AssetType.Notecard;
402 folder.Version = 1; 402 folder.Version = 1;
@@ -405,7 +405,7 @@ namespace OpenSim.Framework.Communications
405 folder = new InventoryFolderBase(); 405 folder = new InventoryFolderBase();
406 folder.ParentID = rootFolder; 406 folder.ParentID = rootFolder;
407 folder.Owner = user; 407 folder.Owner = user;
408 folder.ID = LLUUID.Random(); 408 folder.ID = UUID.Random();
409 folder.Name = "Objects"; 409 folder.Name = "Objects";
410 folder.Type = (short)AssetType.Object; 410 folder.Type = (short)AssetType.Object;
411 folder.Version = 1; 411 folder.Version = 1;
@@ -414,7 +414,7 @@ namespace OpenSim.Framework.Communications
414 folder = new InventoryFolderBase(); 414 folder = new InventoryFolderBase();
415 folder.ParentID = rootFolder; 415 folder.ParentID = rootFolder;
416 folder.Owner = user; 416 folder.Owner = user;
417 folder.ID = LLUUID.Random(); 417 folder.ID = UUID.Random();
418 folder.Name = "Photo Album"; 418 folder.Name = "Photo Album";
419 folder.Type = (short)AssetType.SnapshotFolder; 419 folder.Type = (short)AssetType.SnapshotFolder;
420 folder.Version = 1; 420 folder.Version = 1;
@@ -423,7 +423,7 @@ namespace OpenSim.Framework.Communications
423 folder = new InventoryFolderBase(); 423 folder = new InventoryFolderBase();
424 folder.ParentID = rootFolder; 424 folder.ParentID = rootFolder;
425 folder.Owner = user; 425 folder.Owner = user;
426 folder.ID = LLUUID.Random(); 426 folder.ID = UUID.Random();
427 folder.Name = "Scripts"; 427 folder.Name = "Scripts";
428 folder.Type = (short)AssetType.LSLText; 428 folder.Type = (short)AssetType.LSLText;
429 folder.Version = 1; 429 folder.Version = 1;
@@ -432,7 +432,7 @@ namespace OpenSim.Framework.Communications
432 folder = new InventoryFolderBase(); 432 folder = new InventoryFolderBase();
433 folder.ParentID = rootFolder; 433 folder.ParentID = rootFolder;
434 folder.Owner = user; 434 folder.Owner = user;
435 folder.ID = LLUUID.Random(); 435 folder.ID = UUID.Random();
436 folder.Name = "Sounds"; 436 folder.Name = "Sounds";
437 folder.Type = (short)AssetType.Sound; 437 folder.Type = (short)AssetType.Sound;
438 folder.Version = 1; 438 folder.Version = 1;
@@ -441,7 +441,7 @@ namespace OpenSim.Framework.Communications
441 folder = new InventoryFolderBase(); 441 folder = new InventoryFolderBase();
442 folder.ParentID = rootFolder; 442 folder.ParentID = rootFolder;
443 folder.Owner = user; 443 folder.Owner = user;
444 folder.ID = LLUUID.Random(); 444 folder.ID = UUID.Random();
445 folder.Name = "Textures"; 445 folder.Name = "Textures";
446 folder.Type = (short)AssetType.Texture; 446 folder.Type = (short)AssetType.Texture;
447 folder.Version = 1; 447 folder.Version = 1;
@@ -450,7 +450,7 @@ namespace OpenSim.Framework.Communications
450 folder = new InventoryFolderBase(); 450 folder = new InventoryFolderBase();
451 folder.ParentID = rootFolder; 451 folder.ParentID = rootFolder;
452 folder.Owner = user; 452 folder.Owner = user;
453 folder.ID = LLUUID.Random(); 453 folder.ID = UUID.Random();
454 folder.Name = "Trash"; 454 folder.Name = "Trash";
455 folder.Type = (short)AssetType.TrashFolder; 455 folder.Type = (short)AssetType.TrashFolder;
456 folder.Version = 1; 456 folder.Version = 1;
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 686d1bb..16be2b7 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using libsecondlife.StructuredData; 33using OpenMetaverse.StructuredData;
34using log4net; 34using log4net;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36 36
@@ -63,9 +63,9 @@ namespace OpenSim.Framework.Communications
63 63
64 private UserInfo userProfile; 64 private UserInfo userProfile;
65 65
66 private LLUUID agentID; 66 private UUID agentID;
67 private LLUUID sessionID; 67 private UUID sessionID;
68 private LLUUID secureSessionID; 68 private UUID secureSessionID;
69 69
70 // Login Flags 70 // Login Flags
71 private string dst; 71 private string dst;
@@ -171,9 +171,9 @@ namespace OpenSim.Framework.Communications
171 AddClassifiedCategory((Int32) 8, "Service"); 171 AddClassifiedCategory((Int32) 8, "Service");
172 AddClassifiedCategory((Int32) 9, "Personal"); 172 AddClassifiedCategory((Int32) 9, "Personal");
173 173
174 SessionID = LLUUID.Random(); 174 SessionID = UUID.Random();
175 SecureSessionID = LLUUID.Random(); 175 SecureSessionID = UUID.Random();
176 AgentID = LLUUID.Random(); 176 AgentID = UUID.Random();
177 177
178 Hashtable InitialOutfitHash = new Hashtable(); 178 Hashtable InitialOutfitHash = new Hashtable();
179 InitialOutfitHash["folder_name"] = "Nightclub Female"; 179 InitialOutfitHash["folder_name"] = "Nightclub Female";
@@ -567,19 +567,19 @@ namespace OpenSim.Framework.Communications
567 set { simAddress = value; } 567 set { simAddress = value; }
568 } 568 }
569 569
570 public LLUUID AgentID 570 public UUID AgentID
571 { 571 {
572 get { return agentID; } 572 get { return agentID; }
573 set { agentID = value; } 573 set { agentID = value; }
574 } 574 }
575 575
576 public LLUUID SessionID 576 public UUID SessionID
577 { 577 {
578 get { return sessionID; } 578 get { return sessionID; }
579 set { sessionID = value; } 579 set { sessionID = value; }
580 } 580 }
581 581
582 public LLUUID SecureSessionID 582 public UUID SecureSessionID
583 { 583 {
584 get { return secureSessionID; } 584 get { return secureSessionID; }
585 set { secureSessionID = value; } 585 set { secureSessionID = value; }
@@ -724,8 +724,8 @@ namespace OpenSim.Framework.Communications
724 public string firstname; 724 public string firstname;
725 public string lastname; 725 public string lastname;
726 public ulong homeregionhandle; 726 public ulong homeregionhandle;
727 public LLVector3 homepos; 727 public Vector3 homepos;
728 public LLVector3 homelookat; 728 public Vector3 homelookat;
729 } 729 }
730 730
731 public class BuddyList 731 public class BuddyList
@@ -754,14 +754,14 @@ namespace OpenSim.Framework.Communications
754 { 754 {
755 public int BuddyRightsHave = 1; 755 public int BuddyRightsHave = 1;
756 public int BuddyRightsGiven = 1; 756 public int BuddyRightsGiven = 1;
757 public LLUUID BuddyID; 757 public UUID BuddyID;
758 758
759 public BuddyInfo(string buddyID) 759 public BuddyInfo(string buddyID)
760 { 760 {
761 BuddyID = new LLUUID(buddyID); 761 BuddyID = new UUID(buddyID);
762 } 762 }
763 763
764 public BuddyInfo(LLUUID buddyID) 764 public BuddyInfo(UUID buddyID)
765 { 765 {
766 BuddyID = buddyID; 766 BuddyID = buddyID;
767 } 767 }
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 73fba1e..d8d0fa2 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -33,8 +33,8 @@ using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using System.Threading; 34using System.Threading;
35using System.Web; 35using System.Web;
36using libsecondlife; 36using OpenMetaverse;
37using libsecondlife.StructuredData; 37using OpenMetaverse.StructuredData;
38using log4net; 38using log4net;
39using Nwc.XmlRpc; 39using Nwc.XmlRpc;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
@@ -94,7 +94,7 @@ namespace OpenSim.Framework.Communications
94 /// <param name="userID"></param> 94 /// <param name="userID"></param>
95 /// <returns></returns> 95 /// <returns></returns>
96 /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception> 96 /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception>
97 protected abstract InventoryData GetInventorySkeleton(LLUUID userID); 97 protected abstract InventoryData GetInventorySkeleton(UUID userID);
98 98
99 /// <summary> 99 /// <summary>
100 /// Called when we receive the client's initial XMLRPC login_to_simulator request message 100 /// Called when we receive the client's initial XMLRPC login_to_simulator request message
@@ -163,10 +163,10 @@ namespace OpenSim.Framework.Communications
163 } 163 }
164 else if (requestData.Contains("web_login_key")) 164 else if (requestData.Contains("web_login_key"))
165 { 165 {
166 LLUUID webloginkey = null; 166 UUID webloginkey = null;
167 try 167 try
168 { 168 {
169 webloginkey = new LLUUID((string)requestData["web_login_key"]); 169 webloginkey = new UUID((string)requestData["web_login_key"]);
170 } 170 }
171 catch (Exception e) 171 catch (Exception e)
172 { 172 {
@@ -227,7 +227,7 @@ namespace OpenSim.Framework.Communications
227 227
228 try 228 try
229 { 229 {
230 LLUUID agentID = userProfile.ID; 230 UUID agentID = userProfile.ID;
231 InventoryData inventData = null; 231 InventoryData inventData = null;
232 232
233 try 233 try
@@ -400,7 +400,7 @@ namespace OpenSim.Framework.Communications
400 400
401 try 401 try
402 { 402 {
403 LLUUID agentID = userProfile.ID; 403 UUID agentID = userProfile.ID;
404 404
405 //InventoryData inventData = GetInventorySkeleton(agentID); 405 //InventoryData inventData = GetInventorySkeleton(agentID);
406 InventoryData inventData = null; 406 InventoryData inventData = null;
@@ -566,7 +566,7 @@ namespace OpenSim.Framework.Communications
566 566
567 if (goodweblogin) 567 if (goodweblogin)
568 { 568 {
569 LLUUID webloginkey = LLUUID.Random(); 569 UUID webloginkey = UUID.Random();
570 m_userManager.StoreWebLoginKey(user.ID, webloginkey); 570 m_userManager.StoreWebLoginKey(user.ID, webloginkey);
571 statuscode = 301; 571 statuscode = 301;
572 572
@@ -737,13 +737,13 @@ namespace OpenSim.Framework.Communications
737 return passwordSuccess; 737 return passwordSuccess;
738 } 738 }
739 739
740 public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey) 740 public virtual bool AuthenticateUser(UserProfileData profile, UUID webloginkey)
741 { 741 {
742 bool passwordSuccess = false; 742 bool passwordSuccess = false;
743 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID); 743 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
744 744
745 // Match web login key unless it's the default weblogin key LLUUID.Zero 745 // Match web login key unless it's the default weblogin key UUID.Zero
746 passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != LLUUID.Zero); 746 passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != UUID.Zero);
747 747
748 return passwordSuccess; 748 return passwordSuccess;
749 } 749 }
@@ -803,7 +803,7 @@ namespace OpenSim.Framework.Communications
803 /// <returns></returns> 803 /// <returns></returns>
804 protected virtual ArrayList GetInventoryLibrary() 804 protected virtual ArrayList GetInventoryLibrary()
805 { 805 {
806 Dictionary<LLUUID, InventoryFolderImpl> rootFolders 806 Dictionary<UUID, InventoryFolderImpl> rootFolders
807 = m_libraryRootFolder.RequestSelfAndDescendentFolders(); 807 = m_libraryRootFolder.RequestSelfAndDescendentFolders();
808 ArrayList folderHashes = new ArrayList(); 808 ArrayList folderHashes = new ArrayList();
809 809
@@ -838,9 +838,9 @@ namespace OpenSim.Framework.Communications
838 public class InventoryData 838 public class InventoryData
839 { 839 {
840 public ArrayList InventoryArray = null; 840 public ArrayList InventoryArray = null;
841 public LLUUID RootFolderID = LLUUID.Zero; 841 public UUID RootFolderID = UUID.Zero;
842 842
843 public InventoryData(ArrayList invList, LLUUID rootID) 843 public InventoryData(ArrayList invList, UUID rootID)
844 { 844 {
845 InventoryArray = invList; 845 InventoryArray = invList;
846 RootFolderID = rootID; 846 RootFolderID = rootID;
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index a35ed72..5a63e70 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -31,8 +31,8 @@ using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Security.Cryptography; 33using System.Security.Cryptography;
34using libsecondlife; 34using OpenMetaverse;
35using libsecondlife.StructuredData; 35using OpenMetaverse.StructuredData;
36using log4net; 36using log4net;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenSim.Framework.Statistics; 38using OpenSim.Framework.Statistics;
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.Communications
59 new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); 59 new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect));
60 60
61 // loader will try to load all providers (MySQL, MSSQL, etc) 61 // loader will try to load all providers (MySQL, MSSQL, etc)
62 // unless it is constrainted to the correct "Provider" entry in the addin.xml 62 // unless it is constrainted to the correct "Provider" entry in the addin.Xml
63 loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); 63 loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider));
64 loader.Load(); 64 loader.Load();
65 65
@@ -84,14 +84,14 @@ namespace OpenSim.Framework.Communications
84 84
85 return null; 85 return null;
86 } 86 }
87 public void ResetAttachments(LLUUID userID) 87 public void ResetAttachments(UUID userID)
88 { 88 {
89 foreach (IUserDataPlugin plugin in _plugins) 89 foreach (IUserDataPlugin plugin in _plugins)
90 { 90 {
91 plugin.ResetAttachments(userID); 91 plugin.ResetAttachments(userID);
92 } 92 }
93 } 93 }
94 public UserAgentData GetAgentByUUID(LLUUID userId) 94 public UserAgentData GetAgentByUUID(UUID userId)
95 { 95 {
96 foreach (IUserDataPlugin plugin in _plugins) 96 foreach (IUserDataPlugin plugin in _plugins)
97 { 97 {
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Communications
106 return null; 106 return null;
107 } 107 }
108 // see IUserService 108 // see IUserService
109 public UserProfileData GetUserProfile(LLUUID uuid) 109 public UserProfileData GetUserProfile(UUID uuid)
110 { 110 {
111 foreach (IUserDataPlugin plugin in _plugins) 111 foreach (IUserDataPlugin plugin in _plugins)
112 { 112 {
@@ -122,7 +122,7 @@ namespace OpenSim.Framework.Communications
122 return null; 122 return null;
123 } 123 }
124 124
125 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) 125 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
126 { 126 {
127 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); 127 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
128 foreach (IUserDataPlugin plugin in _plugins) 128 foreach (IUserDataPlugin plugin in _plugins)
@@ -172,7 +172,7 @@ namespace OpenSim.Framework.Communications
172 /// </summary> 172 /// </summary>
173 /// <param name="uuid">The agent's UUID</param> 173 /// <param name="uuid">The agent's UUID</param>
174 /// <returns>Agent profiles</returns> 174 /// <returns>Agent profiles</returns>
175 public UserAgentData GetUserAgent(LLUUID uuid) 175 public UserAgentData GetUserAgent(UUID uuid)
176 { 176 {
177 foreach (IUserDataPlugin plugin in _plugins) 177 foreach (IUserDataPlugin plugin in _plugins)
178 { 178 {
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Communications
234 return null; 234 return null;
235 } 235 }
236 236
237 public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 237 public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
238 { 238 {
239 foreach (IUserDataPlugin plugin in _plugins) 239 foreach (IUserDataPlugin plugin in _plugins)
240 { 240 {
@@ -254,7 +254,7 @@ namespace OpenSim.Framework.Communications
254 /// </summary> 254 /// </summary>
255 /// <param name="name">the UUID of the friend list owner</param> 255 /// <param name="name">the UUID of the friend list owner</param>
256 /// <returns>A List of FriendListItems that contains info about the user's friends</returns> 256 /// <returns>A List of FriendListItems that contains info about the user's friends</returns>
257 public List<FriendListItem> GetUserFriendList(LLUUID ownerID) 257 public List<FriendListItem> GetUserFriendList(UUID ownerID)
258 { 258 {
259 foreach (IUserDataPlugin plugin in _plugins) 259 foreach (IUserDataPlugin plugin in _plugins)
260 { 260 {
@@ -271,7 +271,7 @@ namespace OpenSim.Framework.Communications
271 return null; 271 return null;
272 } 272 }
273 273
274 public void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) 274 public void StoreWebLoginKey(UUID agentID, UUID webLoginKey)
275 { 275 {
276 foreach (IUserDataPlugin plugin in _plugins) 276 foreach (IUserDataPlugin plugin in _plugins)
277 { 277 {
@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Communications
286 } 286 }
287 } 287 }
288 288
289 public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 289 public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
290 { 290 {
291 foreach (IUserDataPlugin plugin in _plugins) 291 foreach (IUserDataPlugin plugin in _plugins)
292 { 292 {
@@ -301,7 +301,7 @@ namespace OpenSim.Framework.Communications
301 } 301 }
302 } 302 }
303 303
304 public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 304 public void RemoveUserFriend(UUID friendlistowner, UUID friend)
305 { 305 {
306 foreach (IUserDataPlugin plugin in _plugins) 306 foreach (IUserDataPlugin plugin in _plugins)
307 { 307 {
@@ -316,7 +316,7 @@ namespace OpenSim.Framework.Communications
316 } 316 }
317 } 317 }
318 318
319 public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 319 public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
320 { 320 {
321 foreach (IUserDataPlugin plugin in _plugins) 321 foreach (IUserDataPlugin plugin in _plugins)
322 { 322 {
@@ -336,7 +336,7 @@ namespace OpenSim.Framework.Communications
336 /// Resets the currentAgent in the user profile 336 /// Resets the currentAgent in the user profile
337 /// </summary> 337 /// </summary>
338 /// <param name="agentID">The agent's ID</param> 338 /// <param name="agentID">The agent's ID</param>
339 public void ClearUserAgent(LLUUID agentID) 339 public void ClearUserAgent(UUID agentID)
340 { 340 {
341 UserProfileData profile = GetUserProfile(agentID); 341 UserProfileData profile = GetUserProfile(agentID);
342 342
@@ -382,8 +382,8 @@ namespace OpenSim.Framework.Communications
382 rand.GetBytes(randDataS); 382 rand.GetBytes(randDataS);
383 rand.GetBytes(randDataSS); 383 rand.GetBytes(randDataSS);
384 384
385 agent.SecureSessionID = new LLUUID(randDataSS, 0); 385 agent.SecureSessionID = new UUID(randDataSS, 0);
386 agent.SessionID = new LLUUID(randDataS, 0); 386 agent.SessionID = new UUID(randDataS, 0);
387 387
388 // Profile UUID 388 // Profile UUID
389 agent.ProfileID = profile.ID; 389 agent.ProfileID = profile.ID;
@@ -434,8 +434,8 @@ namespace OpenSim.Framework.Communications
434 agent.LogoutTime = 0; 434 agent.LogoutTime = 0;
435 435
436 // Current location 436 // Current location
437 agent.InitialRegion = LLUUID.Zero; // Fill in later 437 agent.InitialRegion = UUID.Zero; // Fill in later
438 agent.Region = LLUUID.Zero; // Fill in later 438 agent.Region = UUID.Zero; // Fill in later
439 439
440 profile.CurrentAgent = agent; 440 profile.CurrentAgent = agent;
441 } 441 }
@@ -449,14 +449,14 @@ namespace OpenSim.Framework.Communications
449 /// <param name="posx"></param> 449 /// <param name="posx"></param>
450 /// <param name="posy"></param> 450 /// <param name="posy"></param>
451 /// <param name="posz"></param> 451 /// <param name="posz"></param>
452 public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz) 452 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
453 { 453 {
454 if (StatsManager.UserStats != null) 454 if (StatsManager.UserStats != null)
455 StatsManager.UserStats.AddLogout(); 455 StatsManager.UserStats.AddLogout();
456 456
457 UserProfileData userProfile; 457 UserProfileData userProfile;
458 UserAgentData userAgent; 458 UserAgentData userAgent;
459 LLVector3 currentPos = new LLVector3(posx, posy, posz); 459 Vector3 currentPos = new Vector3(posx, posy, posz);
460 460
461 userProfile = GetUserProfile(userid); 461 userProfile = GetUserProfile(userid);
462 462
@@ -470,8 +470,8 @@ namespace OpenSim.Framework.Communications
470 { 470 {
471 userAgent.AgentOnline = false; 471 userAgent.AgentOnline = false;
472 userAgent.LogoutTime = Util.UnixTimeSinceEpoch(); 472 userAgent.LogoutTime = Util.UnixTimeSinceEpoch();
473 //userAgent.sessionID = LLUUID.Zero; 473 //userAgent.sessionID = UUID.Zero;
474 if (regionid != LLUUID.Zero) 474 if (regionid != UUID.Zero)
475 { 475 {
476 userAgent.Region = regionid; 476 userAgent.Region = regionid;
477 } 477 }
@@ -508,8 +508,8 @@ namespace OpenSim.Framework.Communications
508 rand.GetBytes(randDataS); 508 rand.GetBytes(randDataS);
509 rand.GetBytes(randDataSS); 509 rand.GetBytes(randDataSS);
510 510
511 agent.SecureSessionID = new LLUUID(randDataSS, 0); 511 agent.SecureSessionID = new UUID(randDataSS, 0);
512 agent.SessionID = new LLUUID(randDataS, 0); 512 agent.SessionID = new UUID(randDataS, 0);
513 513
514 // Profile UUID 514 // Profile UUID
515 agent.ProfileID = profile.ID; 515 agent.ProfileID = profile.ID;
@@ -523,8 +523,8 @@ namespace OpenSim.Framework.Communications
523 agent.LogoutTime = 0; 523 agent.LogoutTime = 0;
524 524
525 // Current location 525 // Current location
526 agent.InitialRegion = LLUUID.Zero; // Fill in later 526 agent.InitialRegion = UUID.Zero; // Fill in later
527 agent.Region = LLUUID.Zero; // Fill in later 527 agent.Region = UUID.Zero; // Fill in later
528 528
529 profile.CurrentAgent = agent; 529 profile.CurrentAgent = agent;
530 } 530 }
@@ -550,17 +550,17 @@ namespace OpenSim.Framework.Communications
550 /// 550 ///
551 /// </summary> 551 /// </summary>
552 /// <param name="user"></param> 552 /// <param name="user"></param>
553 public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) 553 public UUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
554 { 554 {
555 UserProfileData user = new UserProfileData(); 555 UserProfileData user = new UserProfileData();
556 user.HomeLocation = new LLVector3(128, 128, 100); 556 user.HomeLocation = new Vector3(128, 128, 100);
557 user.ID = LLUUID.Random(); 557 user.ID = UUID.Random();
558 user.FirstName = firstName; 558 user.FirstName = firstName;
559 user.SurName = lastName; 559 user.SurName = lastName;
560 user.PasswordHash = pass; 560 user.PasswordHash = pass;
561 user.PasswordSalt = String.Empty; 561 user.PasswordSalt = String.Empty;
562 user.Created = Util.UnixTimeSinceEpoch(); 562 user.Created = Util.UnixTimeSinceEpoch();
563 user.HomeLookAt = new LLVector3(100, 100, 100); 563 user.HomeLookAt = new Vector3(100, 100, 100);
564 user.HomeRegionX = regX; 564 user.HomeRegionX = regX;
565 user.HomeRegionY = regY; 565 user.HomeRegionY = regY;
566 566
@@ -604,7 +604,7 @@ namespace OpenSim.Framework.Communications
604 604
605 public abstract UserProfileData SetupMasterUser(string firstName, string lastName); 605 public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
606 public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password); 606 public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password);
607 public abstract UserProfileData SetupMasterUser(LLUUID uuid); 607 public abstract UserProfileData SetupMasterUser(UUID uuid);
608 608
609 /// <summary> 609 /// <summary>
610 /// Add agent to DB 610 /// Add agent to DB
@@ -629,7 +629,7 @@ namespace OpenSim.Framework.Communications
629 629
630 /// Appearance 630 /// Appearance
631 /// TODO: stubs for now to get us to a compiling state gently 631 /// TODO: stubs for now to get us to a compiling state gently
632 public AvatarAppearance GetUserAppearance(LLUUID user) 632 public AvatarAppearance GetUserAppearance(UUID user)
633 { 633 {
634 foreach (IUserDataPlugin plugin in _plugins) 634 foreach (IUserDataPlugin plugin in _plugins)
635 { 635 {
@@ -645,7 +645,7 @@ namespace OpenSim.Framework.Communications
645 return null; 645 return null;
646 } 646 }
647 647
648 public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 648 public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
649 { 649 {
650 foreach (IUserDataPlugin plugin in _plugins) 650 foreach (IUserDataPlugin plugin in _plugins)
651 { 651 {
generated by cgit v1.1 at 2024-12-14 08:56:03 +0000