aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
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
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs38
-rw-r--r--OpenSim/Framework/AgentCircuitManager.cs8
-rw-r--r--OpenSim/Framework/AgentUpdateArgs.cs20
-rw-r--r--OpenSim/Framework/AssetBase.cs10
-rw-r--r--OpenSim/Framework/AssetLandmark.cs10
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs10
-rw-r--r--OpenSim/Framework/AssetRequest.cs6
-rw-r--r--OpenSim/Framework/AssetRequestToClient.cs6
-rw-r--r--OpenSim/Framework/AssetStorage.cs8
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs210
-rw-r--r--OpenSim/Framework/AvatarPickerAvatar.cs6
-rw-r--r--OpenSim/Framework/AvatarPickerReplyAgentDataArgs.cs8
-rw-r--r--OpenSim/Framework/AvatarPickerReplyDataArgs.cs6
-rw-r--r--OpenSim/Framework/AvatarWearable.cs34
-rw-r--r--OpenSim/Framework/AvatarWearingArgs.cs8
-rw-r--r--OpenSim/Framework/Cache.cs48
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs9
-rw-r--r--OpenSim/Framework/ClientManager.cs8
-rw-r--r--OpenSim/Framework/ColliderData.cs14
-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
-rw-r--r--OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs2
-rw-r--r--OpenSim/Framework/Configuration/XML/XmlConfiguration.cs2
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs30
-rw-r--r--OpenSim/Framework/ConfigurationOption.cs8
-rw-r--r--OpenSim/Framework/EstateBan.cs4
-rw-r--r--OpenSim/Framework/EstateSettings.cs80
-rw-r--r--OpenSim/Framework/FriendListItem.cs8
-rw-r--r--OpenSim/Framework/GridInstantMessage.cs5
-rw-r--r--OpenSim/Framework/IAssetProvider.cs6
-rw-r--r--OpenSim/Framework/IAssetServer.cs6
-rw-r--r--OpenSim/Framework/IClientAPI.cs334
-rw-r--r--OpenSim/Framework/IInventoryData.cs20
-rw-r--r--OpenSim/Framework/IRegionCommsListener.cs16
-rw-r--r--OpenSim/Framework/IScene.cs8
-rw-r--r--OpenSim/Framework/IUserData.cs32
-rw-r--r--OpenSim/Framework/InventoryCollection.cs6
-rw-r--r--OpenSim/Framework/InventoryFolderBase.cs16
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs26
-rw-r--r--OpenSim/Framework/LLGroup.cs16
-rw-r--r--OpenSim/Framework/LandData.cs52
-rw-r--r--OpenSim/Framework/LandStatReportItem.cs4
-rw-r--r--OpenSim/Framework/LandUpdateArgs.cs16
-rw-r--r--OpenSim/Framework/Location.cs2
-rw-r--r--OpenSim/Framework/Login.cs18
-rw-r--r--OpenSim/Framework/MapBlockData.cs6
-rw-r--r--OpenSim/Framework/OSChatMessage.cs14
-rw-r--r--OpenSim/Framework/OSUUID.cs114
-rw-r--r--OpenSim/Framework/PacketPool.cs12
-rw-r--r--OpenSim/Framework/PluginLoader.cs2
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs48
-rw-r--r--OpenSim/Framework/ProxyCodec.cs4
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs18
-rw-r--r--OpenSim/Framework/RegionHandshakeArgs.cs22
-rw-r--r--OpenSim/Framework/RegionInfo.cs48
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs6
-rw-r--r--OpenSim/Framework/RegionSettings.cs68
-rw-r--r--OpenSim/Framework/RequestAssetArgs.cs6
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs14
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs4
-rw-r--r--OpenSim/Framework/Servers/LLSDMethod.cs2
-rw-r--r--OpenSim/Framework/Servers/LLSDMethodString.cs2
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsCollector.cs18
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs50
-rw-r--r--OpenSim/Framework/TextureRequestArgs.cs8
-rw-r--r--OpenSim/Framework/UserAgentData.cs28
-rw-r--r--OpenSim/Framework/UserProfileData.cs38
-rw-r--r--OpenSim/Framework/Util.cs28
-rw-r--r--OpenSim/Framework/ViewerEffectEventHandlerArg.cs8
-rw-r--r--OpenSim/Framework/sLLVector3.cs51
99 files changed, 1190 insertions, 1347 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 8c184c4..045bd00 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -26,23 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
33 public class AgentCircuitData 33 public class AgentCircuitData
34 { 34 {
35 public LLUUID AgentID; 35 public UUID AgentID;
36 public LLUUID BaseFolder; 36 public UUID BaseFolder;
37 public string CapsPath = String.Empty; 37 public string CapsPath = String.Empty;
38 public bool child; 38 public bool child;
39 public uint circuitcode; 39 public uint circuitcode;
40 public string firstname; 40 public string firstname;
41 public LLUUID InventoryFolder; 41 public UUID InventoryFolder;
42 public string lastname; 42 public string lastname;
43 public LLUUID SecureSessionID; 43 public UUID SecureSessionID;
44 public LLUUID SessionID; 44 public UUID SessionID;
45 public LLVector3 startpos; 45 public Vector3 startpos;
46 46
47 public AgentCircuitData() 47 public AgentCircuitData()
48 { 48 {
@@ -50,16 +50,16 @@ namespace OpenSim.Framework
50 50
51 public AgentCircuitData(sAgentCircuitData cAgent) 51 public AgentCircuitData(sAgentCircuitData cAgent)
52 { 52 {
53 AgentID = new LLUUID(cAgent.AgentID); 53 AgentID = new UUID(cAgent.AgentID);
54 SessionID = new LLUUID(cAgent.SessionID); 54 SessionID = new UUID(cAgent.SessionID);
55 SecureSessionID = new LLUUID(cAgent.SecureSessionID); 55 SecureSessionID = new UUID(cAgent.SecureSessionID);
56 startpos = new LLVector3(cAgent.startposx, cAgent.startposy, cAgent.startposz); 56 startpos = new Vector3(cAgent.startposx, cAgent.startposy, cAgent.startposz);
57 firstname = cAgent.firstname; 57 firstname = cAgent.firstname;
58 lastname = cAgent.lastname; 58 lastname = cAgent.lastname;
59 circuitcode = cAgent.circuitcode; 59 circuitcode = cAgent.circuitcode;
60 child = cAgent.child; 60 child = cAgent.child;
61 InventoryFolder = new LLUUID(cAgent.InventoryFolder); 61 InventoryFolder = new UUID(cAgent.InventoryFolder);
62 BaseFolder = new LLUUID(cAgent.BaseFolder); 62 BaseFolder = new UUID(cAgent.BaseFolder);
63 CapsPath = cAgent.CapsPath; 63 CapsPath = cAgent.CapsPath;
64 } 64 }
65 } 65 }
@@ -87,9 +87,9 @@ namespace OpenSim.Framework
87 87
88 public sAgentCircuitData(AgentCircuitData cAgent) 88 public sAgentCircuitData(AgentCircuitData cAgent)
89 { 89 {
90 AgentID = cAgent.AgentID.UUID; 90 AgentID = cAgent.AgentID.Guid;
91 SessionID = cAgent.SessionID.UUID; 91 SessionID = cAgent.SessionID.Guid;
92 SecureSessionID = cAgent.SecureSessionID.UUID; 92 SecureSessionID = cAgent.SecureSessionID.Guid;
93 startposx = cAgent.startpos.X; 93 startposx = cAgent.startpos.X;
94 startposy = cAgent.startpos.Y; 94 startposy = cAgent.startpos.Y;
95 startposz = cAgent.startpos.Z; 95 startposz = cAgent.startpos.Z;
@@ -97,9 +97,9 @@ namespace OpenSim.Framework
97 lastname = cAgent.lastname; 97 lastname = cAgent.lastname;
98 circuitcode = cAgent.circuitcode; 98 circuitcode = cAgent.circuitcode;
99 child = cAgent.child; 99 child = cAgent.child;
100 InventoryFolder = cAgent.InventoryFolder.UUID; 100 InventoryFolder = cAgent.InventoryFolder.Guid;
101 BaseFolder = cAgent.BaseFolder.UUID; 101 BaseFolder = cAgent.BaseFolder.Guid;
102 CapsPath = cAgent.CapsPath; 102 CapsPath = cAgent.CapsPath;
103 } 103 }
104 } 104 }
105} \ No newline at end of file 105}
diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index a235688..96a7816 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.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 31namespace OpenSim.Framework
32{ 32{
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
38 { 38 {
39 } 39 }
40 40
41 public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode) 41 public virtual AuthenticateResponse AuthenticateSession(UUID sessionID, UUID agentID, uint circuitcode)
42 { 42 {
43 AgentCircuitData validcircuit = null; 43 AgentCircuitData validcircuit = null;
44 if (AgentCircuits.ContainsKey(circuitcode)) 44 if (AgentCircuits.ContainsKey(circuitcode))
@@ -86,9 +86,9 @@ namespace OpenSim.Framework
86 } 86 }
87 } 87 }
88 88
89 public LLVector3 GetPosition(uint circuitCode) 89 public Vector3 GetPosition(uint circuitCode)
90 { 90 {
91 LLVector3 vec = new LLVector3(); 91 Vector3 vec = new Vector3();
92 if (AgentCircuits.ContainsKey(circuitCode)) 92 if (AgentCircuits.ContainsKey(circuitCode))
93 { 93 {
94 vec = AgentCircuits[circuitCode].startpos; 94 vec = AgentCircuits[circuitCode].startpos;
diff --git a/OpenSim/Framework/AgentUpdateArgs.cs b/OpenSim/Framework/AgentUpdateArgs.cs
index 9e83ae1..d9dee13 100644
--- a/OpenSim/Framework/AgentUpdateArgs.cs
+++ b/OpenSim/Framework/AgentUpdateArgs.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using libsecondlife; 2using OpenMetaverse;
3 3
4namespace OpenSim.Framework 4namespace OpenSim.Framework
5{ 5{
6 public class AgentUpdateArgs : EventArgs 6 public class AgentUpdateArgs : EventArgs
7 { 7 {
8 public LLUUID AgentID; 8 public UUID AgentID;
9 public LLQuaternion BodyRotation; 9 public Quaternion BodyRotation;
10 public LLVector3 CameraAtAxis; 10 public Vector3 CameraAtAxis;
11 public LLVector3 CameraCenter; 11 public Vector3 CameraCenter;
12 public LLVector3 CameraLeftAxis; 12 public Vector3 CameraLeftAxis;
13 public LLVector3 CameraUpAxis; 13 public Vector3 CameraUpAxis;
14 public uint ControlFlags; 14 public uint ControlFlags;
15 public float Far; 15 public float Far;
16 public byte Flags; 16 public byte Flags;
17 public LLQuaternion HeadRotation; 17 public Quaternion HeadRotation;
18 public LLUUID SessionID; 18 public UUID SessionID;
19 public byte State; 19 public byte State;
20 } 20 }
21} \ No newline at end of file 21}
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 6296067..48ef2ff 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
35 { 35 {
36 private byte[] _data; 36 private byte[] _data;
37 private string _description = String.Empty; 37 private string _description = String.Empty;
38 private LLUUID _fullid; 38 private UUID _fullid;
39 private bool _local = false; 39 private bool _local = false;
40 private string _name = String.Empty; 40 private string _name = String.Empty;
41 private bool _temporary = false; 41 private bool _temporary = false;
@@ -45,13 +45,13 @@ namespace OpenSim.Framework
45 { 45 {
46 } 46 }
47 47
48 public AssetBase(LLUUID assetId, string name) 48 public AssetBase(UUID assetId, string name)
49 { 49 {
50 FullID = assetId; 50 FullID = assetId;
51 Name = name; 51 Name = name;
52 } 52 }
53 53
54 public virtual LLUUID FullID 54 public virtual UUID FullID
55 { 55 {
56 get { return _fullid; } 56 get { return _fullid; }
57 set { _fullid = value; } 57 set { _fullid = value; }
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
60 public virtual string ID 60 public virtual string ID
61 { 61 {
62 get { return _fullid.ToString(); } 62 get { return _fullid.ToString(); }
63 set { _fullid = new LLUUID(value); } 63 set { _fullid = new UUID(value); }
64 } 64 }
65 65
66 public virtual byte[] Data 66 public virtual byte[] Data
diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs
index 004e472..cf663ee 100644
--- a/OpenSim/Framework/AssetLandmark.cs
+++ b/OpenSim/Framework/AssetLandmark.cs
@@ -26,15 +26,15 @@
26 */ 26 */
27 27
28using System.Text; 28using System.Text;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
33 public class AssetLandmark : AssetBase 33 public class AssetLandmark : AssetBase
34 { 34 {
35 public LLVector3 Position; 35 public Vector3 Position;
36 public ulong RegionHandle; 36 public ulong RegionHandle;
37 public LLUUID RegionID; 37 public UUID RegionID;
38 public int Version; 38 public int Version;
39 39
40 public AssetLandmark(AssetBase a) 40 public AssetLandmark(AssetBase a)
@@ -52,8 +52,8 @@ namespace OpenSim.Framework
52 string temp = Encoding.UTF8.GetString(Data).Trim(); 52 string temp = Encoding.UTF8.GetString(Data).Trim();
53 string[] parts = temp.Split('\n'); 53 string[] parts = temp.Split('\n');
54 int.TryParse(parts[0].Substring(17, 1), out Version); 54 int.TryParse(parts[0].Substring(17, 1), out Version);
55 LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID); 55 UUID.TryParse(parts[1].Substring(10, 36), out RegionID);
56 LLVector3.TryParse(parts[2].Substring(10, parts[2].Length - 10), out Position); 56 Vector3.TryParse(parts[2].Substring(10, parts[2].Length - 10), out Position);
57 ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle); 57 ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle);
58 } 58 }
59 } 59 }
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 7f0e2d6..73489ec 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.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
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
46 protected static AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage) 46 protected static AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage)
47 { 47 {
48 AssetBase asset = new AssetBase( 48 AssetBase asset = new AssetBase(
49 new LLUUID(assetIdStr), 49 new UUID(assetIdStr),
50 name 50 name
51 ); 51 );
52 52
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
88 88
89 public void ForEachDefaultXmlAsset(Action<AssetBase> action) 89 public void ForEachDefaultXmlAsset(Action<AssetBase> action)
90 { 90 {
91 string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.xml"); 91 string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.Xml");
92 92
93 ForEachDefaultXmlAsset(assetSetFilename, action); 93 ForEachDefaultXmlAsset(assetSetFilename, action);
94 } 94 }
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
118 } 118 }
119 else 119 else
120 { 120 {
121 m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.xml does not exist! No assets loaded."); 121 m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.Xml does not exist! No assets loaded.");
122 } 122 }
123 123
124 assets.ForEach(action); 124 assets.ForEach(action);
@@ -142,7 +142,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
142 142
143 for (int i = 0; i < source.Configs.Count; i++) 143 for (int i = 0; i < source.Configs.Count; i++)
144 { 144 {
145 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString()); 145 string assetIdStr = source.Configs[i].GetString("assetID", UUID.Random().ToString());
146 string name = source.Configs[i].GetString("name", String.Empty); 146 string name = source.Configs[i].GetString("name", String.Empty);
147 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); 147 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
148 string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty)); 148 string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty));
diff --git a/OpenSim/Framework/AssetRequest.cs b/OpenSim/Framework/AssetRequest.cs
index 71d5298..f6c184a 100644
--- a/OpenSim/Framework/AssetRequest.cs
+++ b/OpenSim/Framework/AssetRequest.cs
@@ -25,13 +25,13 @@
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 30namespace OpenSim.Framework
31{ 31{
32 public struct AssetRequest 32 public struct AssetRequest
33 { 33 {
34 public LLUUID AssetID; 34 public UUID AssetID;
35 public bool IsTexture; 35 public bool IsTexture;
36 } 36 }
37} \ No newline at end of file 37}
diff --git a/OpenSim/Framework/AssetRequestToClient.cs b/OpenSim/Framework/AssetRequestToClient.cs
index 916b9f5..2bf3d3e 100644
--- a/OpenSim/Framework/AssetRequestToClient.cs
+++ b/OpenSim/Framework/AssetRequestToClient.cs
@@ -28,7 +28,7 @@
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 33namespace OpenSim.Framework
34{ 34{
@@ -42,10 +42,10 @@ namespace OpenSim.Framework
42 /// </summary> 42 /// </summary>
43 public class AssetRequestToClient 43 public class AssetRequestToClient
44 { 44 {
45 public LLUUID RequestAssetID; 45 public UUID RequestAssetID;
46 public AssetBase AssetInf; 46 public AssetBase AssetInf;
47 public AssetBase ImageInfo; 47 public AssetBase ImageInfo;
48 public LLUUID TransferRequestID; 48 public UUID TransferRequestID;
49 public long DataPointer = 0; 49 public long DataPointer = 0;
50 public int NumPackets = 0; 50 public int NumPackets = 0;
51 public int PacketCounter = 0; 51 public int PacketCounter = 0;
diff --git a/OpenSim/Framework/AssetStorage.cs b/OpenSim/Framework/AssetStorage.cs
index d58d866..df02a97 100644
--- a/OpenSim/Framework/AssetStorage.cs
+++ b/OpenSim/Framework/AssetStorage.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 30namespace OpenSim.Framework
31{ 31{
@@ -34,15 +34,15 @@ namespace OpenSim.Framework
34 public byte[] Data; 34 public byte[] Data;
35 public string Name; 35 public string Name;
36 public sbyte Type; 36 public sbyte Type;
37 public LLUUID UUID; 37 public UUID UUID;
38 38
39 public AssetStorage() 39 public AssetStorage()
40 { 40 {
41 } 41 }
42 42
43 public AssetStorage(LLUUID assetUUID) 43 public AssetStorage(UUID assetUUID)
44 { 44 {
45 UUID = assetUUID; 45 UUID = assetUUID;
46 } 46 }
47 } 47 }
48} \ No newline at end of file 48}
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index a287201..0c0cfd5 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -30,8 +30,8 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Runtime.Serialization; 31using System.Runtime.Serialization;
32using System.Security.Permissions; 32using System.Security.Permissions;
33using libsecondlife; 33using OpenMetaverse;
34using libsecondlife.Packets; 34using OpenMetaverse.Packets;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Framework 37namespace OpenSim.Framework
@@ -58,20 +58,20 @@ namespace OpenSim.Framework
58 58
59 private readonly static int MAX_WEARABLES = 13; 59 private readonly static int MAX_WEARABLES = 13;
60 60
61 private static LLUUID BODY_ASSET = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); 61 private static UUID BODY_ASSET = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
62 private static LLUUID BODY_ITEM = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"); 62 private static UUID BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
63 private static LLUUID SKIN_ASSET = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); 63 private static UUID SKIN_ASSET = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb");
64 private static LLUUID SKIN_ITEM = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"); 64 private static UUID SKIN_ITEM = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
65 private static LLUUID SHIRT_ASSET = new LLUUID("00000000-38f9-1111-024e-222222111110"); 65 private static UUID SHIRT_ASSET = new UUID("00000000-38f9-1111-024e-222222111110");
66 private static LLUUID SHIRT_ITEM = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"); 66 private static UUID SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000");
67 private static LLUUID PANTS_ASSET = new LLUUID("00000000-38f9-1111-024e-222222111120"); 67 private static UUID PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120");
68 private static LLUUID PANTS_ITEM = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"); 68 private static UUID PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111");
69 69
70 public readonly static int VISUALPARAM_COUNT = 218; 70 public readonly static int VISUALPARAM_COUNT = 218;
71 71
72 protected LLUUID m_owner; 72 protected UUID m_owner;
73 73
74 public virtual LLUUID Owner 74 public virtual UUID Owner
75 { 75 {
76 get { return m_owner; } 76 get { return m_owner; }
77 set { m_owner = value; } 77 set { m_owner = value; }
@@ -100,107 +100,107 @@ namespace OpenSim.Framework
100 set { m_wearables = value; } 100 set { m_wearables = value; }
101 } 101 }
102 102
103 public virtual LLUUID BodyItem { 103 public virtual UUID BodyItem {
104 get { return m_wearables[BODY].ItemID; } 104 get { return m_wearables[BODY].ItemID; }
105 set { m_wearables[BODY].ItemID = value; } 105 set { m_wearables[BODY].ItemID = value; }
106 } 106 }
107 public virtual LLUUID BodyAsset { 107 public virtual UUID BodyAsset {
108 get { return m_wearables[BODY].AssetID; } 108 get { return m_wearables[BODY].AssetID; }
109 set { m_wearables[BODY].AssetID = value; } 109 set { m_wearables[BODY].AssetID = value; }
110 } 110 }
111 public virtual LLUUID SkinItem { 111 public virtual UUID SkinItem {
112 get { return m_wearables[SKIN].ItemID; } 112 get { return m_wearables[SKIN].ItemID; }
113 set { m_wearables[SKIN].ItemID = value; } 113 set { m_wearables[SKIN].ItemID = value; }
114 } 114 }
115 public virtual LLUUID SkinAsset { 115 public virtual UUID SkinAsset {
116 get { return m_wearables[SKIN].AssetID; } 116 get { return m_wearables[SKIN].AssetID; }
117 set { m_wearables[SKIN].AssetID = value; } 117 set { m_wearables[SKIN].AssetID = value; }
118 } 118 }
119 public virtual LLUUID HairItem { 119 public virtual UUID HairItem {
120 get { return m_wearables[HAIR].ItemID; } 120 get { return m_wearables[HAIR].ItemID; }
121 set { m_wearables[HAIR].ItemID = value; } 121 set { m_wearables[HAIR].ItemID = value; }
122 } 122 }
123 public virtual LLUUID HairAsset { 123 public virtual UUID HairAsset {
124 get { return m_wearables[HAIR].AssetID; } 124 get { return m_wearables[HAIR].AssetID; }
125 set { m_wearables[HAIR].AssetID = value; } 125 set { m_wearables[HAIR].AssetID = value; }
126 } 126 }
127 public virtual LLUUID EyesItem { 127 public virtual UUID EyesItem {
128 get { return m_wearables[EYES].ItemID; } 128 get { return m_wearables[EYES].ItemID; }
129 set { m_wearables[EYES].ItemID = value; } 129 set { m_wearables[EYES].ItemID = value; }
130 } 130 }
131 public virtual LLUUID EyesAsset { 131 public virtual UUID EyesAsset {
132 get { return m_wearables[EYES].AssetID; } 132 get { return m_wearables[EYES].AssetID; }
133 set { m_wearables[EYES].AssetID = value; } 133 set { m_wearables[EYES].AssetID = value; }
134 } 134 }
135 public virtual LLUUID ShirtItem { 135 public virtual UUID ShirtItem {
136 get { return m_wearables[SHIRT].ItemID; } 136 get { return m_wearables[SHIRT].ItemID; }
137 set { m_wearables[SHIRT].ItemID = value; } 137 set { m_wearables[SHIRT].ItemID = value; }
138 } 138 }
139 public virtual LLUUID ShirtAsset { 139 public virtual UUID ShirtAsset {
140 get { return m_wearables[SHIRT].AssetID; } 140 get { return m_wearables[SHIRT].AssetID; }
141 set { m_wearables[SHIRT].AssetID = value; } 141 set { m_wearables[SHIRT].AssetID = value; }
142 } 142 }
143 public virtual LLUUID PantsItem { 143 public virtual UUID PantsItem {
144 get { return m_wearables[PANTS].ItemID; } 144 get { return m_wearables[PANTS].ItemID; }
145 set { m_wearables[PANTS].ItemID = value; } 145 set { m_wearables[PANTS].ItemID = value; }
146 } 146 }
147 public virtual LLUUID PantsAsset { 147 public virtual UUID PantsAsset {
148 get { return m_wearables[PANTS].AssetID; } 148 get { return m_wearables[PANTS].AssetID; }
149 set { m_wearables[PANTS].AssetID = value; } 149 set { m_wearables[PANTS].AssetID = value; }
150 } 150 }
151 public virtual LLUUID ShoesItem { 151 public virtual UUID ShoesItem {
152 get { return m_wearables[SHOES].ItemID; } 152 get { return m_wearables[SHOES].ItemID; }
153 set { m_wearables[SHOES].ItemID = value; } 153 set { m_wearables[SHOES].ItemID = value; }
154 } 154 }
155 public virtual LLUUID ShoesAsset { 155 public virtual UUID ShoesAsset {
156 get { return m_wearables[SHOES].AssetID; } 156 get { return m_wearables[SHOES].AssetID; }
157 set { m_wearables[SHOES].AssetID = value; } 157 set { m_wearables[SHOES].AssetID = value; }
158 } 158 }
159 public virtual LLUUID SocksItem { 159 public virtual UUID SocksItem {
160 get { return m_wearables[SOCKS].ItemID; } 160 get { return m_wearables[SOCKS].ItemID; }
161 set { m_wearables[SOCKS].ItemID = value; } 161 set { m_wearables[SOCKS].ItemID = value; }
162 } 162 }
163 public virtual LLUUID SocksAsset { 163 public virtual UUID SocksAsset {
164 get { return m_wearables[SOCKS].AssetID; } 164 get { return m_wearables[SOCKS].AssetID; }
165 set { m_wearables[SOCKS].AssetID = value; } 165 set { m_wearables[SOCKS].AssetID = value; }
166 } 166 }
167 public virtual LLUUID JacketItem { 167 public virtual UUID JacketItem {
168 get { return m_wearables[JACKET].ItemID; } 168 get { return m_wearables[JACKET].ItemID; }
169 set { m_wearables[JACKET].ItemID = value; } 169 set { m_wearables[JACKET].ItemID = value; }
170 } 170 }
171 public virtual LLUUID JacketAsset { 171 public virtual UUID JacketAsset {
172 get { return m_wearables[JACKET].AssetID; } 172 get { return m_wearables[JACKET].AssetID; }
173 set { m_wearables[JACKET].AssetID = value; } 173 set { m_wearables[JACKET].AssetID = value; }
174 } 174 }
175 public virtual LLUUID GlovesItem { 175 public virtual UUID GlovesItem {
176 get { return m_wearables[GLOVES].ItemID; } 176 get { return m_wearables[GLOVES].ItemID; }
177 set { m_wearables[GLOVES].ItemID = value; } 177 set { m_wearables[GLOVES].ItemID = value; }
178 } 178 }
179 public virtual LLUUID GlovesAsset { 179 public virtual UUID GlovesAsset {
180 get { return m_wearables[GLOVES].AssetID; } 180 get { return m_wearables[GLOVES].AssetID; }
181 set { m_wearables[GLOVES].AssetID = value; } 181 set { m_wearables[GLOVES].AssetID = value; }
182 } 182 }
183 public virtual LLUUID UnderShirtItem { 183 public virtual UUID UnderShirtItem {
184 get { return m_wearables[UNDERSHIRT].ItemID; } 184 get { return m_wearables[UNDERSHIRT].ItemID; }
185 set { m_wearables[UNDERSHIRT].ItemID = value; } 185 set { m_wearables[UNDERSHIRT].ItemID = value; }
186 } 186 }
187 public virtual LLUUID UnderShirtAsset { 187 public virtual UUID UnderShirtAsset {
188 get { return m_wearables[UNDERSHIRT].AssetID; } 188 get { return m_wearables[UNDERSHIRT].AssetID; }
189 set { m_wearables[UNDERSHIRT].AssetID = value; } 189 set { m_wearables[UNDERSHIRT].AssetID = value; }
190 } 190 }
191 public virtual LLUUID UnderPantsItem { 191 public virtual UUID UnderPantsItem {
192 get { return m_wearables[UNDERPANTS].ItemID; } 192 get { return m_wearables[UNDERPANTS].ItemID; }
193 set { m_wearables[UNDERPANTS].ItemID = value; } 193 set { m_wearables[UNDERPANTS].ItemID = value; }
194 } 194 }
195 public virtual LLUUID UnderPantsAsset { 195 public virtual UUID UnderPantsAsset {
196 get { return m_wearables[UNDERPANTS].AssetID; } 196 get { return m_wearables[UNDERPANTS].AssetID; }
197 set { m_wearables[UNDERPANTS].AssetID = value; } 197 set { m_wearables[UNDERPANTS].AssetID = value; }
198 } 198 }
199 public virtual LLUUID SkirtItem { 199 public virtual UUID SkirtItem {
200 get { return m_wearables[SKIRT].ItemID; } 200 get { return m_wearables[SKIRT].ItemID; }
201 set { m_wearables[SKIRT].ItemID = value; } 201 set { m_wearables[SKIRT].ItemID = value; }
202 } 202 }
203 public virtual LLUUID SkirtAsset { 203 public virtual UUID SkirtAsset {
204 get { return m_wearables[SKIRT].AssetID; } 204 get { return m_wearables[SKIRT].AssetID; }
205 set { m_wearables[SKIRT].AssetID = value; } 205 set { m_wearables[SKIRT].AssetID = value; }
206 } 206 }
@@ -217,9 +217,9 @@ namespace OpenSim.Framework
217 m_wearables[PANTS].ItemID = PANTS_ITEM; 217 m_wearables[PANTS].ItemID = PANTS_ITEM;
218 } 218 }
219 219
220 protected LLObject.TextureEntry m_texture; 220 protected Primitive.TextureEntry m_texture;
221 221
222 public virtual LLObject.TextureEntry Texture 222 public virtual Primitive.TextureEntry Texture
223 { 223 {
224 get { return m_texture; } 224 get { return m_texture; }
225 set { m_texture = value; } 225 set { m_texture = value; }
@@ -242,13 +242,13 @@ namespace OpenSim.Framework
242 m_wearables[i] = new AvatarWearable(); 242 m_wearables[i] = new AvatarWearable();
243 } 243 }
244 m_serial = 0; 244 m_serial = 0;
245 m_owner = LLUUID.Zero; 245 m_owner = UUID.Zero;
246 m_visualparams = new byte[VISUALPARAM_COUNT]; 246 m_visualparams = new byte[VISUALPARAM_COUNT];
247 SetDefaultWearables(); 247 SetDefaultWearables();
248 m_texture = GetDefaultTexture(); 248 m_texture = GetDefaultTexture();
249 } 249 }
250 250
251 public AvatarAppearance(LLUUID avatarID, AvatarWearable[] wearables, byte[] visualParams) 251 public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams)
252 { 252 {
253 m_owner = avatarID; 253 m_owner = avatarID;
254 m_serial = 1; 254 m_serial = 1;
@@ -264,7 +264,7 @@ namespace OpenSim.Framework
264 /// <param name="visualParam"></param> 264 /// <param name="visualParam"></param>
265 public virtual void SetAppearance(byte[] texture, List<byte> visualParam) 265 public virtual void SetAppearance(byte[] texture, List<byte> visualParam)
266 { 266 {
267 LLObject.TextureEntry textureEnt = new LLObject.TextureEntry(texture, 0, texture.Length); 267 Primitive.TextureEntry textureEnt = new Primitive.TextureEntry(texture, 0, texture.Length);
268 m_texture = textureEnt; 268 m_texture = textureEnt;
269 269
270 m_visualparams = visualParam.ToArray(); 270 m_visualparams = visualParam.ToArray();
@@ -281,16 +281,16 @@ namespace OpenSim.Framework
281 m_wearables[wearableId] = wearable; 281 m_wearables[wearableId] = wearable;
282 } 282 }
283 283
284 public static LLObject.TextureEntry GetDefaultTexture() 284 public static Primitive.TextureEntry GetDefaultTexture()
285 { 285 {
286 LLObject.TextureEntry textu = new LLObject.TextureEntry(new LLUUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); 286 Primitive.TextureEntry textu = new Primitive.TextureEntry(new UUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97"));
287 textu.CreateFace(0).TextureID = new LLUUID("00000000-0000-1111-9999-000000000012"); 287 textu.CreateFace(0).TextureID = new UUID("00000000-0000-1111-9999-000000000012");
288 textu.CreateFace(1).TextureID = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f"); 288 textu.CreateFace(1).TextureID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f");
289 textu.CreateFace(2).TextureID = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f"); 289 textu.CreateFace(2).TextureID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f");
290 textu.CreateFace(3).TextureID = new LLUUID("6522E74D-1660-4E7F-B601-6F48C1659A77"); 290 textu.CreateFace(3).TextureID = new UUID("6522E74D-1660-4E7F-B601-6F48C1659A77");
291 textu.CreateFace(4).TextureID = new LLUUID("7CA39B4C-BD19-4699-AFF7-F93FD03D3E7B"); 291 textu.CreateFace(4).TextureID = new UUID("7CA39B4C-BD19-4699-AFF7-F93FD03D3E7B");
292 textu.CreateFace(5).TextureID = new LLUUID("00000000-0000-1111-9999-000000000010"); 292 textu.CreateFace(5).TextureID = new UUID("00000000-0000-1111-9999-000000000010");
293 textu.CreateFace(6).TextureID = new LLUUID("00000000-0000-1111-9999-000000000011"); 293 textu.CreateFace(6).TextureID = new UUID("00000000-0000-1111-9999-000000000011");
294 return textu; 294 return textu;
295 } 295 }
296 296
@@ -313,13 +313,13 @@ namespace OpenSim.Framework
313 throw new ArgumentNullException("info"); 313 throw new ArgumentNullException("info");
314 } 314 }
315 315
316 m_owner = new LLUUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid))); 316 m_owner = new UUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid)));
317 m_serial = (int)info.GetValue("m_wearablesSerial", typeof(int)); 317 m_serial = (int)info.GetValue("m_wearablesSerial", typeof(int));
318 m_visualparams = (byte[])info.GetValue("m_visualParams", typeof(byte[])); 318 m_visualparams = (byte[])info.GetValue("m_visualParams", typeof(byte[]));
319 m_wearables = (AvatarWearable[])info.GetValue("m_wearables", typeof(AvatarWearable[])); 319 m_wearables = (AvatarWearable[])info.GetValue("m_wearables", typeof(AvatarWearable[]));
320 320
321 byte[] m_textureEntry_work = (byte[])info.GetValue("m_textureEntry", typeof(byte[])); 321 byte[] m_textureEntry_work = (byte[])info.GetValue("m_textureEntry", typeof(byte[]));
322 m_texture = new LLObject.TextureEntry(m_textureEntry_work, 0, m_textureEntry_work.Length); 322 m_texture = new Primitive.TextureEntry(m_textureEntry_work, 0, m_textureEntry_work.Length);
323 323
324 m_avatarHeight = (float)info.GetValue("m_avatarHeight", typeof(float)); 324 m_avatarHeight = (float)info.GetValue("m_avatarHeight", typeof(float));
325 325
@@ -371,10 +371,10 @@ namespace OpenSim.Framework
371 371
372 public AvatarAppearance(Hashtable h) 372 public AvatarAppearance(Hashtable h)
373 { 373 {
374 Owner = new LLUUID((string)h["owner"]); 374 Owner = new UUID((string)h["owner"]);
375 Serial = Convert.ToInt32((string)h["serial"]); 375 Serial = Convert.ToInt32((string)h["serial"]);
376 VisualParams = (byte[])h["visual_params"]; 376 VisualParams = (byte[])h["visual_params"];
377 Texture = new LLObject.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length); 377 Texture = new Primitive.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length);
378 AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); 378 AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]);
379 379
380 m_wearables = new AvatarWearable[MAX_WEARABLES]; 380 m_wearables = new AvatarWearable[MAX_WEARABLES];
@@ -384,32 +384,32 @@ namespace OpenSim.Framework
384 m_wearables[i] = new AvatarWearable(); 384 m_wearables[i] = new AvatarWearable();
385 } 385 }
386 386
387 BodyItem = new LLUUID((string)h["body_item"]); 387 BodyItem = new UUID((string)h["body_item"]);
388 BodyAsset = new LLUUID((string)h["body_asset"]); 388 BodyAsset = new UUID((string)h["body_asset"]);
389 SkinItem = new LLUUID((string)h["skin_item"]); 389 SkinItem = new UUID((string)h["skin_item"]);
390 SkinAsset = new LLUUID((string)h["skin_asset"]); 390 SkinAsset = new UUID((string)h["skin_asset"]);
391 HairItem = new LLUUID((string)h["hair_item"]); 391 HairItem = new UUID((string)h["hair_item"]);
392 HairAsset = new LLUUID((string)h["hair_asset"]); 392 HairAsset = new UUID((string)h["hair_asset"]);
393 EyesItem = new LLUUID((string)h["eyes_item"]); 393 EyesItem = new UUID((string)h["eyes_item"]);
394 EyesAsset = new LLUUID((string)h["eyes_asset"]); 394 EyesAsset = new UUID((string)h["eyes_asset"]);
395 ShirtItem = new LLUUID((string)h["shirt_item"]); 395 ShirtItem = new UUID((string)h["shirt_item"]);
396 ShirtAsset = new LLUUID((string)h["shirt_asset"]); 396 ShirtAsset = new UUID((string)h["shirt_asset"]);
397 PantsItem = new LLUUID((string)h["pants_item"]); 397 PantsItem = new UUID((string)h["pants_item"]);
398 PantsAsset = new LLUUID((string)h["pants_asset"]); 398 PantsAsset = new UUID((string)h["pants_asset"]);
399 ShoesItem = new LLUUID((string)h["shoes_item"]); 399 ShoesItem = new UUID((string)h["shoes_item"]);
400 ShoesAsset = new LLUUID((string)h["shoes_asset"]); 400 ShoesAsset = new UUID((string)h["shoes_asset"]);
401 SocksItem = new LLUUID((string)h["socks_item"]); 401 SocksItem = new UUID((string)h["socks_item"]);
402 SocksAsset = new LLUUID((string)h["socks_asset"]); 402 SocksAsset = new UUID((string)h["socks_asset"]);
403 JacketItem = new LLUUID((string)h["jacket_item"]); 403 JacketItem = new UUID((string)h["jacket_item"]);
404 JacketAsset = new LLUUID((string)h["jacket_asset"]); 404 JacketAsset = new UUID((string)h["jacket_asset"]);
405 GlovesItem = new LLUUID((string)h["gloves_item"]); 405 GlovesItem = new UUID((string)h["gloves_item"]);
406 GlovesAsset = new LLUUID((string)h["gloves_asset"]); 406 GlovesAsset = new UUID((string)h["gloves_asset"]);
407 UnderShirtItem = new LLUUID((string)h["undershirt_item"]); 407 UnderShirtItem = new UUID((string)h["undershirt_item"]);
408 UnderShirtAsset = new LLUUID((string)h["undershirt_asset"]); 408 UnderShirtAsset = new UUID((string)h["undershirt_asset"]);
409 UnderPantsItem = new LLUUID((string)h["underpants_item"]); 409 UnderPantsItem = new UUID((string)h["underpants_item"]);
410 UnderPantsAsset = new LLUUID((string)h["underpants_asset"]); 410 UnderPantsAsset = new UUID((string)h["underpants_asset"]);
411 SkirtItem = new LLUUID((string)h["skirt_item"]); 411 SkirtItem = new UUID((string)h["skirt_item"]);
412 SkirtAsset = new LLUUID((string)h["skirt_asset"]); 412 SkirtAsset = new UUID((string)h["skirt_asset"]);
413 413
414 if (h.ContainsKey("attachments")) 414 if (h.ContainsKey("attachments"))
415 { 415 {
@@ -427,7 +427,7 @@ namespace OpenSim.Framework
427 throw new ArgumentNullException("info"); 427 throw new ArgumentNullException("info");
428 } 428 }
429 429
430 info.AddValue("m_scenePresenceID", m_owner.UUID); 430 info.AddValue("m_scenePresenceID", m_owner.Guid);
431 info.AddValue("m_wearablesSerial", m_serial); 431 info.AddValue("m_wearablesSerial", m_serial);
432 info.AddValue("m_visualParams", m_visualparams); 432 info.AddValue("m_visualParams", m_visualparams);
433 info.AddValue("m_wearables", m_wearables); 433 info.AddValue("m_wearables", m_wearables);
@@ -435,7 +435,7 @@ namespace OpenSim.Framework
435 info.AddValue("m_avatarHeight", m_avatarHeight); 435 info.AddValue("m_avatarHeight", m_avatarHeight);
436 } 436 }
437 437
438 private Dictionary<int, LLUUID[]> m_attachments = new Dictionary<int, LLUUID[]>(); 438 private Dictionary<int, UUID[]> m_attachments = new Dictionary<int, UUID[]>();
439 439
440 public void SetAttachments(Hashtable data) 440 public void SetAttachments(Hashtable data)
441 { 441 {
@@ -451,14 +451,14 @@ namespace OpenSim.Framework
451 if (m_attachments.ContainsKey(attachpoint)) 451 if (m_attachments.ContainsKey(attachpoint))
452 continue; 452 continue;
453 453
454 LLUUID item; 454 UUID item;
455 LLUUID asset; 455 UUID asset;
456 456
457 Hashtable uuids = (Hashtable) e.Value; 457 Hashtable uuids = (Hashtable) e.Value;
458 LLUUID.TryParse(uuids["item"].ToString(), out item); 458 UUID.TryParse(uuids["item"].ToString(), out item);
459 LLUUID.TryParse(uuids["asset"].ToString(), out asset); 459 UUID.TryParse(uuids["asset"].ToString(), out asset);
460 460
461 LLUUID[] attachment = new LLUUID[2]; 461 UUID[] attachment = new UUID[2];
462 attachment[0] = item; 462 attachment[0] = item;
463 attachment[1] = asset; 463 attachment[1] = asset;
464 464
@@ -473,10 +473,10 @@ namespace OpenSim.Framework
473 473
474 Hashtable ret = new Hashtable(); 474 Hashtable ret = new Hashtable();
475 475
476 foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments) 476 foreach (KeyValuePair<int, UUID[]> kvp in m_attachments)
477 { 477 {
478 int attachpoint = kvp.Key; 478 int attachpoint = kvp.Key;
479 LLUUID[] uuids = kvp.Value; 479 UUID[] uuids = kvp.Value;
480 480
481 Hashtable data = new Hashtable(); 481 Hashtable data = new Hashtable();
482 data["item"] = uuids[0].ToString(); 482 data["item"] = uuids[0].ToString();
@@ -493,28 +493,28 @@ namespace OpenSim.Framework
493 return new List<int>(m_attachments.Keys); 493 return new List<int>(m_attachments.Keys);
494 } 494 }
495 495
496 public LLUUID GetAttachedItem(int attachpoint) 496 public UUID GetAttachedItem(int attachpoint)
497 { 497 {
498 if (!m_attachments.ContainsKey(attachpoint)) 498 if (!m_attachments.ContainsKey(attachpoint))
499 return LLUUID.Zero; 499 return UUID.Zero;
500 500
501 return m_attachments[attachpoint][0]; 501 return m_attachments[attachpoint][0];
502 } 502 }
503 503
504 public LLUUID GetAttachedAsset(int attachpoint) 504 public UUID GetAttachedAsset(int attachpoint)
505 { 505 {
506 if (!m_attachments.ContainsKey(attachpoint)) 506 if (!m_attachments.ContainsKey(attachpoint))
507 return LLUUID.Zero; 507 return UUID.Zero;
508 508
509 return m_attachments[attachpoint][1]; 509 return m_attachments[attachpoint][1];
510 } 510 }
511 511
512 public void SetAttachment(int attachpoint, LLUUID item, LLUUID asset) 512 public void SetAttachment(int attachpoint, UUID item, UUID asset)
513 { 513 {
514 if (attachpoint == 0) 514 if (attachpoint == 0)
515 return; 515 return;
516 516
517 if (item == LLUUID.Zero) 517 if (item == UUID.Zero)
518 { 518 {
519 if (m_attachments.ContainsKey(attachpoint)) 519 if (m_attachments.ContainsKey(attachpoint))
520 m_attachments.Remove(attachpoint); 520 m_attachments.Remove(attachpoint);
@@ -522,15 +522,15 @@ namespace OpenSim.Framework
522 } 522 }
523 523
524 if (!m_attachments.ContainsKey(attachpoint)) 524 if (!m_attachments.ContainsKey(attachpoint))
525 m_attachments[attachpoint] = new LLUUID[2]; 525 m_attachments[attachpoint] = new UUID[2];
526 526
527 m_attachments[attachpoint][0] = item; 527 m_attachments[attachpoint][0] = item;
528 m_attachments[attachpoint][1] = asset; 528 m_attachments[attachpoint][1] = asset;
529 } 529 }
530 530
531 public int GetAttachpoint(LLUUID itemID) 531 public int GetAttachpoint(UUID itemID)
532 { 532 {
533 foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments) 533 foreach (KeyValuePair<int, UUID[]> kvp in m_attachments)
534 { 534 {
535 if (kvp.Value[0] == itemID) 535 if (kvp.Value[0] == itemID)
536 { 536 {
@@ -540,7 +540,7 @@ namespace OpenSim.Framework
540 return 0; 540 return 0;
541 } 541 }
542 542
543 public void DetachAttachment(LLUUID itemID) 543 public void DetachAttachment(UUID itemID)
544 { 544 {
545 int attachpoint = GetAttachpoint(itemID); 545 int attachpoint = GetAttachpoint(itemID);
546 546
@@ -552,7 +552,7 @@ namespace OpenSim.Framework
552 { 552 {
553 List<string> strings = new List<string>(); 553 List<string> strings = new List<string>();
554 554
555 foreach (KeyValuePair<int, LLUUID[]> e in m_attachments) 555 foreach (KeyValuePair<int, UUID[]> e in m_attachments)
556 { 556 {
557 strings.Add(e.Key.ToString()); 557 strings.Add(e.Key.ToString());
558 strings.Add(e.Value[0].ToString()); 558 strings.Add(e.Value[0].ToString());
@@ -572,13 +572,13 @@ namespace OpenSim.Framework
572 while (strings.Length - i > 2) 572 while (strings.Length - i > 2)
573 { 573 {
574 int attachpoint = Int32.Parse(strings[i]); 574 int attachpoint = Int32.Parse(strings[i]);
575 LLUUID item = new LLUUID(strings[i+1]); 575 UUID item = new UUID(strings[i+1]);
576 LLUUID asset = new LLUUID(strings[i+2]); 576 UUID asset = new UUID(strings[i+2]);
577 i += 3; 577 i += 3;
578 578
579 if (!m_attachments.ContainsKey(attachpoint)) 579 if (!m_attachments.ContainsKey(attachpoint))
580 { 580 {
581 m_attachments[attachpoint] = new LLUUID[2]; 581 m_attachments[attachpoint] = new UUID[2];
582 m_attachments[attachpoint][0] = item; 582 m_attachments[attachpoint][0] = item;
583 m_attachments[attachpoint][1] = asset; 583 m_attachments[attachpoint][1] = asset;
584 } 584 }
diff --git a/OpenSim/Framework/AvatarPickerAvatar.cs b/OpenSim/Framework/AvatarPickerAvatar.cs
index a7e986f..8aa4aa6 100644
--- a/OpenSim/Framework/AvatarPickerAvatar.cs
+++ b/OpenSim/Framework/AvatarPickerAvatar.cs
@@ -25,14 +25,14 @@
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 30namespace OpenSim.Framework
31{ 31{
32 public class AvatarPickerAvatar 32 public class AvatarPickerAvatar
33 { 33 {
34 public LLUUID AvatarID; 34 public UUID AvatarID;
35 public string firstName; 35 public string firstName;
36 public string lastName; 36 public string lastName;
37 } 37 }
38} \ No newline at end of file 38}
diff --git a/OpenSim/Framework/AvatarPickerReplyAgentDataArgs.cs b/OpenSim/Framework/AvatarPickerReplyAgentDataArgs.cs
index 5fb06eb..04ed570 100644
--- a/OpenSim/Framework/AvatarPickerReplyAgentDataArgs.cs
+++ b/OpenSim/Framework/AvatarPickerReplyAgentDataArgs.cs
@@ -1,11 +1,11 @@
1using System; 1using System;
2using libsecondlife; 2using OpenMetaverse;
3 3
4namespace OpenSim.Framework 4namespace OpenSim.Framework
5{ 5{
6 public class AvatarPickerReplyAgentDataArgs : EventArgs 6 public class AvatarPickerReplyAgentDataArgs : EventArgs
7 { 7 {
8 public LLUUID AgentID; 8 public UUID AgentID;
9 public LLUUID QueryID; 9 public UUID QueryID;
10 } 10 }
11} \ No newline at end of file 11}
diff --git a/OpenSim/Framework/AvatarPickerReplyDataArgs.cs b/OpenSim/Framework/AvatarPickerReplyDataArgs.cs
index b15e4a5..723732b 100644
--- a/OpenSim/Framework/AvatarPickerReplyDataArgs.cs
+++ b/OpenSim/Framework/AvatarPickerReplyDataArgs.cs
@@ -1,12 +1,12 @@
1using System; 1using System;
2using libsecondlife; 2using OpenMetaverse;
3 3
4namespace OpenSim.Framework 4namespace OpenSim.Framework
5{ 5{
6 public class AvatarPickerReplyDataArgs : EventArgs 6 public class AvatarPickerReplyDataArgs : EventArgs
7 { 7 {
8 public LLUUID AvatarID; 8 public UUID AvatarID;
9 public byte[] FirstName; 9 public byte[] FirstName;
10 public byte[] LastName; 10 public byte[] LastName;
11 } 11 }
12} \ No newline at end of file 12}
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index fdcc776..59e6a1b 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -28,21 +28,21 @@
28using System; 28using System;
29using System.Runtime.Serialization; 29using System.Runtime.Serialization;
30using System.Security.Permissions; 30using System.Security.Permissions;
31using libsecondlife; 31using OpenMetaverse;
32 32
33namespace OpenSim.Framework 33namespace OpenSim.Framework
34{ 34{
35 [Serializable] 35 [Serializable]
36 public class AvatarWearable : ISerializable 36 public class AvatarWearable : ISerializable
37 { 37 {
38 public LLUUID AssetID = new LLUUID("00000000-0000-0000-0000-000000000000"); 38 public UUID AssetID = new UUID("00000000-0000-0000-0000-000000000000");
39 public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000"); 39 public UUID ItemID = new UUID("00000000-0000-0000-0000-000000000000");
40 40
41 public AvatarWearable() 41 public AvatarWearable()
42 { 42 {
43 } 43 }
44 44
45 public AvatarWearable(LLUUID itemId, LLUUID assetId) 45 public AvatarWearable(UUID itemId, UUID assetId)
46 { 46 {
47 AssetID = assetId; 47 AssetID = assetId;
48 ItemID = itemId; 48 ItemID = itemId;
@@ -56,8 +56,8 @@ namespace OpenSim.Framework
56 throw new ArgumentNullException("info"); 56 throw new ArgumentNullException("info");
57 } 57 }
58 58
59 AssetID = new LLUUID((Guid) info.GetValue("AssetID", typeof (Guid))); 59 AssetID = new UUID((Guid) info.GetValue("AssetID", typeof (Guid)));
60 ItemID = new LLUUID((Guid) info.GetValue("ItemID", typeof (Guid))); 60 ItemID = new UUID((Guid) info.GetValue("ItemID", typeof (Guid)));
61 61
62 //System.Console.WriteLine("AvatarWearable Deserialize END"); 62 //System.Console.WriteLine("AvatarWearable Deserialize END");
63 } 63 }
@@ -71,17 +71,17 @@ namespace OpenSim.Framework
71 { 71 {
72 defaultWearables[i] = new AvatarWearable(); 72 defaultWearables[i] = new AvatarWearable();
73 } 73 }
74 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); 74 defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
75 defaultWearables[0].ItemID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"); 75 defaultWearables[0].ItemID = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
76 76
77 defaultWearables[1].ItemID = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"); 77 defaultWearables[1].ItemID = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
78 defaultWearables[1].AssetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); 78 defaultWearables[1].AssetID = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb");
79 79
80 defaultWearables[4].ItemID = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"); 80 defaultWearables[4].ItemID = new UUID("77c41e39-38f9-f75a-0000-585989bf0000");
81 defaultWearables[4].AssetID = new LLUUID("00000000-38f9-1111-024e-222222111110"); 81 defaultWearables[4].AssetID = new UUID("00000000-38f9-1111-024e-222222111110");
82 82
83 defaultWearables[5].ItemID = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"); 83 defaultWearables[5].ItemID = new UUID("77c41e39-38f9-f75a-0000-5859892f1111");
84 defaultWearables[5].AssetID = new LLUUID("00000000-38f9-1111-024e-222222111120"); 84 defaultWearables[5].AssetID = new UUID("00000000-38f9-1111-024e-222222111120");
85 return defaultWearables; 85 return defaultWearables;
86 } 86 }
87 } 87 }
@@ -98,10 +98,10 @@ namespace OpenSim.Framework
98 throw new ArgumentNullException("info"); 98 throw new ArgumentNullException("info");
99 } 99 }
100 100
101 info.AddValue("AssetID", AssetID.UUID); 101 info.AddValue("AssetID", AssetID.Guid);
102 info.AddValue("ItemID", ItemID.UUID); 102 info.AddValue("ItemID", ItemID.Guid);
103 } 103 }
104 104
105 #endregion 105 #endregion
106 } 106 }
107} \ No newline at end of file 107}
diff --git a/OpenSim/Framework/AvatarWearingArgs.cs b/OpenSim/Framework/AvatarWearingArgs.cs
index e85df1c..dde74f9 100644
--- a/OpenSim/Framework/AvatarWearingArgs.cs
+++ b/OpenSim/Framework/AvatarWearingArgs.cs
@@ -1,6 +1,6 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using libsecondlife; 3using OpenMetaverse;
4 4
5namespace OpenSim.Framework 5namespace OpenSim.Framework
6{ 6{
@@ -21,10 +21,10 @@ namespace OpenSim.Framework
21 21
22 public class Wearable 22 public class Wearable
23 { 23 {
24 public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000"); 24 public UUID ItemID = new UUID("00000000-0000-0000-0000-000000000000");
25 public byte Type = 0; 25 public byte Type = 0;
26 26
27 public Wearable(LLUUID itemId, byte type) 27 public Wearable(UUID itemId, byte type)
28 { 28 {
29 ItemID = itemId; 29 ItemID = itemId;
30 Type = type; 30 Type = type;
@@ -33,4 +33,4 @@ namespace OpenSim.Framework
33 33
34 #endregion 34 #endregion
35 } 35 }
36} \ No newline at end of file 36}
diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs
index 427072d..261e0f9 100644
--- a/OpenSim/Framework/Cache.cs
+++ b/OpenSim/Framework/Cache.cs
@@ -1,13 +1,13 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using libsecondlife; 3using OpenMetaverse;
4 4
5namespace Opensim.Framework 5namespace Opensim.Framework
6{ 6{
7 // The delegate we will use for performing fetch from backing store 7 // The delegate we will use for performing fetch from backing store
8 // 8 //
9 public delegate Object FetchDelegate(LLUUID index); 9 public delegate Object FetchDelegate(UUID index);
10 public delegate bool ExpireDelegate(LLUUID index); 10 public delegate bool ExpireDelegate(UUID index);
11 11
12 // Strategy 12 // Strategy
13 // 13 //
@@ -37,14 +37,14 @@ namespace Opensim.Framework
37 } 37 }
38 38
39 // The base class of all cache objects. Implements comparison and sorting 39 // The base class of all cache objects. Implements comparison and sorting
40 // by the LLUUID member. 40 // by the UUID member.
41 // 41 //
42 // This is not abstract because we need to instantiate it briefly as a 42 // This is not abstract because we need to instantiate it briefly as a
43 // method parameter 43 // method parameter
44 // 44 //
45 public class CacheItemBase : IEquatable<CacheItemBase>, IComparable<CacheItemBase> 45 public class CacheItemBase : IEquatable<CacheItemBase>, IComparable<CacheItemBase>
46 { 46 {
47 public LLUUID uuid; 47 public UUID uuid;
48 public DateTime entered; 48 public DateTime entered;
49 public DateTime lastUsed; 49 public DateTime lastUsed;
50 public DateTime expires = new DateTime(0); 50 public DateTime expires = new DateTime(0);
@@ -59,14 +59,14 @@ namespace Opensim.Framework
59 { 59 {
60 } 60 }
61 61
62 public CacheItemBase(LLUUID index) 62 public CacheItemBase(UUID index)
63 { 63 {
64 uuid = index; 64 uuid = index;
65 entered = DateTime.Now; 65 entered = DateTime.Now;
66 lastUsed = entered; 66 lastUsed = entered;
67 } 67 }
68 68
69 public CacheItemBase(LLUUID index, DateTime ttl) 69 public CacheItemBase(UUID index, DateTime ttl)
70 { 70 {
71 uuid = index; 71 uuid = index;
72 entered = DateTime.Now; 72 entered = DateTime.Now;
@@ -96,23 +96,23 @@ namespace Opensim.Framework
96 { 96 {
97 private Object m_Data; 97 private Object m_Data;
98 98
99 public MemoryCacheItem(LLUUID index) : 99 public MemoryCacheItem(UUID index) :
100 base(index) 100 base(index)
101 { 101 {
102 } 102 }
103 103
104 public MemoryCacheItem(LLUUID index, DateTime ttl) : 104 public MemoryCacheItem(UUID index, DateTime ttl) :
105 base(index, ttl) 105 base(index, ttl)
106 { 106 {
107 } 107 }
108 108
109 public MemoryCacheItem(LLUUID index, Object data) : 109 public MemoryCacheItem(UUID index, Object data) :
110 base(index) 110 base(index)
111 { 111 {
112 Store(data); 112 Store(data);
113 } 113 }
114 114
115 public MemoryCacheItem(LLUUID index, DateTime ttl, Object data) : 115 public MemoryCacheItem(UUID index, DateTime ttl, Object data) :
116 base(index, ttl) 116 base(index, ttl)
117 { 117 {
118 Store(data); 118 Store(data);
@@ -133,23 +133,23 @@ namespace Opensim.Framework
133 // 133 //
134 public class FileCacheItem : CacheItemBase 134 public class FileCacheItem : CacheItemBase
135 { 135 {
136 public FileCacheItem(LLUUID index) : 136 public FileCacheItem(UUID index) :
137 base(index) 137 base(index)
138 { 138 {
139 } 139 }
140 140
141 public FileCacheItem(LLUUID index, DateTime ttl) : 141 public FileCacheItem(UUID index, DateTime ttl) :
142 base(index, ttl) 142 base(index, ttl)
143 { 143 {
144 } 144 }
145 145
146 public FileCacheItem(LLUUID index, Object data) : 146 public FileCacheItem(UUID index, Object data) :
147 base(index) 147 base(index)
148 { 148 {
149 Store(data); 149 Store(data);
150 } 150 }
151 151
152 public FileCacheItem(LLUUID index, DateTime ttl, Object data) : 152 public FileCacheItem(UUID index, DateTime ttl, Object data) :
153 base(index, ttl) 153 base(index, ttl)
154 { 154 {
155 Store(data); 155 Store(data);
@@ -173,8 +173,8 @@ namespace Opensim.Framework
173 public class Cache 173 public class Cache
174 { 174 {
175 private List<CacheItemBase> m_Index = new List<CacheItemBase>(); 175 private List<CacheItemBase> m_Index = new List<CacheItemBase>();
176 private Dictionary<LLUUID, CacheItemBase> m_Lookup = 176 private Dictionary<UUID, CacheItemBase> m_Lookup =
177 new Dictionary<LLUUID, CacheItemBase>(); 177 new Dictionary<UUID, CacheItemBase>();
178 178
179 private CacheStrategy m_Strategy; 179 private CacheStrategy m_Strategy;
180 private CacheMedium m_Medium; 180 private CacheMedium m_Medium;
@@ -285,7 +285,7 @@ namespace Opensim.Framework
285 285
286 // Get an item from cache. Return the raw item, not it's data 286 // Get an item from cache. Return the raw item, not it's data
287 // 287 //
288 protected virtual CacheItemBase GetItem(LLUUID index) 288 protected virtual CacheItemBase GetItem(UUID index)
289 { 289 {
290 CacheItemBase item = null; 290 CacheItemBase item = null;
291 291
@@ -312,7 +312,7 @@ namespace Opensim.Framework
312 // Get an item from cache. Do not try to fetch from source if not 312 // Get an item from cache. Do not try to fetch from source if not
313 // present. Just return null 313 // present. Just return null
314 // 314 //
315 public virtual Object Get(LLUUID index) 315 public virtual Object Get(UUID index)
316 { 316 {
317 CacheItemBase item = GetItem(index); 317 CacheItemBase item = GetItem(index);
318 318
@@ -325,7 +325,7 @@ namespace Opensim.Framework
325 // Fetch an object from backing store if not cached, serve from 325 // Fetch an object from backing store if not cached, serve from
326 // cache if it is. 326 // cache if it is.
327 // 327 //
328 public virtual Object Get(LLUUID index, FetchDelegate fetch) 328 public virtual Object Get(UUID index, FetchDelegate fetch)
329 { 329 {
330 Object item = Get(index); 330 Object item = Get(index);
331 if (item != null) 331 if (item != null)
@@ -366,7 +366,7 @@ namespace Opensim.Framework
366 return item.Retrieve(); 366 return item.Retrieve();
367 } 367 }
368 368
369 public virtual void Store(LLUUID index, Object data) 369 public virtual void Store(UUID index, Object data)
370 { 370 {
371 Type container; 371 Type container;
372 372
@@ -384,12 +384,12 @@ namespace Opensim.Framework
384 Store(index, data, container); 384 Store(index, data, container);
385 } 385 }
386 386
387 public virtual void Store(LLUUID index, Object data, Type container) 387 public virtual void Store(UUID index, Object data, Type container)
388 { 388 {
389 Store(index, data, container, new Object[] { index }); 389 Store(index, data, container, new Object[] { index });
390 } 390 }
391 391
392 public virtual void Store(LLUUID index, Object data, Type container, 392 public virtual void Store(UUID index, Object data, Type container,
393 Object[] parameters) 393 Object[] parameters)
394 { 394 {
395 Expire(false); 395 Expire(false);
@@ -493,7 +493,7 @@ namespace Opensim.Framework
493 } 493 }
494 } 494 }
495 495
496 public void Invalidate(LLUUID uuid) 496 public void Invalidate(UUID uuid)
497 { 497 {
498 if (!m_Lookup.ContainsKey(uuid)) 498 if (!m_Lookup.ContainsKey(uuid))
499 return; 499 return;
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 423a208..ef40d94 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenMetaverse;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
31{ 32{
@@ -36,17 +37,17 @@ namespace OpenSim.Framework
36 public Guid AgentID; 37 public Guid AgentID;
37 public bool alwaysrun; 38 public bool alwaysrun;
38 public float AVHeight; 39 public float AVHeight;
39 public sLLVector3 cameraPosition; 40 public Vector3 cameraPosition;
40 public float drawdistance; 41 public float drawdistance;
41 public float godlevel; 42 public float godlevel;
42 public uint GroupAccess; 43 public uint GroupAccess;
43 public sLLVector3 Position; 44 public Vector3 Position;
44 public ulong regionHandle; 45 public ulong regionHandle;
45 public byte[] throttles; 46 public byte[] throttles;
46 public sLLVector3 Velocity; 47 public Vector3 Velocity;
47 48
48 public ChildAgentDataUpdate() 49 public ChildAgentDataUpdate()
49 { 50 {
50 } 51 }
51 } 52 }
52} \ No newline at end of file 53}
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 091f308..e99001b 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using libsecondlife.Packets; 32using OpenMetaverse.Packets;
33using log4net; 33using log4net;
34 34
35namespace OpenSim.Framework 35namespace OpenSim.Framework
@@ -117,7 +117,7 @@ namespace OpenSim.Framework
117 } 117 }
118 } 118 }
119 119
120 public void CloseAllCircuits(LLUUID agentId) 120 public void CloseAllCircuits(UUID agentId)
121 { 121 {
122 uint[] circuits = GetAllCircuits(agentId); 122 uint[] circuits = GetAllCircuits(agentId);
123 // We're using a for loop here so changes to the circuits don't cause it to completely fail. 123 // We're using a for loop here so changes to the circuits don't cause it to completely fail.
@@ -144,7 +144,7 @@ namespace OpenSim.Framework
144 } 144 }
145 145
146 // [Obsolete("Using Obsolete to drive development is invalid. Obsolete presumes that something new has already been created to replace this.")] 146 // [Obsolete("Using Obsolete to drive development is invalid. Obsolete presumes that something new has already been created to replace this.")]
147 public uint[] GetAllCircuits(LLUUID agentId) 147 public uint[] GetAllCircuits(UUID agentId)
148 { 148 {
149 List<uint> circuits = new List<uint>(); 149 List<uint> circuits = new List<uint>();
150 // Wasteful, I know 150 // Wasteful, I know
diff --git a/OpenSim/Framework/ColliderData.cs b/OpenSim/Framework/ColliderData.cs
index 075a4e0..4e94d6d 100644
--- a/OpenSim/Framework/ColliderData.cs
+++ b/OpenSim/Framework/ColliderData.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using libsecondlife; 30using OpenMetaverse;
31using System.Collections.Generic; 31using System.Collections.Generic;
32 32
33namespace OpenSim.Framework 33namespace OpenSim.Framework
@@ -35,12 +35,12 @@ namespace OpenSim.Framework
35 public class DetectedObject 35 public class DetectedObject
36 { 36 {
37 public DetectedObject() { } 37 public DetectedObject() { }
38 public LLUUID groupUUID = LLUUID.Zero; 38 public UUID groupUUID = UUID.Zero;
39 public LLUUID ownerUUID = LLUUID.Zero; 39 public UUID ownerUUID = UUID.Zero;
40 public LLUUID keyUUID = LLUUID.Zero; 40 public UUID keyUUID = UUID.Zero;
41 public LLVector3 posVector = LLVector3.Zero; 41 public Vector3 posVector = Vector3.Zero;
42 public LLQuaternion rotQuat = LLQuaternion.Identity; 42 public Quaternion rotQuat = Quaternion.Identity;
43 public LLVector3 velVector = LLVector3.Zero; 43 public Vector3 velVector = Vector3.Zero;
44 public string nameStr = String.Empty; 44 public string nameStr = String.Empty;
45 public int colliderType = 0; 45 public int colliderType = 0;
46 } 46 }
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 {
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index 4770017..0929172 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Configuration.HTTP
47 47
48 public HTTPConfiguration() 48 public HTTPConfiguration()
49 { 49 {
50 remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml"); 50 remoteConfigSettings = new RemoteConfigSettings("remoteconfig.Xml");
51 xmlConfig = new XmlConfiguration(); 51 xmlConfig = new XmlConfiguration();
52 } 52 }
53 53
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 89f52cf..e3da962 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Configuration.XML
48 { 48 {
49 rootNode = doc.SelectSingleNode("Root"); 49 rootNode = doc.SelectSingleNode("Root");
50 if (null == rootNode) 50 if (null == rootNode)
51 throw new Exception("Error: Invalid .xml File. Missing <Root>"); 51 throw new Exception("Error: Invalid .Xml File. Missing <Root>");
52 52
53 configNode = rootNode.SelectSingleNode("Config"); 53 configNode = rootNode.SelectSingleNode("Config");
54 if (null == configNode) 54 if (null == configNode)
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index c363ec0..9fdb046 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -31,7 +31,7 @@ using System.Globalization;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Xml;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37 37
@@ -359,36 +359,36 @@ namespace OpenSim.Framework
359 } 359 }
360 errorMessage = "an IP Address (IPAddress)"; 360 errorMessage = "an IP Address (IPAddress)";
361 break; 361 break;
362 case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID: 362 case ConfigurationOption.ConfigurationTypes.TYPE_UUID:
363 LLUUID uuidResult; 363 UUID uuidResult;
364 if (LLUUID.TryParse(console_result, out uuidResult)) 364 if (UUID.TryParse(console_result, out uuidResult))
365 { 365 {
366 convertSuccess = true; 366 convertSuccess = true;
367 return_result = uuidResult; 367 return_result = uuidResult;
368 } 368 }
369 errorMessage = "a UUID (LLUUID)"; 369 errorMessage = "a UUID (UUID)";
370 break; 370 break;
371 case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID_NULL_FREE: 371 case ConfigurationOption.ConfigurationTypes.TYPE_UUID_NULL_FREE:
372 LLUUID uuidResult2; 372 UUID uuidResult2;
373 if (LLUUID.TryParse(console_result, out uuidResult2)) 373 if (UUID.TryParse(console_result, out uuidResult2))
374 { 374 {
375 convertSuccess = true; 375 convertSuccess = true;
376 376
377 if (uuidResult2 == LLUUID.Zero) 377 if (uuidResult2 == UUID.Zero)
378 uuidResult2 = LLUUID.Random(); 378 uuidResult2 = UUID.Random();
379 379
380 return_result = uuidResult2; 380 return_result = uuidResult2;
381 } 381 }
382 errorMessage = "a non-null UUID (LLUUID)"; 382 errorMessage = "a non-null UUID (UUID)";
383 break; 383 break;
384 case ConfigurationOption.ConfigurationTypes.TYPE_LLVECTOR3: 384 case ConfigurationOption.ConfigurationTypes.TYPE_Vector3:
385 LLVector3 vectorResult; 385 Vector3 vectorResult;
386 if (LLVector3.TryParse(console_result, out vectorResult)) 386 if (Vector3.TryParse(console_result, out vectorResult))
387 { 387 {
388 convertSuccess = true; 388 convertSuccess = true;
389 return_result = vectorResult; 389 return_result = vectorResult;
390 } 390 }
391 errorMessage = "a vector (LLVector3)"; 391 errorMessage = "a vector (Vector3)";
392 break; 392 break;
393 case ConfigurationOption.ConfigurationTypes.TYPE_UINT16: 393 case ConfigurationOption.ConfigurationTypes.TYPE_UINT16:
394 ushort ushortResult; 394 ushort ushortResult;
diff --git a/OpenSim/Framework/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs
index 341d5e8..538ab62 100644
--- a/OpenSim/Framework/ConfigurationOption.cs
+++ b/OpenSim/Framework/ConfigurationOption.cs
@@ -53,9 +53,9 @@ namespace OpenSim.Framework
53 TYPE_CHARACTER, 53 TYPE_CHARACTER,
54 TYPE_BOOLEAN, 54 TYPE_BOOLEAN,
55 TYPE_BYTE, 55 TYPE_BYTE,
56 TYPE_LLUUID, 56 TYPE_UUID,
57 TYPE_LLUUID_NULL_FREE, 57 TYPE_UUID_NULL_FREE,
58 TYPE_LLVECTOR3, 58 TYPE_Vector3,
59 TYPE_FLOAT, 59 TYPE_FLOAT,
60 TYPE_DOUBLE 60 TYPE_DOUBLE
61 } ; 61 } ;
@@ -71,4 +71,4 @@ namespace OpenSim.Framework
71 public bool configurationUseDefaultNoPrompt = false; 71 public bool configurationUseDefaultNoPrompt = false;
72 public ConfigurationOptionShouldBeAsked shouldIBeAsked; //Should I be asked now? Based on previous answers 72 public ConfigurationOptionShouldBeAsked shouldIBeAsked; //Should I be asked now? Based on previous answers
73 } 73 }
74} \ No newline at end of file 74}
diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index c213344..4d31514 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife; 28using OpenMetaverse;
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
35 public class EstateBan 35 public class EstateBan
36 { 36 {
37 public uint estateID = 1; 37 public uint estateID = 1;
38 public LLUUID bannedUUID = LLUUID.Zero; 38 public UUID bannedUUID = UUID.Zero;
39 public string bannedIP = string.Empty; 39 public string bannedIP = string.Empty;
40 public string bannedIPHostMask = string.Empty; 40 public string bannedIPHostMask = string.Empty;
41 public string bannedNameMask = string.Empty; 41 public string bannedNameMask = string.Empty;
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 8b076fe..83f911d 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -29,7 +29,7 @@ using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34 34
35namespace OpenSim.Framework 35namespace OpenSim.Framework
@@ -223,9 +223,9 @@ namespace OpenSim.Framework
223 set { m_AbuseEmail= value; } 223 set { m_AbuseEmail= value; }
224 } 224 }
225 225
226 private LLUUID m_EstateOwner = LLUUID.Zero; 226 private UUID m_EstateOwner = UUID.Zero;
227 227
228 public LLUUID EstateOwner 228 public UUID EstateOwner
229 { 229 {
230 get { return m_EstateOwner; } 230 get { return m_EstateOwner; }
231 set { m_EstateOwner = value; } 231 set { m_EstateOwner = value; }
@@ -241,12 +241,12 @@ namespace OpenSim.Framework
241 241
242 // All those lists... 242 // All those lists...
243 // 243 //
244 private List<LLUUID> l_EstateManagers = new List<LLUUID>(); 244 private List<UUID> l_EstateManagers = new List<UUID>();
245 245
246 public LLUUID[] EstateManagers 246 public UUID[] EstateManagers
247 { 247 {
248 get { return l_EstateManagers.ToArray(); } 248 get { return l_EstateManagers.ToArray(); }
249 set { l_EstateManagers = new List<LLUUID>(value); } 249 set { l_EstateManagers = new List<UUID>(value); }
250 } 250 }
251 251
252 private List<EstateBan> l_EstateBans = new List<EstateBan>(); 252 private List<EstateBan> l_EstateBans = new List<EstateBan>();
@@ -257,20 +257,20 @@ namespace OpenSim.Framework
257 set { l_EstateBans = new List<EstateBan>(value); } 257 set { l_EstateBans = new List<EstateBan>(value); }
258 } 258 }
259 259
260 private List<LLUUID> l_EstateAccess = new List<LLUUID>(); 260 private List<UUID> l_EstateAccess = new List<UUID>();
261 261
262 public LLUUID[] EstateAccess 262 public UUID[] EstateAccess
263 { 263 {
264 get { return l_EstateAccess.ToArray(); } 264 get { return l_EstateAccess.ToArray(); }
265 set { l_EstateAccess = new List<LLUUID>(value); } 265 set { l_EstateAccess = new List<UUID>(value); }
266 } 266 }
267 267
268 private List<LLUUID> l_EstateGroups = new List<LLUUID>(); 268 private List<UUID> l_EstateGroups = new List<UUID>();
269 269
270 public LLUUID[] EstateGroups 270 public UUID[] EstateGroups
271 { 271 {
272 get { return l_EstateGroups.ToArray(); } 272 get { return l_EstateGroups.ToArray(); }
273 set { l_EstateGroups = new List<LLUUID>(value); } 273 set { l_EstateGroups = new List<UUID>(value); }
274 } 274 }
275 275
276 public EstateSettings() 276 public EstateSettings()
@@ -281,7 +281,7 @@ namespace OpenSim.Framework
281 // 281 //
282 configMember = 282 configMember =
283 new ConfigurationMember(Path.Combine(Util.configDir(), 283 new ConfigurationMember(Path.Combine(Util.configDir(),
284 "estate_settings.xml"), "ESTATE SETTINGS", 284 "estate_settings.Xml"), "ESTATE SETTINGS",
285 loadConfigurationOptions, 285 loadConfigurationOptions,
286 handleIncomingConfiguration, true); 286 handleIncomingConfiguration, true);
287 287
@@ -296,21 +296,21 @@ namespace OpenSim.Framework
296 OnSave(this); 296 OnSave(this);
297 } 297 }
298 298
299 public void AddEstateManager(LLUUID avatarID) 299 public void AddEstateManager(UUID avatarID)
300 { 300 {
301 if (avatarID == LLUUID.Zero) 301 if (avatarID == UUID.Zero)
302 return; 302 return;
303 if (!l_EstateManagers.Contains(avatarID)) 303 if (!l_EstateManagers.Contains(avatarID))
304 l_EstateManagers.Add(avatarID); 304 l_EstateManagers.Add(avatarID);
305 } 305 }
306 306
307 public void RemoveEstateManager(LLUUID avatarID) 307 public void RemoveEstateManager(UUID avatarID)
308 { 308 {
309 if (l_EstateManagers.Contains(avatarID)) 309 if (l_EstateManagers.Contains(avatarID))
310 l_EstateManagers.Remove(avatarID); 310 l_EstateManagers.Remove(avatarID);
311 } 311 }
312 312
313 public bool IsEstateManager(LLUUID avatarID) 313 public bool IsEstateManager(UUID avatarID)
314 { 314 {
315 if (IsEstateOwner(avatarID)) 315 if (IsEstateOwner(avatarID))
316 return true; 316 return true;
@@ -318,7 +318,7 @@ namespace OpenSim.Framework
318 return l_EstateManagers.Contains(avatarID); 318 return l_EstateManagers.Contains(avatarID);
319 } 319 }
320 320
321 public bool IsEstateOwner(LLUUID avatarID) 321 public bool IsEstateOwner(UUID avatarID)
322 { 322 {
323 if (avatarID == m_EstateOwner) 323 if (avatarID == m_EstateOwner)
324 return true; 324 return true;
@@ -326,7 +326,7 @@ namespace OpenSim.Framework
326 return false; 326 return false;
327 } 327 }
328 328
329 public bool IsBanned(LLUUID avatarID) 329 public bool IsBanned(UUID avatarID)
330 { 330 {
331 foreach (EstateBan ban in l_EstateBans) 331 foreach (EstateBan ban in l_EstateBans)
332 if (ban.bannedUUID == avatarID) 332 if (ban.bannedUUID == avatarID)
@@ -347,7 +347,7 @@ namespace OpenSim.Framework
347 l_EstateBans.Clear(); 347 l_EstateBans.Clear();
348 } 348 }
349 349
350 public void RemoveBan(LLUUID avatarID) 350 public void RemoveBan(UUID avatarID)
351 { 351 {
352 foreach (EstateBan ban in new List<EstateBan>(l_EstateBans)) 352 foreach (EstateBan ban in new List<EstateBan>(l_EstateBans))
353 if (ban.bannedUUID == avatarID) 353 if (ban.bannedUUID == avatarID)
@@ -385,43 +385,43 @@ namespace OpenSim.Framework
385 String.Empty, "My Estate", true); 385 String.Empty, "My Estate", true);
386 386
387 configMember.addConfigurationOption("estate_manager_0", 387 configMember.addConfigurationOption("estate_manager_0",
388 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 388 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
389 String.Empty, "00000000-0000-0000-0000-000000000000", true); 389 String.Empty, "00000000-0000-0000-0000-000000000000", true);
390 390
391 configMember.addConfigurationOption("estate_manager_1", 391 configMember.addConfigurationOption("estate_manager_1",
392 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 392 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
393 String.Empty, "00000000-0000-0000-0000-000000000000", true); 393 String.Empty, "00000000-0000-0000-0000-000000000000", true);
394 394
395 configMember.addConfigurationOption("estate_manager_2", 395 configMember.addConfigurationOption("estate_manager_2",
396 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 396 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
397 String.Empty, "00000000-0000-0000-0000-000000000000", true); 397 String.Empty, "00000000-0000-0000-0000-000000000000", true);
398 398
399 configMember.addConfigurationOption("estate_manager_3", 399 configMember.addConfigurationOption("estate_manager_3",
400 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 400 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
401 String.Empty, "00000000-0000-0000-0000-000000000000", true); 401 String.Empty, "00000000-0000-0000-0000-000000000000", true);
402 402
403 configMember.addConfigurationOption("estate_manager_4", 403 configMember.addConfigurationOption("estate_manager_4",
404 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 404 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
405 String.Empty, "00000000-0000-0000-0000-000000000000", true); 405 String.Empty, "00000000-0000-0000-0000-000000000000", true);
406 406
407 configMember.addConfigurationOption("estate_manager_5", 407 configMember.addConfigurationOption("estate_manager_5",
408 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 408 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
409 String.Empty, "00000000-0000-0000-0000-000000000000", true); 409 String.Empty, "00000000-0000-0000-0000-000000000000", true);
410 410
411 configMember.addConfigurationOption("estate_manager_6", 411 configMember.addConfigurationOption("estate_manager_6",
412 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 412 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
413 String.Empty, "00000000-0000-0000-0000-000000000000", true); 413 String.Empty, "00000000-0000-0000-0000-000000000000", true);
414 414
415 configMember.addConfigurationOption("estate_manager_7", 415 configMember.addConfigurationOption("estate_manager_7",
416 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 416 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
417 String.Empty, "00000000-0000-0000-0000-000000000000", true); 417 String.Empty, "00000000-0000-0000-0000-000000000000", true);
418 418
419 configMember.addConfigurationOption("estate_manager_8", 419 configMember.addConfigurationOption("estate_manager_8",
420 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 420 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
421 String.Empty, "00000000-0000-0000-0000-000000000000", true); 421 String.Empty, "00000000-0000-0000-0000-000000000000", true);
422 422
423 configMember.addConfigurationOption("estate_manager_9", 423 configMember.addConfigurationOption("estate_manager_9",
424 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 424 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
425 String.Empty, "00000000-0000-0000-0000-000000000000", true); 425 String.Empty, "00000000-0000-0000-0000-000000000000", true);
426 426
427 configMember.addConfigurationOption("region_flags", 427 configMember.addConfigurationOption("region_flags",
@@ -480,34 +480,34 @@ namespace OpenSim.Framework
480 m_EstateName = (string) configuration_result; 480 m_EstateName = (string) configuration_result;
481 break; 481 break;
482 case "estate_manager_0": 482 case "estate_manager_0":
483 AddEstateManager((LLUUID)configuration_result); 483 AddEstateManager((UUID)configuration_result);
484 break; 484 break;
485 case "estate_manager_1": 485 case "estate_manager_1":
486 AddEstateManager((LLUUID)configuration_result); 486 AddEstateManager((UUID)configuration_result);
487 break; 487 break;
488 case "estate_manager_2": 488 case "estate_manager_2":
489 AddEstateManager((LLUUID)configuration_result); 489 AddEstateManager((UUID)configuration_result);
490 break; 490 break;
491 case "estate_manager_3": 491 case "estate_manager_3":
492 AddEstateManager((LLUUID)configuration_result); 492 AddEstateManager((UUID)configuration_result);
493 break; 493 break;
494 case "estate_manager_4": 494 case "estate_manager_4":
495 AddEstateManager((LLUUID)configuration_result); 495 AddEstateManager((UUID)configuration_result);
496 break; 496 break;
497 case "estate_manager_5": 497 case "estate_manager_5":
498 AddEstateManager((LLUUID)configuration_result); 498 AddEstateManager((UUID)configuration_result);
499 break; 499 break;
500 case "estate_manager_6": 500 case "estate_manager_6":
501 AddEstateManager((LLUUID)configuration_result); 501 AddEstateManager((UUID)configuration_result);
502 break; 502 break;
503 case "estate_manager_7": 503 case "estate_manager_7":
504 AddEstateManager((LLUUID)configuration_result); 504 AddEstateManager((UUID)configuration_result);
505 break; 505 break;
506 case "estate_manager_8": 506 case "estate_manager_8":
507 AddEstateManager((LLUUID)configuration_result); 507 AddEstateManager((UUID)configuration_result);
508 break; 508 break;
509 case "estate_manager_9": 509 case "estate_manager_9":
510 AddEstateManager((LLUUID)configuration_result); 510 AddEstateManager((UUID)configuration_result);
511 break; 511 break;
512 } 512 }
513 513
diff --git a/OpenSim/Framework/FriendListItem.cs b/OpenSim/Framework/FriendListItem.cs
index d3ca759..2861ce2 100644
--- a/OpenSim/Framework/FriendListItem.cs
+++ b/OpenSim/Framework/FriendListItem.cs
@@ -25,14 +25,14 @@
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 30namespace OpenSim.Framework
31{ 31{
32 public class FriendListItem 32 public class FriendListItem
33 { 33 {
34 public LLUUID Friend; 34 public UUID Friend;
35 public LLUUID FriendListOwner; 35 public UUID FriendListOwner;
36 36
37 // These are what the list owner gives the friend permission to do 37 // These are what the list owner gives the friend permission to do
38 38
@@ -42,4 +42,4 @@ namespace OpenSim.Framework
42 42
43 public bool onlinestatus = false; 43 public bool onlinestatus = false;
44 } 44 }
45} \ No newline at end of file 45}
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 08c5f28..037f110 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenMetaverse;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
31{ 32{
@@ -45,7 +46,7 @@ namespace OpenSim.Framework
45 46
46 public uint ParentEstateID; 47 public uint ParentEstateID;
47 48
48 public sLLVector3 Position; 49 public Vector3 Position;
49 50
50 public Guid RegionID; 51 public Guid RegionID;
51 public uint timestamp; 52 public uint timestamp;
@@ -55,4 +56,4 @@ namespace OpenSim.Framework
55 { 56 {
56 } 57 }
57 } 58 }
58} \ No newline at end of file 59}
diff --git a/OpenSim/Framework/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs
index ec70554..4c86279 100644
--- a/OpenSim/Framework/IAssetProvider.cs
+++ b/OpenSim/Framework/IAssetProvider.cs
@@ -25,16 +25,16 @@
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 30namespace OpenSim.Framework
31{ 31{
32 public interface IAssetProviderPlugin : IPlugin 32 public interface IAssetProviderPlugin : IPlugin
33 { 33 {
34 AssetBase FetchAsset(LLUUID uuid); 34 AssetBase FetchAsset(UUID uuid);
35 void CreateAsset(AssetBase asset); 35 void CreateAsset(AssetBase asset);
36 void UpdateAsset(AssetBase asset); 36 void UpdateAsset(AssetBase asset);
37 bool ExistsAsset(LLUUID uuid); 37 bool ExistsAsset(UUID uuid);
38 void Initialise(string connect); 38 void Initialise(string connect);
39 } 39 }
40 40
diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index f96bdc6..d2f5ce7 100644
--- a/OpenSim/Framework/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.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 30namespace OpenSim.Framework
31{ 31{
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
35 public interface IAssetServer 35 public interface IAssetServer
36 { 36 {
37 void SetReceiver(IAssetReceiver receiver); 37 void SetReceiver(IAssetReceiver receiver);
38 void RequestAsset(LLUUID assetID, bool isTexture); 38 void RequestAsset(UUID assetID, bool isTexture);
39 void StoreAsset(AssetBase asset); 39 void StoreAsset(AssetBase asset);
40 void UpdateAsset(AssetBase asset); 40 void UpdateAsset(AssetBase asset);
41 void Close(); 41 void Close();
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
59 /// </summary> 59 /// </summary>
60 /// <param name="assetID"></param> 60 /// <param name="assetID"></param>
61 /// <param name="IsTexture"></param> 61 /// <param name="IsTexture"></param>
62 void AssetNotFound(LLUUID assetID, bool IsTexture); 62 void AssetNotFound(UUID assetID, bool IsTexture);
63 } 63 }
64 64
65 public interface IAssetPlugin 65 public interface IAssetPlugin
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 224b51b..a7baf0e 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using libsecondlife; 31using OpenMetaverse;
32using libsecondlife.Packets; 32using OpenMetaverse.Packets;
33 33
34namespace OpenSim.Framework 34namespace OpenSim.Framework
35{ 35{
@@ -44,20 +44,20 @@ namespace OpenSim.Framework
44 public delegate void AvatarNowWearing(Object sender, AvatarWearingArgs e); 44 public delegate void AvatarNowWearing(Object sender, AvatarWearingArgs e);
45 45
46 public delegate void ImprovedInstantMessage(IClientAPI remoteclient, 46 public delegate void ImprovedInstantMessage(IClientAPI remoteclient,
47 LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp, 47 UUID fromAgentID, UUID fromAgentSession, UUID toAgentID, UUID imSessionID, uint timestamp,
48 string fromAgentName, string message, byte dialog, bool fromGroup, byte offline, uint ParentEstateID, 48 string fromAgentName, string message, byte dialog, bool fromGroup, byte offline, uint ParentEstateID,
49 LLVector3 Position, LLUUID RegionID, byte[] binaryBucket); // This shouldn't be cut down... 49 Vector3 Position, UUID RegionID, byte[] binaryBucket); // This shouldn't be cut down...
50 // especially if we're ever going to implement groups, presence, estate message dialogs... 50 // especially if we're ever going to implement groups, presence, estate message dialogs...
51 51
52 public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, LLVector3 RayStart, 52 public delegate void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
53 LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 53 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
54 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, 54 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
55 bool RezSelected, bool RemoveItem, LLUUID fromTaskID); 55 bool RezSelected, bool RemoveItem, UUID fromTaskID);
56 56
57 public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt, 57 public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt,
58 uint ItemFlags, uint NextOwnerMask); 58 uint ItemFlags, uint NextOwnerMask);
59 59
60 public delegate void ObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot); 60 public delegate void ObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot);
61 61
62 public delegate void ModifyTerrain( 62 public delegate void ModifyTerrain(
63 float height, float seconds, byte size, byte action, float north, float west, float south, float east, 63 float height, float seconds, byte size, byte action, float north, float west, float south, float east,
@@ -65,9 +65,9 @@ namespace OpenSim.Framework
65 65
66 public delegate void SetAppearance(byte[] texture, List<byte> visualParamList); 66 public delegate void SetAppearance(byte[] texture, List<byte> visualParamList);
67 67
68 public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID); 68 public delegate void StartAnim(IClientAPI remoteClient, UUID animID);
69 69
70 public delegate void StopAnim(IClientAPI remoteClient, LLUUID animID); 70 public delegate void StopAnim(IClientAPI remoteClient, UUID animID);
71 71
72 public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children); 72 public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children);
73 73
@@ -78,14 +78,14 @@ namespace OpenSim.Framework
78 public delegate void RequestMapName(IClientAPI remoteClient, string mapName); 78 public delegate void RequestMapName(IClientAPI remoteClient, string mapName);
79 79
80 public delegate void TeleportLocationRequest( 80 public delegate void TeleportLocationRequest(
81 IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags); 81 IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags);
82 82
83 public delegate void TeleportLandmarkRequest( 83 public delegate void TeleportLandmarkRequest(
84 IClientAPI remoteClient, LLUUID regionID, LLVector3 position); 84 IClientAPI remoteClient, UUID regionID, Vector3 position);
85 85
86 public delegate void DisconnectUser(); 86 public delegate void DisconnectUser();
87 87
88 public delegate void RequestAvatarProperties(IClientAPI remoteClient, LLUUID avatarID); 88 public delegate void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID);
89 89
90 public delegate void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData ProfileData); 90 public delegate void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData ProfileData);
91 91
@@ -100,14 +100,14 @@ namespace OpenSim.Framework
100 100
101 public delegate void GenericCall7(IClientAPI remoteClient, uint localID, string message); 101 public delegate void GenericCall7(IClientAPI remoteClient, uint localID, string message);
102 102
103 public delegate void UpdateShape(LLUUID agentID, uint localID, UpdateShapeArgs shapeBlock); 103 public delegate void UpdateShape(UUID agentID, uint localID, UpdateShapeArgs shapeBlock);
104 104
105 public delegate void ObjectExtraParams(LLUUID agentID, uint localID, ushort type, bool inUse, byte[] data); 105 public delegate void ObjectExtraParams(UUID agentID, uint localID, ushort type, bool inUse, byte[] data);
106 106
107 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); 107 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
108 108
109 public delegate void RequestObjectPropertiesFamily( 109 public delegate void RequestObjectPropertiesFamily(
110 IClientAPI remoteClient, LLUUID AgentID, uint RequestFlags, LLUUID TaskID); 110 IClientAPI remoteClient, UUID AgentID, uint RequestFlags, UUID TaskID);
111 111
112 public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient); 112 public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient);
113 113
@@ -115,41 +115,41 @@ namespace OpenSim.Framework
115 115
116 public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); 116 public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);
117 117
118 public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient); 118 public delegate void UpdateVector(uint localID, Vector3 pos, IClientAPI remoteClient);
119 119
120 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); 120 public delegate void UpdatePrimRotation(uint localID, Quaternion rot, IClientAPI remoteClient);
121 121
122 public delegate void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); 122 public delegate void UpdatePrimSingleRotation(uint localID, Quaternion rot, IClientAPI remoteClient);
123 123
124 public delegate void UpdatePrimGroupRotation(uint localID, LLVector3 pos, LLQuaternion rot, IClientAPI remoteClient); 124 public delegate void UpdatePrimGroupRotation(uint localID, Vector3 pos, Quaternion rot, IClientAPI remoteClient);
125 125
126 public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags, LLUUID AgentID, LLUUID GroupID); 126 public delegate void ObjectDuplicate(uint localID, Vector3 offset, uint dupeFlags, UUID AgentID, UUID GroupID);
127 127
128 public delegate void ObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID, 128 public delegate void ObjectDuplicateOnRay(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID,
129 LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, 129 UUID RayTargetObj, Vector3 RayEnd, Vector3 RayStart,
130 bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates); 130 bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates);
131 131
132 132
133 public delegate void StatusChange(bool status); 133 public delegate void StatusChange(bool status);
134 134
135 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status); 135 public delegate void NewAvatar(IClientAPI remoteClient, UUID agentID, bool status);
136 136
137 public delegate void UpdateAgent(IClientAPI remoteClient, AgentUpdateArgs agentData); 137 public delegate void UpdateAgent(IClientAPI remoteClient, AgentUpdateArgs agentData);
138 138
139 public delegate void AgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID, LLVector3 offset); 139 public delegate void AgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset);
140 140
141 public delegate void AgentSit(IClientAPI remoteClient, LLUUID agentID); 141 public delegate void AgentSit(IClientAPI remoteClient, UUID agentID);
142 142
143 public delegate void AvatarPickerRequest(IClientAPI remoteClient, LLUUID agentdata, LLUUID queryID, string UserQuery 143 public delegate void AvatarPickerRequest(IClientAPI remoteClient, UUID agentdata, UUID queryID, string UserQuery
144 ); 144 );
145 145
146 public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient); 146 public delegate void MoveObject(UUID objectID, Vector3 offset, Vector3 grapPos, IClientAPI remoteClient);
147 147
148 public delegate void ParcelAccessListRequest( 148 public delegate void ParcelAccessListRequest(
149 LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client); 149 UUID agentID, UUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client);
150 150
151 public delegate void ParcelAccessListUpdateRequest( 151 public delegate void ParcelAccessListUpdateRequest(
152 LLUUID agentID, LLUUID sessionID, uint flags, int landLocalID, List<ParcelManager.ParcelAccessEntry> entries, 152 UUID agentID, UUID sessionID, uint flags, int landLocalID, List<ParcelManager.ParcelAccessEntry> entries,
153 IClientAPI remote_client); 153 IClientAPI remote_client);
154 154
155 public delegate void ParcelPropertiesRequest( 155 public delegate void ParcelPropertiesRequest(
@@ -168,80 +168,80 @@ namespace OpenSim.Framework
168 public delegate void ParcelAbandonRequest(int local_id, IClientAPI remote_client); 168 public delegate void ParcelAbandonRequest(int local_id, IClientAPI remote_client);
169 public delegate void ParcelReclaim(int local_id, IClientAPI remote_client); 169 public delegate void ParcelReclaim(int local_id, IClientAPI remote_client);
170 170
171 public delegate void ParcelReturnObjectsRequest(int local_id, uint return_type, LLUUID[] agent_ids, LLUUID[] selected_ids, IClientAPI remote_client); 171 public delegate void ParcelReturnObjectsRequest(int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client);
172 172
173 public delegate void EstateOwnerMessageRequest(LLUUID AgentID, LLUUID SessionID, LLUUID TransactionID, LLUUID Invoice, byte[] Method, byte[][] Parameters, IClientAPI remote_client); 173 public delegate void EstateOwnerMessageRequest(UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters, IClientAPI remote_client);
174 174
175 public delegate void RegionInfoRequest(IClientAPI remote_client); 175 public delegate void RegionInfoRequest(IClientAPI remote_client);
176 176
177 public delegate void EstateCovenantRequest(IClientAPI remote_client); 177 public delegate void EstateCovenantRequest(IClientAPI remote_client);
178 178
179 public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); 179 public delegate void UUIDNameRequest(UUID id, IClientAPI remote_client);
180 180
181 public delegate void AddNewPrim( 181 public delegate void AddNewPrim(
182 LLUUID ownerID, LLVector3 RayEnd, LLQuaternion rot, PrimitiveBaseShape shape, byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID, 182 UUID ownerID, Vector3 RayEnd, Quaternion rot, PrimitiveBaseShape shape, byte bypassRaycast, Vector3 RayStart, UUID RayTargetID,
183 byte RayEndIsIntersection); 183 byte RayEndIsIntersection);
184 184
185 public delegate void RequestGodlikePowers(LLUUID AgentID, LLUUID SessionID, LLUUID token, bool GodLike, IClientAPI remote_client); 185 public delegate void RequestGodlikePowers(UUID AgentID, UUID SessionID, UUID token, bool GodLike, IClientAPI remote_client);
186 186
187 public delegate void GodKickUser( 187 public delegate void GodKickUser(
188 LLUUID GodAgentID, LLUUID GodSessionID, LLUUID AgentID, uint kickflags, byte[] reason); 188 UUID GodAgentID, UUID GodSessionID, UUID AgentID, uint kickflags, byte[] reason);
189 189
190 public delegate void CreateInventoryFolder( 190 public delegate void CreateInventoryFolder(
191 IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID); 191 IClientAPI remoteClient, UUID folderID, ushort folderType, string folderName, UUID parentID);
192 192
193 public delegate void UpdateInventoryFolder( 193 public delegate void UpdateInventoryFolder(
194 IClientAPI remoteClient, LLUUID folderID, ushort type, string name, LLUUID parentID); 194 IClientAPI remoteClient, UUID folderID, ushort type, string name, UUID parentID);
195 195
196 public delegate void MoveInventoryFolder( 196 public delegate void MoveInventoryFolder(
197 IClientAPI remoteClient, LLUUID folderID, LLUUID parentID); 197 IClientAPI remoteClient, UUID folderID, UUID parentID);
198 198
199 public delegate void CreateNewInventoryItem( 199 public delegate void CreateNewInventoryItem(
200 IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, 200 IClientAPI remoteClient, UUID transActionID, UUID folderID, uint callbackID, string description, string name,
201 sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask, int creationDate); 201 sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask, int creationDate);
202 202
203 public delegate void FetchInventoryDescendents( 203 public delegate void FetchInventoryDescendents(
204 IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder); 204 IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
205 205
206 public delegate void PurgeInventoryDescendents( 206 public delegate void PurgeInventoryDescendents(
207 IClientAPI remoteClient, LLUUID folderID); 207 IClientAPI remoteClient, UUID folderID);
208 208
209 public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID); 209 public delegate void FetchInventory(IClientAPI remoteClient, UUID itemID, UUID ownerID);
210 210
211 public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID); 211 public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID);
212 212
213/* public delegate void UpdateInventoryItem( 213/* public delegate void UpdateInventoryItem(
214 IClientAPI remoteClient, LLUUID transactionID, LLUUID itemID, string name, string description, 214 IClientAPI remoteClient, UUID transactionID, UUID itemID, string name, string description,
215 uint nextOwnerMask);*/ 215 uint nextOwnerMask);*/
216 216
217 public delegate void UpdateInventoryItem( 217 public delegate void UpdateInventoryItem(
218 IClientAPI remoteClient, LLUUID transactionID, LLUUID itemID, InventoryItemBase itemUpd); 218 IClientAPI remoteClient, UUID transactionID, UUID itemID, InventoryItemBase itemUpd);
219 219
220 public delegate void CopyInventoryItem( 220 public delegate void CopyInventoryItem(
221 IClientAPI remoteClient, uint callbackID, LLUUID oldAgentID, LLUUID oldItemID, LLUUID newFolderID, 221 IClientAPI remoteClient, uint callbackID, UUID oldAgentID, UUID oldItemID, UUID newFolderID,
222 string newName); 222 string newName);
223 223
224 public delegate void MoveInventoryItem( 224 public delegate void MoveInventoryItem(
225 IClientAPI remoteClient, LLUUID folderID, LLUUID itemID, int length, string newName); 225 IClientAPI remoteClient, UUID folderID, UUID itemID, int length, string newName);
226 226
227 public delegate void RemoveInventoryItem( 227 public delegate void RemoveInventoryItem(
228 IClientAPI remoteClient, LLUUID itemID); 228 IClientAPI remoteClient, UUID itemID);
229 229
230 public delegate void RemoveInventoryFolder( 230 public delegate void RemoveInventoryFolder(
231 IClientAPI remoteClient, LLUUID folderID); 231 IClientAPI remoteClient, UUID folderID);
232 232
233 public delegate void RequestAsset(IClientAPI remoteClient, RequestAssetArgs transferRequest); 233 public delegate void RequestAsset(IClientAPI remoteClient, RequestAssetArgs transferRequest);
234 234
235 public delegate void RezScript(IClientAPI remoteClient, InventoryItemBase item, LLUUID transactionID, uint localID); 235 public delegate void RezScript(IClientAPI remoteClient, InventoryItemBase item, UUID transactionID, uint localID);
236 236
237 public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID transactionID, TaskInventoryItem item, uint localID); 237 public delegate void UpdateTaskInventory(IClientAPI remoteClient, UUID transactionID, TaskInventoryItem item, uint localID);
238 238
239 public delegate void MoveTaskInventory(IClientAPI remoteClient, LLUUID folderID, uint localID, LLUUID itemID); 239 public delegate void MoveTaskInventory(IClientAPI remoteClient, UUID folderID, uint localID, UUID itemID);
240 240
241 public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID); 241 public delegate void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID);
242 242
243 public delegate void UDPAssetUploadRequest( 243 public delegate void UDPAssetUploadRequest(
244 IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal, 244 IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, byte[] data, bool storeLocal,
245 bool tempFile); 245 bool tempFile);
246 246
247 public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data); 247 public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data);
@@ -250,60 +250,60 @@ namespace OpenSim.Framework
250 250
251 public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID); 251 public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID);
252 252
253 public delegate void FriendActionDelegate(IClientAPI remoteClient, LLUUID agentID, LLUUID transactionID, List<LLUUID> callingCardFolders); 253 public delegate void FriendActionDelegate(IClientAPI remoteClient, UUID agentID, UUID transactionID, List<UUID> callingCardFolders);
254 254
255 public delegate void FriendshipTermination(IClientAPI remoteClient, LLUUID agentID, LLUUID ExID); 255 public delegate void FriendshipTermination(IClientAPI remoteClient, UUID agentID, UUID ExID);
256 256
257 public delegate void MoneyTransferRequest(LLUUID sourceID, LLUUID destID, int amount, int transactionType, string description); 257 public delegate void MoneyTransferRequest(UUID sourceID, UUID destID, int amount, int transactionType, string description);
258 258
259 public delegate void ParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, 259 public delegate void ParcelBuy(UUID agentId, UUID groupId, bool final, bool groupOwned,
260 bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated); 260 bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated);
261 261
262 // We keep all this information for fraud purposes in the future. 262 // We keep all this information for fraud purposes in the future.
263 public delegate void MoneyBalanceRequest(IClientAPI remoteClient, LLUUID agentID, LLUUID sessionID, LLUUID TransactionID); 263 public delegate void MoneyBalanceRequest(IClientAPI remoteClient, UUID agentID, UUID sessionID, UUID TransactionID);
264 264
265 public delegate void ObjectPermissions(IClientAPI controller, LLUUID agentID, LLUUID sessionID, byte field, uint localId, uint mask, byte set); 265 public delegate void ObjectPermissions(IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set);
266 266
267 public delegate void EconomyDataRequest(LLUUID agentID); 267 public delegate void EconomyDataRequest(UUID agentID);
268 268
269 public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); 269 public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID);
270 270
271 public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer); 271 public delegate void ScriptAnswer(IClientAPI remoteClient, UUID objectID, UUID itemID, int answer);
272 272
273 public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID); 273 public delegate void RequestPayPrice(IClientAPI remoteClient, UUID objectID);
274 public delegate void ObjectSaleInfo(IClientAPI remoteClient, LLUUID agentID, LLUUID sessionID, uint localID, byte saleType, int salePrice); 274 public delegate void ObjectSaleInfo(IClientAPI remoteClient, UUID agentID, UUID sessionID, uint localID, byte saleType, int salePrice);
275 public delegate void ObjectBuy(IClientAPI remoteClient, LLUUID agentID, LLUUID sessionID, LLUUID groupID, LLUUID categoryID, uint localID, byte saleType, int salePrice); 275 public delegate void ObjectBuy(IClientAPI remoteClient, UUID agentID, UUID sessionID, UUID groupID, UUID categoryID, uint localID, byte saleType, int salePrice);
276 public delegate void BuyObjectInventory(IClientAPI remoteClient, LLUUID agentID, LLUUID sessionID, LLUUID objectID, LLUUID itemID, LLUUID folderID); 276 public delegate void BuyObjectInventory(IClientAPI remoteClient, UUID agentID, UUID sessionID, UUID objectID, UUID itemID, UUID folderID);
277 277
278 public delegate void ForceReleaseControls(IClientAPI remoteClient, LLUUID agentID); 278 public delegate void ForceReleaseControls(IClientAPI remoteClient, UUID agentID);
279 279
280 public delegate void GodLandStatRequest(int parcelID, uint reportType, uint requestflags, string filter, IClientAPI remoteClient); 280 public delegate void GodLandStatRequest(int parcelID, uint reportType, uint requestflags, string filter, IClientAPI remoteClient);
281 281
282 //Estate Requests 282 //Estate Requests
283 public delegate void DetailedEstateDataRequest(IClientAPI remoteClient, LLUUID invoice); 283 public delegate void DetailedEstateDataRequest(IClientAPI remoteClient, UUID invoice);
284 public delegate void SetEstateFlagsRequest(bool blockTerraform, bool noFly, bool allowDamage, bool blockLandResell, int maxAgents, float objectBonusFactor, int matureLevel, bool restrictPushObject, bool allowParcelChanges); 284 public delegate void SetEstateFlagsRequest(bool blockTerraform, bool noFly, bool allowDamage, bool blockLandResell, int maxAgents, float objectBonusFactor, int matureLevel, bool restrictPushObject, bool allowParcelChanges);
285 public delegate void SetEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID side); 285 public delegate void SetEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID side);
286 public delegate void SetEstateTerrainDetailTexture(IClientAPI remoteClient, int corner, LLUUID side); 286 public delegate void SetEstateTerrainDetailTexture(IClientAPI remoteClient, int corner, UUID side);
287 public delegate void SetEstateTerrainTextureHeights(IClientAPI remoteClient, int corner, float lowVal, float highVal); 287 public delegate void SetEstateTerrainTextureHeights(IClientAPI remoteClient, int corner, float lowVal, float highVal);
288 public delegate void CommitEstateTerrainTextureRequest(IClientAPI remoteClient); 288 public delegate void CommitEstateTerrainTextureRequest(IClientAPI remoteClient);
289 public delegate void SetRegionTerrainSettings(float waterHeight, float terrainRaiseLimit, float terrainLowerLimit, bool estateSun, bool fixedSun, float sunHour, bool globalSun, bool estateFixed, float estateSunHour); 289 public delegate void SetRegionTerrainSettings(float waterHeight, float terrainRaiseLimit, float terrainLowerLimit, bool estateSun, bool fixedSun, float sunHour, bool globalSun, bool estateFixed, float estateSunHour);
290 public delegate void EstateChangeInfo(IClientAPI client, LLUUID invoice, LLUUID senderID, UInt32 param1, UInt32 param2); 290 public delegate void EstateChangeInfo(IClientAPI client, UUID invoice, UUID senderID, UInt32 param1, UInt32 param2);
291 public delegate void BakeTerrain(IClientAPI remoteClient ); 291 public delegate void BakeTerrain(IClientAPI remoteClient );
292 public delegate void EstateRestartSimRequest(IClientAPI remoteClient, int secondsTilReboot); 292 public delegate void EstateRestartSimRequest(IClientAPI remoteClient, int secondsTilReboot);
293 public delegate void EstateChangeCovenantRequest(IClientAPI remoteClient, LLUUID newCovenantID); 293 public delegate void EstateChangeCovenantRequest(IClientAPI remoteClient, UUID newCovenantID);
294 public delegate void UpdateEstateAccessDeltaRequest(IClientAPI remote_client, LLUUID invoice, int estateAccessType, LLUUID user); 294 public delegate void UpdateEstateAccessDeltaRequest(IClientAPI remote_client, UUID invoice, int estateAccessType, UUID user);
295 public delegate void SimulatorBlueBoxMessageRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID sessionID, string senderName, string message); 295 public delegate void SimulatorBlueBoxMessageRequest(IClientAPI remoteClient, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message);
296 public delegate void EstateBlueBoxMessageRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID sessionID, string senderName, string message); 296 public delegate void EstateBlueBoxMessageRequest(IClientAPI remoteClient, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message);
297 public delegate void EstateDebugRegionRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, bool scripted, bool collisionEvents, bool physics); 297 public delegate void EstateDebugRegionRequest(IClientAPI remoteClient, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics);
298 public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey); 298 public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, UUID invoice, UUID senderID, UUID prey);
299 public delegate void RegionHandleRequest(IClientAPI remoteClient, LLUUID regionID); 299 public delegate void RegionHandleRequest(IClientAPI remoteClient, UUID regionID);
300 public delegate void ParcelInfoRequest(IClientAPI remoteClient, LLUUID parcelID); 300 public delegate void ParcelInfoRequest(IClientAPI remoteClient, UUID parcelID);
301 301
302 public delegate void ScriptReset(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID); 302 public delegate void ScriptReset(IClientAPI remoteClient, UUID objectID, UUID itemID);
303 public delegate void GetScriptRunning(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID); 303 public delegate void GetScriptRunning(IClientAPI remoteClient, UUID objectID, UUID itemID);
304 public delegate void SetScriptRunning(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, bool running); 304 public delegate void SetScriptRunning(IClientAPI remoteClient, UUID objectID, UUID itemID, bool running);
305 public delegate void ActivateGesture(IClientAPI client, LLUUID gestureid, LLUUID assetId); 305 public delegate void ActivateGesture(IClientAPI client, UUID gestureid, UUID assetId);
306 public delegate void DeactivateGesture(IClientAPI client, LLUUID gestureid); 306 public delegate void DeactivateGesture(IClientAPI client, UUID gestureid);
307 307
308 public delegate void TerrainUnacked(IClientAPI remoteClient, int patchX, int patchY); 308 public delegate void TerrainUnacked(IClientAPI remoteClient, int patchX, int patchY);
309 309
@@ -311,21 +311,21 @@ namespace OpenSim.Framework
311 311
312 public interface IClientAPI 312 public interface IClientAPI
313 { 313 {
314 LLVector3 StartPos { get; set; } 314 Vector3 StartPos { get; set; }
315 315
316 LLUUID AgentId { get; } 316 UUID AgentId { get; }
317 317
318 LLUUID SessionId { get; } 318 UUID SessionId { get; }
319 319
320 LLUUID SecureSessionId { get; } 320 UUID SecureSessionId { get; }
321 321
322 LLUUID ActiveGroupId { get; } 322 UUID ActiveGroupId { get; }
323 323
324 string ActiveGroupName { get; } 324 string ActiveGroupName { get; }
325 325
326 ulong ActiveGroupPowers { get; } 326 ulong ActiveGroupPowers { get; }
327 327
328 ulong GetGroupPowers(LLUUID groupID); 328 ulong GetGroupPowers(UUID groupID);
329 329
330 string FirstName { get; } 330 string FirstName { get; }
331 331
@@ -429,7 +429,7 @@ namespace OpenSim.Framework
429 event UpdateVector OnUpdatePrimGroupScale; 429 event UpdateVector OnUpdatePrimGroupScale;
430 event StatusChange OnChildAgentStatus; 430 event StatusChange OnChildAgentStatus;
431 event GenericCall2 OnStopMovement; 431 event GenericCall2 OnStopMovement;
432 event Action<LLUUID> OnRemoveAvatar; 432 event Action<UUID> OnRemoveAvatar;
433 event ObjectPermissions OnObjectPermissions; 433 event ObjectPermissions OnObjectPermissions;
434 434
435 event CreateNewInventoryItem OnCreateNewInventoryItem; 435 event CreateNewInventoryItem OnCreateNewInventoryItem;
@@ -527,82 +527,82 @@ namespace OpenSim.Framework
527 event ActivateGesture OnActivateGesture; 527 event ActivateGesture OnActivateGesture;
528 event DeactivateGesture OnDeactivateGesture; 528 event DeactivateGesture OnDeactivateGesture;
529 529
530 // void ActivateGesture(LLUUID assetId, LLUUID gestureId); 530 // void ActivateGesture(UUID assetId, UUID gestureId);
531 531
532 // [Obsolete("IClientAPI.OutPacket SHOULD NOT EXIST outside of LLClientView please refactor appropriately.")] 532 // [Obsolete("IClientAPI.OutPacket SHOULD NOT EXIST outside of LLClientView please refactor appropriately.")]
533 void OutPacket(Packet newPack, ThrottleOutPacketType packType); 533 void OutPacket(Packet newPack, ThrottleOutPacketType packType);
534 void SendWearables(AvatarWearable[] wearables, int serial); 534 void SendWearables(AvatarWearable[] wearables, int serial);
535 void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry); 535 void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
536 void SendStartPingCheck(byte seq); 536 void SendStartPingCheck(byte seq);
537 void SendKillObject(ulong regionHandle, uint localID); 537 void SendKiPrimitive(ulong regionHandle, uint localID);
538 void SendAnimations(LLUUID[] animID, int[] seqs, LLUUID sourceAgentId); 538 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId);
539 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); 539 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
540 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID, byte source, byte audible); 540 void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
541 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID, byte source, byte audible); 541 void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
542 542
543 void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, 543 void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
544 LLUUID imSessionID, string fromName, byte dialog, uint timeStamp); 544 UUID imSessionID, string fromName, byte dialog, uint timeStamp);
545 545
546 void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, 546 void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
547 LLUUID imSessionID, string fromName, byte dialog, uint timeStamp, 547 UUID imSessionID, string fromName, byte dialog, uint timeStamp,
548 byte[] binaryBucket); 548 byte[] binaryBucket);
549 549
550 void SendLayerData(float[] map); 550 void SendLayerData(float[] map);
551 void SendLayerData(int px, int py, float[] map); 551 void SendLayerData(int px, int py, float[] map);
552 552
553 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); 553 void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
554 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint); 554 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
555 AgentCircuitData RequestClientInfo(); 555 AgentCircuitData RequestClientInfo();
556 556
557 void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, 557 void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint,
558 string capsURL); 558 string capsURL);
559 559
560 void SendMapBlock(List<MapBlockData> mapBlocks, uint flag); 560 void SendMapBlock(List<MapBlockData> mapBlocks, uint flag);
561 void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); 561 void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags);
562 562
563 void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, 563 void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID,
564 uint flags, string capsURL); 564 uint flags, string capsURL);
565 565
566 void SendTeleportFailed(string reason); 566 void SendTeleportFailed(string reason);
567 void SendTeleportLocationStart(); 567 void SendTeleportLocationStart();
568 void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); 568 void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance);
569 void SendPayPrice(LLUUID objectID, int[] payPrice); 569 void SendPayPrice(UUID objectID, int[] payPrice);
570 570
571 void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, 571 void SendAvatarData(ulong regionHandle, string firstName, string lastName, UUID avatarID, uint avatarLocalID,
572 LLVector3 Pos, byte[] textureEntry, uint parentID, LLQuaternion rotation); 572 Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation);
573 573
574 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, 574 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
575 LLVector3 velocity, LLQuaternion rotation); 575 Vector3 velocity, Quaternion rotation);
576 576
577 void SendCoarseLocationUpdate(List<LLVector3> CoarseLocations); 577 void SendCoarseLocationUpdate(List<Vector3> CoarseLocations);
578 578
579 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); 579 void AttachObject(uint localID, Quaternion rotation, byte attachPoint);
580 void SetChildAgentThrottle(byte[] throttle); 580 void SetChildAgentThrottle(byte[] throttle);
581 581
582 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, 582 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
583 LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, 583 Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
584 uint flags, 584 uint flags,
585 LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, 585 UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem,
586 byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, LLUUID AssetId, LLUUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius); 586 byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius);
587 587
588 588
589 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, 589 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
590 LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, 590 Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
591 uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, 591 uint flags, UUID objectID, UUID ownerID, string text, byte[] color,
592 uint parentID, byte[] particleSystem, byte clickAction); 592 uint parentID, byte[] particleSystem, byte clickAction);
593 593
594 594
595 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, 595 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
596 LLQuaternion rotation, LLVector3 velocity, LLVector3 rotationalvelocity, byte state, LLUUID AssetId); 596 Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId);
597 597
598 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, 598 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
599 LLQuaternion rotation, LLVector3 velocity, LLVector3 rotationalvelocity); 599 Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity);
600 600
601 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items, 601 void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items,
602 List<InventoryFolderBase> folders, bool fetchFolders, 602 List<InventoryFolderBase> folders, bool fetchFolders,
603 bool fetchItems); 603 bool fetchItems);
604 604
605 void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item); 605 void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item);
606 606
607 /// <summary> 607 /// <summary>
608 /// Tell the client that we have created the item it requested. 608 /// Tell the client that we have created the item it requested.
@@ -610,11 +610,11 @@ namespace OpenSim.Framework
610 /// <param name="Item"></param> 610 /// <param name="Item"></param>
611 void SendInventoryItemCreateUpdate(InventoryItemBase Item); 611 void SendInventoryItemCreateUpdate(InventoryItemBase Item);
612 612
613 void SendRemoveInventoryItem(LLUUID itemID); 613 void SendRemoveInventoryItem(UUID itemID);
614 614
615 void SendTakeControls(int controls, bool passToAgent, bool TakeControls); 615 void SendTakeControls(int controls, bool passToAgent, bool TakeControls);
616 616
617 void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName); 617 void SendTaskInventory(UUID taskID, short serial, byte[] fileName);
618 618
619 /// <summary> 619 /// <summary>
620 /// Used by the server to inform the client of a new inventory item. Used when transferring items 620 /// Used by the server to inform the client of a new inventory item. Used when transferring items
@@ -632,90 +632,90 @@ namespace OpenSim.Framework
632 632
633 void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data); 633 void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data);
634 634
635 void SendAgentDataUpdate(LLUUID agentid, LLUUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle); 635 void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle);
636 636
637 void SendPreLoadSound(LLUUID objectID, LLUUID ownerID, LLUUID soundID); 637 void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID);
638 void SendPlayAttachedSound(LLUUID soundID, LLUUID objectID, LLUUID ownerID, float gain, byte flags); 638 void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain, byte flags);
639 void SendTriggeredSound(LLUUID soundID, LLUUID ownerID, LLUUID objectID, LLUUID parentID, ulong handle, LLVector3 position, float gain); 639 void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain);
640 void SendAttachedSoundGainChange(LLUUID objectID, float gain); 640 void SendAttachedSoundGainChange(UUID objectID, float gain);
641 641
642 void SendNameReply(LLUUID profileId, string firstname, string lastname); 642 void SendNameReply(UUID profileId, string firstname, string lastname);
643 void SendAlertMessage(string message); 643 void SendAlertMessage(string message);
644 644
645 void SendAgentAlertMessage(string message, bool modal); 645 void SendAgentAlertMessage(string message, bool modal);
646 void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url); 646 void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url);
647 void SendDialog(string objectname, LLUUID objectID, LLUUID ownerID, string msg, LLUUID textureID, int ch, string[] buttonlabels); 647 void SendDialog(string objectname, UUID objectID, UUID ownerID, string msg, UUID textureID, int ch, string[] buttonlabels);
648 bool AddMoney(int debit); 648 bool AddMoney(int debit);
649 649
650 void SendSunPos(LLVector3 sunPos, LLVector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition); 650 void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition);
651 void SendViewerTime(int phase); 651 void SendViewerTime(int phase);
652 LLUUID GetDefaultAnimation(string name); 652 UUID GetDefaultAnimation(string name);
653 653
654 void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout, 654 void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout,
655 uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID); 655 uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID);
656 656
657 void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question); 657 void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question);
658 void SendHealth(float health); 658 void SendHealth(float health);
659 659
660 660
661 void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID); 661 void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID);
662 662
663 void SendBannedUserList(LLUUID invoice, EstateBan[] banlist, uint estateID); 663 void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID);
664 664
665 void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args); 665 void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args);
666 void SendEstateCovenantInformation(LLUUID covenant); 666 void SendEstateCovenantInformation(UUID covenant);
667 void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant, string abuseEmail); 667 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail);
668 668
669 void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags); 669 void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags);
670 void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID); 670 void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID);
671 void SendForceClientSelectObjects(List<uint> objectIDs); 671 void SendForceClientSelectObjects(List<uint> objectIDs);
672 void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount); 672 void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount);
673 void SendLandParcelOverlay(byte[] data, int sequence_id); 673 void SendLandParcelOverlay(byte[] data, int sequence_id);
674 674
675 #region Parcel Methods 675 #region Parcel Methods
676 676
677 void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time); 677 void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time);
678 678
679 void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID, 679 void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID,
680 byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, 680 byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight,
681 byte mediaLoop); 681 byte mediaLoop);
682 682
683 #endregion 683 #endregion
684 684
685 void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID); 685 void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID);
686 void SendConfirmXfer(ulong xferID, uint PacketID); 686 void SendConfirmXfer(ulong xferID, uint PacketID);
687 void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName); 687 void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName);
688 688
689 void SendImagePart(ushort numParts, LLUUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec); 689 void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec);
690 690
691 void SendShutdownConnectionNotice(); 691 void SendShutdownConnectionNotice();
692 void SendSimStats(Packet pack); 692 void SendSimStats(Packet pack);
693 void SendObjectPropertiesFamilyData(uint RequestFlags, LLUUID ObjectUUID, LLUUID OwnerID, LLUUID GroupID, 693 void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID,
694 uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, 694 uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask,
695 uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, uint Category, 695 uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, uint Category,
696 LLUUID LastOwnerID, string ObjectName, string Description); 696 UUID LastOwnerID, string ObjectName, string Description);
697 697
698 void SendObjectPropertiesReply(LLUUID ItemID, ulong CreationDate, LLUUID CreatorUUID, LLUUID FolderUUID, LLUUID FromTaskUUID, 698 void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID,
699 LLUUID GroupUUID, short InventorySerial, LLUUID LastOwnerUUID, LLUUID ObjectUUID, 699 UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID,
700 LLUUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, 700 UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName,
701 string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, 701 string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask,
702 uint BaseMask, byte saleType, int salePrice); 702 uint BaseMask, byte saleType, int salePrice);
703 void SendAgentOffline(LLUUID[] agentIDs); 703 void SendAgentOffline(UUID[] agentIDs);
704 704
705 void SendAgentOnline(LLUUID[] agentIDs); 705 void SendAgentOnline(UUID[] agentIDs);
706 706
707 void SendSitResponse(LLUUID TargetID, LLVector3 OffsetPos, LLQuaternion SitOrientation, bool autopilot, 707 void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
708 LLVector3 CameraAtOffset, LLVector3 CameraEyeOffset, bool ForceMouseLook); 708 Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook);
709 709
710 void SendAdminResponse(LLUUID Token, uint AdminLevel); 710 void SendAdminResponse(UUID Token, uint AdminLevel);
711 711
712 void SendGroupMembership(GroupData[] GroupMembership); 712 void SendGroupMembership(GroupData[] GroupMembership);
713 713
714 void SendGroupNameReply(LLUUID groupLLUID, string GroupName); 714 void SendGroupNameReply(UUID groupLLUID, string GroupName);
715 715
716 void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia); 716 void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia);
717 717
718 void SendScriptRunningReply(LLUUID objectID, LLUUID itemID, bool running); 718 void SendScriptRunningReply(UUID objectID, UUID itemID, bool running);
719 719
720 void SendAsset(AssetRequestToClient req); 720 void SendAsset(AssetRequestToClient req);
721 721
@@ -734,18 +734,18 @@ namespace OpenSim.Framework
734 event Action<IClientAPI> OnLogout; 734 event Action<IClientAPI> OnLogout;
735 event Action<IClientAPI> OnConnectionClosed; 735 event Action<IClientAPI> OnConnectionClosed;
736 736
737 void SendBlueBoxMessage(LLUUID FromAvatarID, LLUUID fromSessionID, String FromAvatarName, String Message); 737 void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message);
738 738
739 void SendLogoutPacket(); 739 void SendLogoutPacket();
740 ClientInfo GetClientInfo(); 740 ClientInfo GetClientInfo();
741 void SetClientInfo(ClientInfo info); 741 void SetClientInfo(ClientInfo info);
742 void Terminate(); 742 void Terminate();
743 743
744 void SendSetFollowCamProperties(LLUUID objectID, SortedDictionary<int, float> parameters); 744 void SendSetFollowCamProperties(UUID objectID, SortedDictionary<int, float> parameters);
745 void SendClearFollowCamProperties(LLUUID objectID); 745 void SendClearFollowCamProperties(UUID objectID);
746 746
747 void SendRegionHandle(LLUUID regoinID, ulong handle); 747 void SendRegionHandle(UUID regoinID, ulong handle);
748 void SendParcelInfo(RegionInfo info, LandData land, LLUUID parcelID, uint x, uint y); 748 void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y);
749 void KillEndDone(); 749 void KillEndDone();
750 } 750 }
751} 751}
diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Framework/IInventoryData.cs
index 1c62b0b..d5fa25d 100644
--- a/OpenSim/Framework/IInventoryData.cs
+++ b/OpenSim/Framework/IInventoryData.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 31namespace OpenSim.Framework
32{ 32{
@@ -46,49 +46,49 @@ namespace OpenSim.Framework
46 /// </summary> 46 /// </summary>
47 /// <param name="parentID">The folder to get subfolders for</param> 47 /// <param name="parentID">The folder to get subfolders for</param>
48 /// <returns>A list of inventory folders</returns> 48 /// <returns>A list of inventory folders</returns>
49 List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID); 49 List<InventoryFolderBase> getFolderHierarchy(UUID parentID);
50 50
51 /// <summary> 51 /// <summary>
52 /// Returns a list of inventory items contained within the specified folder 52 /// Returns a list of inventory items contained within the specified folder
53 /// </summary> 53 /// </summary>
54 /// <param name="folderID">The UUID of the target folder</param> 54 /// <param name="folderID">The UUID of the target folder</param>
55 /// <returns>A List of InventoryItemBase items</returns> 55 /// <returns>A List of InventoryItemBase items</returns>
56 List<InventoryItemBase> getInventoryInFolder(LLUUID folderID); 56 List<InventoryItemBase> getInventoryInFolder(UUID folderID);
57 57
58 /// <summary> 58 /// <summary>
59 /// Returns a list of the root folders within a users inventory 59 /// Returns a list of the root folders within a users inventory
60 /// </summary> 60 /// </summary>
61 /// <param name="user">The user whos inventory is to be searched</param> 61 /// <param name="user">The user whos inventory is to be searched</param>
62 /// <returns>A list of folder objects</returns> 62 /// <returns>A list of folder objects</returns>
63 List<InventoryFolderBase> getUserRootFolders(LLUUID user); 63 List<InventoryFolderBase> getUserRootFolders(UUID user);
64 64
65 /// <summary> 65 /// <summary>
66 /// Returns the users inventory root folder. 66 /// Returns the users inventory root folder.
67 /// </summary> 67 /// </summary>
68 /// <param name="user">The UUID of the user who is having inventory being returned</param> 68 /// <param name="user">The UUID of the user who is having inventory being returned</param>
69 /// <returns>Root inventory folder, null if no root inventory folder was found</returns> 69 /// <returns>Root inventory folder, null if no root inventory folder was found</returns>
70 InventoryFolderBase getUserRootFolder(LLUUID user); 70 InventoryFolderBase getUserRootFolder(UUID user);
71 71
72 /// <summary> 72 /// <summary>
73 /// Returns a list of inventory folders contained in the folder 'parentID' 73 /// Returns a list of inventory folders contained in the folder 'parentID'
74 /// </summary> 74 /// </summary>
75 /// <param name="parentID">The folder to get subfolders for</param> 75 /// <param name="parentID">The folder to get subfolders for</param>
76 /// <returns>A list of inventory folders</returns> 76 /// <returns>A list of inventory folders</returns>
77 List<InventoryFolderBase> getInventoryFolders(LLUUID parentID); 77 List<InventoryFolderBase> getInventoryFolders(UUID parentID);
78 78
79 /// <summary> 79 /// <summary>
80 /// Returns an inventory item by its UUID 80 /// Returns an inventory item by its UUID
81 /// </summary> 81 /// </summary>
82 /// <param name="item">The UUID of the item to be returned</param> 82 /// <param name="item">The UUID of the item to be returned</param>
83 /// <returns>A class containing item information</returns> 83 /// <returns>A class containing item information</returns>
84 InventoryItemBase getInventoryItem(LLUUID item); 84 InventoryItemBase getInventoryItem(UUID item);
85 85
86 /// <summary> 86 /// <summary>
87 /// Returns a specified inventory folder by its UUID 87 /// Returns a specified inventory folder by its UUID
88 /// </summary> 88 /// </summary>
89 /// <param name="folder">The UUID of the folder to be returned</param> 89 /// <param name="folder">The UUID of the folder to be returned</param>
90 /// <returns>A class containing folder information</returns> 90 /// <returns>A class containing folder information</returns>
91 InventoryFolderBase getInventoryFolder(LLUUID folder); 91 InventoryFolderBase getInventoryFolder(UUID folder);
92 92
93 /// <summary> 93 /// <summary>
94 /// Creates a new inventory item based on item 94 /// Creates a new inventory item based on item
@@ -106,7 +106,7 @@ namespace OpenSim.Framework
106 /// 106 ///
107 /// </summary> 107 /// </summary>
108 /// <param name="item"></param> 108 /// <param name="item"></param>
109 void deleteInventoryItem(LLUUID item); 109 void deleteInventoryItem(UUID item);
110 110
111 /// <summary> 111 /// <summary>
112 /// Adds a new folder specified by folder 112 /// Adds a new folder specified by folder
@@ -130,7 +130,7 @@ namespace OpenSim.Framework
130 /// Deletes a folder. Thie will delete both the folder itself and its contents (items and descendent folders) 130 /// Deletes a folder. Thie will delete both the folder itself and its contents (items and descendent folders)
131 /// </summary> 131 /// </summary>
132 /// <param name="folder">The id of the folder</param> 132 /// <param name="folder">The id of the folder</param>
133 void deleteInventoryFolder(LLUUID folder); 133 void deleteInventoryFolder(UUID folder);
134 } 134 }
135 135
136 public class InventoryDataInitialiser : PluginInitialiserBase 136 public class InventoryDataInitialiser : PluginInitialiserBase
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
index 1758508..2f0c113 100644
--- a/OpenSim/Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/IRegionCommsListener.cs
@@ -26,31 +26,31 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
33 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent); 33 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
34 34
35 public delegate bool ExpectPrimDelegate(ulong regionHandle, LLUUID primID, string objData, int XMLMethod); 35 public delegate bool ExpectPrimDelegate(ulong regionHandle, UUID primID, string objData, int XMLMethod);
36 36
37 public delegate void UpdateNeighbours(List<RegionInfo> neighbours); 37 public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
38 38
39 public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); 39 public delegate void AgentCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying);
40 40
41 public delegate void PrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical); 41 public delegate void PrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical);
42 42
43 public delegate void AcknowledgeAgentCross(ulong regionHandle, LLUUID agentID); 43 public delegate void AcknowledgeAgentCross(ulong regionHandle, UUID agentID);
44 44
45 public delegate void AcknowledgePrimCross(ulong regionHandle, LLUUID PrimID); 45 public delegate void AcknowledgePrimCross(ulong regionHandle, UUID PrimID);
46 46
47 public delegate bool CloseAgentConnection(ulong regionHandle, LLUUID agentID); 47 public delegate bool CloseAgentConnection(ulong regionHandle, UUID agentID);
48 48
49 public delegate bool RegionUp(RegionInfo region); 49 public delegate bool RegionUp(RegionInfo region);
50 50
51 public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); 51 public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData);
52 52
53 public delegate void LogOffUser(ulong regionHandle, LLUUID agentID, LLUUID regionSecret, string message); 53 public delegate void LogOffUser(ulong regionHandle, UUID agentID, UUID regionSecret, string message);
54 54
55 public delegate LandData GetLandData(uint x, uint y); 55 public delegate LandData GetLandData(uint x, uint y);
56 56
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 2cce12f..d3e79d0 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.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 30namespace OpenSim.Framework
31{ 31{
@@ -52,7 +52,7 @@ namespace OpenSim.Framework
52 event restart OnRestart; 52 event restart OnRestart;
53 53
54 void AddNewClient(IClientAPI client, bool child); 54 void AddNewClient(IClientAPI client, bool child);
55 void RemoveClient(LLUUID agentID); 55 void RemoveClient(UUID agentID);
56 void CloseAllAgents(uint circuitcode); 56 void CloseAllAgents(uint circuitcode);
57 57
58 void Restart(int seconds); 58 void Restart(int seconds);
@@ -60,9 +60,9 @@ namespace OpenSim.Framework
60 60
61 string GetSimulatorVersion(); 61 string GetSimulatorVersion();
62 62
63 bool PresenceChildStatus(LLUUID avatarID); 63 bool PresenceChildStatus(UUID avatarID);
64 64
65 string GetCapsPath(LLUUID agentId); 65 string GetCapsPath(UUID agentId);
66 66
67 T RequestModuleInterface<T>(); 67 T RequestModuleInterface<T>();
68 } 68 }
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index ffde002..4089253 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.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 31namespace OpenSim.Framework
32{ 32{
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
40 /// </summary> 40 /// </summary>
41 /// <param name="user">The user's UUID</param> 41 /// <param name="user">The user's UUID</param>
42 /// <returns>The user data profile. Returns null if no user is found</returns> 42 /// <returns>The user data profile. Returns null if no user is found</returns>
43 UserProfileData GetUserByUUID(LLUUID user); 43 UserProfileData GetUserByUUID(UUID user);
44 44
45 /// <summary> 45 /// <summary>
46 /// Returns a users profile by searching their username parts 46 /// Returns a users profile by searching their username parts
@@ -56,14 +56,14 @@ namespace OpenSim.Framework
56 /// <param name="queryID">ID associated with the user's query. This must match what the client sent</param> 56 /// <param name="queryID">ID associated with the user's query. This must match what the client sent</param>
57 /// <param name="query">The filtered contents of the search box when the user hit search.</param> 57 /// <param name="query">The filtered contents of the search box when the user hit search.</param>
58 /// <returns>The user data profile</returns> 58 /// <returns>The user data profile</returns>
59 List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); 59 List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query);
60 60
61 /// <summary> 61 /// <summary>
62 /// Returns the current agent for a user searching by it's UUID 62 /// Returns the current agent for a user searching by it's UUID
63 /// </summary> 63 /// </summary>
64 /// <param name="user">The users UUID</param> 64 /// <param name="user">The users UUID</param>
65 /// <returns>The current agent session</returns> 65 /// <returns>The current agent session</returns>
66 UserAgentData GetAgentByUUID(LLUUID user); 66 UserAgentData GetAgentByUUID(UUID user);
67 67
68 /// <summary> 68 /// <summary>
69 /// Returns the current session agent for a user searching by username 69 /// Returns the current session agent for a user searching by username
@@ -84,7 +84,7 @@ namespace OpenSim.Framework
84 /// Stores new web-login key for user during web page login 84 /// Stores new web-login key for user during web page login
85 /// </summary> 85 /// </summary>
86 /// <param name="webLoginKey"></param> 86 /// <param name="webLoginKey"></param>
87 void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey); 87 void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
88 88
89 /// <summary> 89 /// <summary>
90 /// Adds a new User profile to the database 90 /// Adds a new User profile to the database
@@ -99,7 +99,7 @@ namespace OpenSim.Framework
99 bool UpdateUserProfile(UserProfileData user); 99 bool UpdateUserProfile(UserProfileData user);
100 100
101 101
102 void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle); 102 void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
103 /// <summary> 103 /// <summary>
104 /// Adds a new agent to the database 104 /// Adds a new agent to the database
105 /// </summary> 105 /// </summary>
@@ -112,14 +112,14 @@ namespace OpenSim.Framework
112 /// <param name="friendlistowner">The agent that who's friends list is being added to</param> 112 /// <param name="friendlistowner">The agent that who's friends list is being added to</param>
113 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param> 113 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param>
114 /// <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> 114 /// <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>
115 void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms); 115 void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
116 116
117 /// <summary> 117 /// <summary>
118 /// Delete friend on friendlistowner's friendlist. 118 /// Delete friend on friendlistowner's friendlist.
119 /// </summary> 119 /// </summary>
120 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 120 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
121 /// <param name="friend">The Ex-friend agent</param> 121 /// <param name="friend">The Ex-friend agent</param>
122 void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend); 122 void RemoveUserFriend(UUID friendlistowner, UUID friend);
123 123
124 /// <summary> 124 /// <summary>
125 /// Update permissions for friend on friendlistowner's friendlist. 125 /// Update permissions for friend on friendlistowner's friendlist.
@@ -127,13 +127,13 @@ namespace OpenSim.Framework
127 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 127 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
128 /// <param name="friend">The agent that is getting or loosing permissions</param> 128 /// <param name="friend">The agent that is getting or loosing permissions</param>
129 /// <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> 129 /// <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>
130 void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms); 130 void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
131 131
132 /// <summary> 132 /// <summary>
133 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner 133 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
134 /// </summary> 134 /// </summary>
135 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 135 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
136 List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); 136 List<FriendListItem> GetUserFriendList(UUID friendlistowner);
137 137
138 /// <summary> 138 /// <summary>
139 /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES) 139 /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES)
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
142 /// <param name="to">The account to transfer to</param> 142 /// <param name="to">The account to transfer to</param>
143 /// <param name="amount">The amount to transfer</param> 143 /// <param name="amount">The amount to transfer</param>
144 /// <returns>Successful?</returns> 144 /// <returns>Successful?</returns>
145 bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount); 145 bool MoneyTransferRequest(UUID from, UUID to, uint amount);
146 146
147 /// <summary> 147 /// <summary>
148 /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account. 148 /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account.
@@ -151,7 +151,7 @@ namespace OpenSim.Framework
151 /// <param name="to">User to transfer to</param> 151 /// <param name="to">User to transfer to</param>
152 /// <param name="inventory">Specified inventory item</param> 152 /// <param name="inventory">Specified inventory item</param>
153 /// <returns>Successful?</returns> 153 /// <returns>Successful?</returns>
154 bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory); 154 bool InventoryTransferRequest(UUID from, UUID to, UUID inventory);
155 155
156 /// <summary> 156 /// <summary>
157 /// Initialises the plugin (artificial constructor) 157 /// Initialises the plugin (artificial constructor)
@@ -161,11 +161,11 @@ namespace OpenSim.Framework
161 /// <summary> 161 /// <summary>
162 /// Gets the user appearance 162 /// Gets the user appearance
163 /// </summer> 163 /// </summer>
164 AvatarAppearance GetUserAppearance(LLUUID user); 164 AvatarAppearance GetUserAppearance(UUID user);
165 165
166 void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance); 166 void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
167 167
168 void ResetAttachments(LLUUID userID); 168 void ResetAttachments(UUID userID);
169 } 169 }
170 170
171 public class UserDataInitialiser : PluginInitialiserBase 171 public class UserDataInitialiser : PluginInitialiserBase
diff --git a/OpenSim/Framework/InventoryCollection.cs b/OpenSim/Framework/InventoryCollection.cs
index df18efb..84b7d58 100644
--- a/OpenSim/Framework/InventoryCollection.cs
+++ b/OpenSim/Framework/InventoryCollection.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 31namespace OpenSim.Framework
32{ 32{
@@ -37,6 +37,6 @@ namespace OpenSim.Framework
37 { 37 {
38 public List<InventoryFolderBase> Folders; 38 public List<InventoryFolderBase> Folders;
39 public List<InventoryItemBase> Items; 39 public List<InventoryItemBase> Items;
40 public LLUUID UserID; 40 public UUID UserID;
41 } 41 }
42} \ No newline at end of file 42}
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index 9c3c116..e55f834 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.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 30namespace OpenSim.Framework
31{ 31{
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 /// <summary> 37 /// <summary>
38 /// The UUID for this folder 38 /// The UUID for this folder
39 /// </summary> 39 /// </summary>
40 private LLUUID _id; 40 private UUID _id;
41 41
42 /// <summary> 42 /// <summary>
43 /// The name of the folder (64 characters or less) 43 /// The name of the folder (64 characters or less)
@@ -47,12 +47,12 @@ namespace OpenSim.Framework
47 /// <summary> 47 /// <summary>
48 /// The agent who's inventory this is contained by 48 /// The agent who's inventory this is contained by
49 /// </summary> 49 /// </summary>
50 private LLUUID _owner; 50 private UUID _owner;
51 51
52 /// <summary> 52 /// <summary>
53 /// The folder this folder is contained in 53 /// The folder this folder is contained in
54 /// </summary> 54 /// </summary>
55 private LLUUID _parentID; 55 private UUID _parentID;
56 56
57 /// <summary> 57 /// <summary>
58 /// Type of items normally stored in this folder 58 /// Type of items normally stored in this folder
@@ -72,19 +72,19 @@ namespace OpenSim.Framework
72 set { _name = value; } 72 set { _name = value; }
73 } 73 }
74 74
75 public virtual LLUUID Owner 75 public virtual UUID Owner
76 { 76 {
77 get { return _owner; } 77 get { return _owner; }
78 set { _owner = value; } 78 set { _owner = value; }
79 } 79 }
80 80
81 public virtual LLUUID ParentID 81 public virtual UUID ParentID
82 { 82 {
83 get { return _parentID; } 83 get { return _parentID; }
84 set { _parentID = value; } 84 set { _parentID = value; }
85 } 85 }
86 86
87 public virtual LLUUID ID 87 public virtual UUID ID
88 { 88 {
89 get { return _id; } 89 get { return _id; }
90 set { _id = value; } 90 set { _id = value; }
@@ -102,4 +102,4 @@ namespace OpenSim.Framework
102 set { _version = value; } 102 set { _version = value; }
103 } 103 }
104 } 104 }
105} \ No newline at end of file 105}
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 85b08cb..4441e73 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.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 30namespace OpenSim.Framework
31{ 31{
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 /// <summary> 37 /// <summary>
38 /// The UUID of the associated asset on the asset server 38 /// The UUID of the associated asset on the asset server
39 /// </summary> 39 /// </summary>
40 private LLUUID _assetID; 40 private UUID _assetID;
41 41
42 /// <summary> 42 /// <summary>
43 /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc) 43 /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
@@ -52,9 +52,9 @@ namespace OpenSim.Framework
52 /// <summary> 52 /// <summary>
53 /// The creator of this item 53 /// The creator of this item
54 /// </summary> 54 /// </summary>
55 private LLUUID _creator; 55 private UUID _creator;
56 56
57 private LLUUID _owner; 57 private UUID _owner;
58 58
59 private uint _nextPermissions; 59 private uint _nextPermissions;
60 60
@@ -76,12 +76,12 @@ namespace OpenSim.Framework
76 /// <summary> 76 /// <summary>
77 /// The folder this item is contained in 77 /// The folder this item is contained in
78 /// </summary> 78 /// </summary>
79 private LLUUID _folder; 79 private UUID _folder;
80 80
81 /// <summary> 81 /// <summary>
82 /// A UUID containing the ID for the inventory item itself 82 /// A UUID containing the ID for the inventory item itself
83 /// </summary> 83 /// </summary>
84 private LLUUID _id; 84 private UUID _id;
85 85
86 /// <summary> 86 /// <summary>
87 /// The type of inventory item. (Can be slightly different to the asset type 87 /// The type of inventory item. (Can be slightly different to the asset type
@@ -97,7 +97,7 @@ namespace OpenSim.Framework
97 /// <summary> 97 /// <summary>
98 /// 98 ///
99 /// </summary> 99 /// </summary>
100 private LLUUID _groupID; 100 private UUID _groupID;
101 101
102 /// <summary> 102 /// <summary>
103 /// 103 ///
@@ -124,7 +124,7 @@ namespace OpenSim.Framework
124 /// </summary> 124 /// </summary>
125 private int _creationDate; 125 private int _creationDate;
126 126
127 public virtual LLUUID ID { 127 public virtual UUID ID {
128 get { 128 get {
129 return _id; 129 return _id;
130 } 130 }
@@ -139,19 +139,19 @@ namespace OpenSim.Framework
139 set { _invType = value; } 139 set { _invType = value; }
140 } 140 }
141 141
142 public virtual LLUUID Folder 142 public virtual UUID Folder
143 { 143 {
144 get { return _folder; } 144 get { return _folder; }
145 set { _folder = value; } 145 set { _folder = value; }
146 } 146 }
147 147
148 public virtual LLUUID Owner 148 public virtual UUID Owner
149 { 149 {
150 get { return _owner; } 150 get { return _owner; }
151 set { _owner = value; } 151 set { _owner = value; }
152 } 152 }
153 153
154 public virtual LLUUID Creator 154 public virtual UUID Creator
155 { 155 {
156 get { return _creator; } 156 get { return _creator; }
157 set { _creator = value; } 157 set { _creator = value; }
@@ -199,13 +199,13 @@ namespace OpenSim.Framework
199 set { _assetType = value; } 199 set { _assetType = value; }
200 } 200 }
201 201
202 public virtual LLUUID AssetID 202 public virtual UUID AssetID
203 { 203 {
204 get { return _assetID; } 204 get { return _assetID; }
205 set { _assetID = value; } 205 set { _assetID = value; }
206 } 206 }
207 207
208 public virtual LLUUID GroupID 208 public virtual UUID GroupID
209 { 209 {
210 get 210 get
211 { 211 {
diff --git a/OpenSim/Framework/LLGroup.cs b/OpenSim/Framework/LLGroup.cs
index 9958780..53d42a4 100644
--- a/OpenSim/Framework/LLGroup.cs
+++ b/OpenSim/Framework/LLGroup.cs
@@ -28,7 +28,7 @@
28 28
29using System; 29using System;
30using System.Collections; 30using System.Collections;
31using libsecondlife; 31using OpenMetaverse;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Text; 33using System.Text;
34 34
@@ -37,8 +37,8 @@ namespace OpenSim.Framework
37 public class GroupData 37 public class GroupData
38 { 38 {
39 public string ActiveGroupTitle; 39 public string ActiveGroupTitle;
40 public LLUUID GroupID; 40 public UUID GroupID;
41 public List<LLUUID> GroupMembers; 41 public List<UUID> GroupMembers;
42 public string groupName; 42 public string groupName;
43 public uint groupPowers = (uint)(GroupPowers.LandAllowLandmark | GroupPowers.LandAllowSetHome); 43 public uint groupPowers = (uint)(GroupPowers.LandAllowLandmark | GroupPowers.LandAllowSetHome);
44 public List<string> GroupTitles; 44 public List<string> GroupTitles;
@@ -46,10 +46,10 @@ namespace OpenSim.Framework
46 public bool AllowPublish = true; 46 public bool AllowPublish = true;
47 public string Charter = "Cool Group Yeah!"; 47 public string Charter = "Cool Group Yeah!";
48 public int contribution = 0; 48 public int contribution = 0;
49 public LLUUID FounderID = LLUUID.Zero; 49 public UUID FounderID = UUID.Zero;
50 public int groupMembershipCost = 0; 50 public int groupMembershipCost = 0;
51 public int groupRollsCount = 1; 51 public int groupRollsCount = 1;
52 public LLUUID GroupPicture = LLUUID.Zero; 52 public UUID GroupPicture = UUID.Zero;
53 public bool MaturePublish = true; 53 public bool MaturePublish = true;
54 public int MembershipFee = 0; 54 public int MembershipFee = 0;
55 public bool OpenEnrollment = true; 55 public bool OpenEnrollment = true;
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
58 public GroupData() 58 public GroupData()
59 { 59 {
60 GroupTitles = new List<string>(); 60 GroupTitles = new List<string>();
61 GroupMembers = new List<LLUUID>(); 61 GroupMembers = new List<UUID>();
62 } 62 }
63 63
64 public GroupPowers ActiveGroupPowers 64 public GroupPowers ActiveGroupPowers
@@ -70,11 +70,11 @@ namespace OpenSim.Framework
70 70
71 public class GroupList 71 public class GroupList
72 { 72 {
73 public List<LLUUID> m_GroupList; 73 public List<UUID> m_GroupList;
74 74
75 public GroupList() 75 public GroupList()
76 { 76 {
77 m_GroupList = new List<LLUUID>(); 77 m_GroupList = new List<UUID>();
78 } 78 }
79 } 79 }
80} 80}
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index a875a50..4e66721 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -27,22 +27,22 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using OpenMetaverse;
31 31
32namespace OpenSim.Framework 32namespace OpenSim.Framework
33{ 33{
34 public class LandData 34 public class LandData
35 { 35 {
36 private LLVector3 _AABBMax = new LLVector3(); 36 private Vector3 _AABBMax = new Vector3();
37 private LLVector3 _AABBMin = new LLVector3(); 37 private Vector3 _AABBMin = new Vector3();
38 private int _area = 0; 38 private int _area = 0;
39 private uint _auctionID = 0; //Unemplemented. If set to 0, not being auctioned 39 private uint _auctionID = 0; //Unemplemented. If set to 0, not being auctioned
40 private LLUUID _authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID 40 private UUID _authBuyerID = UUID.Zero; //Unemplemented. Authorized Buyer's UUID
41 private Parcel.ParcelCategory _category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category 41 private Parcel.ParcelCategory _category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
42 private int _claimDate = 0; 42 private int _claimDate = 0;
43 private int _claimPrice = 0; //Unemplemented 43 private int _claimPrice = 0; //Unemplemented
44 private LLUUID _globalID = LLUUID.Zero; 44 private UUID _globalID = UUID.Zero;
45 private LLUUID _groupID = LLUUID.Zero; //Unemplemented 45 private UUID _groupID = UUID.Zero; //Unemplemented
46 private int _groupPrims = 0; 46 private int _groupPrims = 0;
47 private bool _isGroupOwned = false; 47 private bool _isGroupOwned = false;
48 private byte[] _bitmap = new byte[512]; 48 private byte[] _bitmap = new byte[512];
@@ -50,7 +50,7 @@ namespace OpenSim.Framework
50 50
51 51
52 private uint _flags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark | 52 private uint _flags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark |
53 (uint) Parcel.ParcelFlags.AllowAllObjectEntry | 53 (uint) Parcel.ParcelFlags.AllowAPrimitiveEntry |
54 (uint) Parcel.ParcelFlags.AllowDeedToGroup | (uint) Parcel.ParcelFlags.AllowTerraform | 54 (uint) Parcel.ParcelFlags.AllowDeedToGroup | (uint) Parcel.ParcelFlags.AllowTerraform |
55 (uint) Parcel.ParcelFlags.CreateObjects | (uint) Parcel.ParcelFlags.AllowOtherScripts | 55 (uint) Parcel.ParcelFlags.CreateObjects | (uint) Parcel.ParcelFlags.AllowOtherScripts |
56 (uint) Parcel.ParcelFlags.SoundLocal; 56 (uint) Parcel.ParcelFlags.SoundLocal;
@@ -60,12 +60,12 @@ namespace OpenSim.Framework
60 private Parcel.ParcelStatus _status = Parcel.ParcelStatus.Leased; 60 private Parcel.ParcelStatus _status = Parcel.ParcelStatus.Leased;
61 private int _localID = 0; 61 private int _localID = 0;
62 private byte _mediaAutoScale = 0; 62 private byte _mediaAutoScale = 0;
63 private LLUUID _mediaID = LLUUID.Zero; 63 private UUID _mediaID = UUID.Zero;
64 64
65 private string _mediaURL = String.Empty; 65 private string _mediaURL = String.Empty;
66 private string _musicURL = String.Empty; 66 private string _musicURL = String.Empty;
67 private int _otherPrims = 0; 67 private int _otherPrims = 0;
68 private LLUUID _ownerID = LLUUID.Zero; 68 private UUID _ownerID = UUID.Zero;
69 private int _ownerPrims = 0; 69 private int _ownerPrims = 0;
70 private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); 70 private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
71 private float _passHours = 0; 71 private float _passHours = 0;
@@ -74,11 +74,11 @@ namespace OpenSim.Framework
74 private int _selectedPrims = 0; 74 private int _selectedPrims = 0;
75 private int _simwideArea = 0; 75 private int _simwideArea = 0;
76 private int _simwidePrims = 0; 76 private int _simwidePrims = 0;
77 private LLUUID _snapshotID = LLUUID.Zero; 77 private UUID _snapshotID = UUID.Zero;
78 private LLVector3 _userLocation = new LLVector3(); 78 private Vector3 _userLocation = new Vector3();
79 private LLVector3 _userLookAt = new LLVector3(); 79 private Vector3 _userLookAt = new Vector3();
80 80
81 public LLVector3 AABBMax { 81 public Vector3 AABBMax {
82 get { 82 get {
83 return _AABBMax; 83 return _AABBMax;
84 } 84 }
@@ -87,7 +87,7 @@ namespace OpenSim.Framework
87 } 87 }
88 } 88 }
89 89
90 public LLVector3 AABBMin { 90 public Vector3 AABBMin {
91 get { 91 get {
92 return _AABBMin; 92 return _AABBMin;
93 } 93 }
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
114 } 114 }
115 } 115 }
116 116
117 public LLUUID AuthBuyerID { 117 public UUID AuthBuyerID {
118 get { 118 get {
119 return _authBuyerID; 119 return _authBuyerID;
120 } 120 }
@@ -123,7 +123,7 @@ namespace OpenSim.Framework
123 } 123 }
124 } 124 }
125 125
126 public libsecondlife.Parcel.ParcelCategory Category { 126 public OpenMetaverse.Parcel.ParcelCategory Category {
127 get { 127 get {
128 return _category; 128 return _category;
129 } 129 }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework
150 } 150 }
151 } 151 }
152 152
153 public LLUUID GlobalID { 153 public UUID GlobalID {
154 get { 154 get {
155 return _globalID; 155 return _globalID;
156 } 156 }
@@ -159,7 +159,7 @@ namespace OpenSim.Framework
159 } 159 }
160 } 160 }
161 161
162 public LLUUID GroupID { 162 public UUID GroupID {
163 get { 163 get {
164 return _groupID; 164 return _groupID;
165 } 165 }
@@ -231,7 +231,7 @@ namespace OpenSim.Framework
231 } 231 }
232 } 232 }
233 233
234 public libsecondlife.Parcel.ParcelStatus Status { 234 public OpenMetaverse.Parcel.ParcelStatus Status {
235 get { 235 get {
236 return _status; 236 return _status;
237 } 237 }
@@ -258,7 +258,7 @@ namespace OpenSim.Framework
258 } 258 }
259 } 259 }
260 260
261 public LLUUID MediaID { 261 public UUID MediaID {
262 get { 262 get {
263 return _mediaID; 263 return _mediaID;
264 } 264 }
@@ -294,7 +294,7 @@ namespace OpenSim.Framework
294 } 294 }
295 } 295 }
296 296
297 public LLUUID OwnerID { 297 public UUID OwnerID {
298 get { 298 get {
299 return _ownerID; 299 return _ownerID;
300 } 300 }
@@ -312,7 +312,7 @@ namespace OpenSim.Framework
312 } 312 }
313 } 313 }
314 314
315 public List<libsecondlife.ParcelManager.ParcelAccessEntry> ParcelAccessList { 315 public List<OpenMetaverse.ParcelManager.ParcelAccessEntry> ParcelAccessList {
316 get { 316 get {
317 return _parcelAccessList; 317 return _parcelAccessList;
318 } 318 }
@@ -375,7 +375,7 @@ namespace OpenSim.Framework
375 } 375 }
376 } 376 }
377 377
378 public LLUUID SnapshotID { 378 public UUID SnapshotID {
379 get { 379 get {
380 return _snapshotID; 380 return _snapshotID;
381 } 381 }
@@ -384,7 +384,7 @@ namespace OpenSim.Framework
384 } 384 }
385 } 385 }
386 386
387 public LLVector3 UserLocation { 387 public Vector3 UserLocation {
388 get { 388 get {
389 return _userLocation; 389 return _userLocation;
390 } 390 }
@@ -393,7 +393,7 @@ namespace OpenSim.Framework
393 } 393 }
394 } 394 }
395 395
396 public LLVector3 UserLookAt { 396 public Vector3 UserLookAt {
397 get { 397 get {
398 return _userLookAt; 398 return _userLookAt;
399 } 399 }
@@ -404,7 +404,7 @@ namespace OpenSim.Framework
404 404
405 public LandData() 405 public LandData()
406 { 406 {
407 _globalID = LLUUID.Random(); 407 _globalID = UUID.Random();
408 } 408 }
409 409
410 public LandData Copy() 410 public LandData Copy()
diff --git a/OpenSim/Framework/LandStatReportItem.cs b/OpenSim/Framework/LandStatReportItem.cs
index 8c7ee7b..b3ad02a 100644
--- a/OpenSim/Framework/LandStatReportItem.cs
+++ b/OpenSim/Framework/LandStatReportItem.cs
@@ -29,7 +29,7 @@
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using libsecondlife; 32using OpenMetaverse;
33 33
34 34
35namespace OpenSim.Framework 35namespace OpenSim.Framework
@@ -41,7 +41,7 @@ namespace OpenSim.Framework
41 public float LocationZ; 41 public float LocationZ;
42 public string OwnerName; 42 public string OwnerName;
43 public float Score; 43 public float Score;
44 public LLUUID TaskID; 44 public UUID TaskID;
45 public uint TaskLocalID; 45 public uint TaskLocalID;
46 public string TaskName; 46 public string TaskName;
47 47
diff --git a/OpenSim/Framework/LandUpdateArgs.cs b/OpenSim/Framework/LandUpdateArgs.cs
index 000ae53..0fed711 100644
--- a/OpenSim/Framework/LandUpdateArgs.cs
+++ b/OpenSim/Framework/LandUpdateArgs.cs
@@ -1,17 +1,17 @@
1using System; 1using System;
2using libsecondlife; 2using OpenMetaverse;
3 3
4namespace OpenSim.Framework 4namespace OpenSim.Framework
5{ 5{
6 public class LandUpdateArgs : EventArgs 6 public class LandUpdateArgs : EventArgs
7 { 7 {
8 public LLUUID AuthBuyerID; 8 public UUID AuthBuyerID;
9 public Parcel.ParcelCategory Category; 9 public Parcel.ParcelCategory Category;
10 public string Desc; 10 public string Desc;
11 public LLUUID GroupID; 11 public UUID GroupID;
12 public byte LandingType; 12 public byte LandingType;
13 public byte MediaAutoScale; 13 public byte MediaAutoScale;
14 public LLUUID MediaID; 14 public UUID MediaID;
15 public string MediaURL; 15 public string MediaURL;
16 public string MusicURL; 16 public string MusicURL;
17 public string Name; 17 public string Name;
@@ -19,8 +19,8 @@ namespace OpenSim.Framework
19 public float PassHours; 19 public float PassHours;
20 public int PassPrice; 20 public int PassPrice;
21 public int SalePrice; 21 public int SalePrice;
22 public LLUUID SnapshotID; 22 public UUID SnapshotID;
23 public LLVector3 UserLocation; 23 public Vector3 UserLocation;
24 public LLVector3 UserLookAt; 24 public Vector3 UserLookAt;
25 } 25 }
26} \ No newline at end of file 26}
diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs
index 77b2c85..f67543a 100644
--- a/OpenSim/Framework/Location.cs
+++ b/OpenSim/Framework/Location.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs
index e754e9f..61fffd2 100644
--- a/OpenSim/Framework/Login.cs
+++ b/OpenSim/Framework/Login.cs
@@ -26,26 +26,26 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
33 public class Login 33 public class Login
34 { 34 {
35 public LLUUID Agent; 35 public UUID Agent;
36 public LLUUID BaseFolder; 36 public UUID BaseFolder;
37 public string CapsPath = String.Empty; 37 public string CapsPath = String.Empty;
38 public uint CircuitCode; 38 public uint CircuitCode;
39 public string First = "Test"; 39 public string First = "Test";
40 public LLUUID InventoryFolder; 40 public UUID InventoryFolder;
41 public string Last = "User"; 41 public string Last = "User";
42 public LLUUID SecureSession = LLUUID.Zero; 42 public UUID SecureSession = UUID.Zero;
43 public LLUUID Session; 43 public UUID Session;
44 public LLVector3 StartPos; 44 public Vector3 StartPos;
45 45
46 public Login() 46 public Login()
47 { 47 {
48 StartPos = new LLVector3(128, 128, 70); 48 StartPos = new Vector3(128, 128, 70);
49 } 49 }
50 } 50 }
51} \ No newline at end of file 51}
diff --git a/OpenSim/Framework/MapBlockData.cs b/OpenSim/Framework/MapBlockData.cs
index 60f5be3..7b5bfaa 100644
--- a/OpenSim/Framework/MapBlockData.cs
+++ b/OpenSim/Framework/MapBlockData.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
35 public byte Access; 35 public byte Access;
36 public byte Agents; 36 public byte Agents;
37 public uint Flags; 37 public uint Flags;
38 public LLUUID MapImageId; 38 public UUID MapImageId;
39 public String Name; 39 public String Name;
40 public uint RegionFlags; 40 public uint RegionFlags;
41 public byte WaterHeight; 41 public byte WaterHeight;
@@ -46,4 +46,4 @@ namespace OpenSim.Framework
46 { 46 {
47 } 47 }
48 } 48 }
49} \ No newline at end of file 49}
diff --git a/OpenSim/Framework/OSChatMessage.cs b/OpenSim/Framework/OSChatMessage.cs
index 7f99cd7..fbeb7ba 100644
--- a/OpenSim/Framework/OSChatMessage.cs
+++ b/OpenSim/Framework/OSChatMessage.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
@@ -44,17 +44,17 @@ namespace OpenSim.Framework
44 protected int m_channel; 44 protected int m_channel;
45 protected string m_from; 45 protected string m_from;
46 protected string m_message; 46 protected string m_message;
47 protected LLVector3 m_position; 47 protected Vector3 m_position;
48 48
49 protected IScene m_scene; 49 protected IScene m_scene;
50 protected IClientAPI m_sender; 50 protected IClientAPI m_sender;
51 protected object m_senderObject; 51 protected object m_senderObject;
52 protected ChatTypeEnum m_type; 52 protected ChatTypeEnum m_type;
53 protected LLUUID m_fromID; 53 protected UUID m_fromID;
54 54
55 public OSChatMessage() 55 public OSChatMessage()
56 { 56 {
57 m_position = new LLVector3(); 57 m_position = new Vector3();
58 } 58 }
59 59
60 /// <summary> 60 /// <summary>
@@ -87,7 +87,7 @@ namespace OpenSim.Framework
87 /// <summary> 87 /// <summary>
88 /// The position of the sender at the time of the message broadcast. 88 /// The position of the sender at the time of the message broadcast.
89 /// </summary> 89 /// </summary>
90 public LLVector3 Position 90 public Vector3 Position
91 { 91 {
92 get { return m_position; } 92 get { return m_position; }
93 set { m_position = value; } 93 set { m_position = value; }
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
125 set { m_senderObject = value; } 125 set { m_senderObject = value; }
126 } 126 }
127 127
128 public LLUUID SenderUUID 128 public UUID SenderUUID
129 { 129 {
130 get { return m_fromID; } 130 get { return m_fromID; }
131 set { m_fromID = value; } 131 set { m_fromID = value; }
@@ -142,4 +142,4 @@ namespace OpenSim.Framework
142 142
143 #endregion 143 #endregion
144 } 144 }
145} \ No newline at end of file 145}
diff --git a/OpenSim/Framework/OSUUID.cs b/OpenSim/Framework/OSUUID.cs
index cb83ff2..e69de29 100644
--- a/OpenSim/Framework/OSUUID.cs
+++ b/OpenSim/Framework/OSUUID.cs
@@ -1,114 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using libsecondlife;
30
31namespace OpenSim.Framework
32{
33 [Serializable]
34 public class OSUUID : IComparable
35 {
36 public static readonly OSUUID Zero = new OSUUID();
37 public Guid UUID;
38
39 public OSUUID()
40 {
41 }
42
43 /* Constructors */
44
45 public OSUUID(string s)
46 {
47 if (s == null)
48 UUID = new Guid();
49 else
50 UUID = new Guid(s);
51 }
52
53 public OSUUID(Guid g)
54 {
55 UUID = g;
56 }
57
58 public OSUUID(LLUUID l)
59 {
60 UUID = l.UUID;
61 }
62
63 public OSUUID(ulong u)
64 {
65 UUID = new Guid(0, 0, 0, BitConverter.GetBytes(u));
66 }
67
68 #region IComparable Members
69
70 public int CompareTo(object obj)
71 {
72 if (obj is OSUUID)
73 {
74 OSUUID ID = (OSUUID) obj;
75 return UUID.CompareTo(ID.UUID);
76 }
77
78 throw new ArgumentException("object is not a OSUUID");
79 }
80
81 #endregion
82
83 // out conversion
84 public override string ToString()
85 {
86 return UUID.ToString();
87 }
88
89 public LLUUID ToLLUUID()
90 {
91 return new LLUUID(UUID);
92 }
93
94 // for comparison bits
95 public override int GetHashCode()
96 {
97 return UUID.GetHashCode();
98 }
99
100 public override bool Equals(object o)
101 {
102 if (!(o is LLUUID)) return false;
103
104 OSUUID uuid = (OSUUID) o;
105 return UUID == uuid.UUID;
106 }
107
108 // Static methods
109 public static OSUUID Random()
110 {
111 return new OSUUID(Guid.NewGuid());
112 }
113 }
114} \ No newline at end of file
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index acd1425..27e74ca 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Net; 30using System.Net;
31using libsecondlife; 31using OpenMetaverse;
32using libsecondlife.Packets; 32using OpenMetaverse.Packets;
33 33
34namespace OpenSim.Framework 34namespace OpenSim.Framework
35{ 35{
@@ -76,11 +76,13 @@ namespace OpenSim.Framework
76 ushort id; 76 ushort id;
77 PacketFrequency freq; 77 PacketFrequency freq;
78 78
79 Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10);
80
81 if ((bytes[0] & Helpers.MSG_ZEROCODED) != 0) 79 if ((bytes[0] & Helpers.MSG_ZEROCODED) != 0)
82 { 80 {
83 Helpers.ZeroDecodeCommand(bytes, decoded_header); 81 Helpers.ZeroDecode(bytes, 16, decoded_header);
82 }
83 else
84 {
85 Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10);
84 } 86 }
85 87
86 if (decoded_header[6] == 0xFF) 88 if (decoded_header[6] == 0xFF)
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index cabce1b..366552f 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Framework
342 } 342 }
343 343
344 /// <summary> 344 /// <summary>
345 /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.xml 345 /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.Xml
346 /// </summary> 346 /// </summary>
347 public class PluginProviderFilter : IPluginFilter 347 public class PluginProviderFilter : IPluginFilter
348 { 348 {
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index f244b51..56e566b 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Xml.Serialization; 30using System.Xml.Serialization;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33 33
34namespace OpenSim.Framework 34namespace OpenSim.Framework
@@ -74,7 +74,7 @@ namespace OpenSim.Framework
74 { 74 {
75 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 75 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
76 76
77 private static readonly LLObject.TextureEntry m_defaultTexture; 77 private static readonly Primitive.TextureEntry m_defaultTexture;
78 78
79 private byte[] m_textureEntry; 79 private byte[] m_textureEntry;
80 80
@@ -96,13 +96,13 @@ namespace OpenSim.Framework
96 private ushort _profileBegin; 96 private ushort _profileBegin;
97 private ushort _profileEnd; 97 private ushort _profileEnd;
98 private ushort _profileHollow; 98 private ushort _profileHollow;
99 private LLVector3 _scale; 99 private Vector3 _scale;
100 private byte _state; 100 private byte _state;
101 private ProfileShape _profileShape; 101 private ProfileShape _profileShape;
102 private HollowShape _hollowShape; 102 private HollowShape _hollowShape;
103 103
104 // Sculpted 104 // Sculpted
105 [XmlIgnore] private LLUUID _sculptTexture = LLUUID.Zero; 105 [XmlIgnore] private UUID _sculptTexture = UUID.Zero;
106 [XmlIgnore] private byte _sculptType = (byte)0; 106 [XmlIgnore] private byte _sculptType = (byte)0;
107 [XmlIgnore] private byte[] _sculptData = new byte[0]; 107 [XmlIgnore] private byte[] _sculptData = new byte[0];
108 108
@@ -172,7 +172,7 @@ namespace OpenSim.Framework
172 static PrimitiveBaseShape() 172 static PrimitiveBaseShape()
173 { 173 {
174 m_defaultTexture = 174 m_defaultTexture =
175 new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f")); 175 new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f"));
176 } 176 }
177 177
178 public PrimitiveBaseShape() 178 public PrimitiveBaseShape()
@@ -183,12 +183,12 @@ namespace OpenSim.Framework
183 } 183 }
184 184
185 [XmlIgnore] 185 [XmlIgnore]
186 public LLObject.TextureEntry Textures 186 public Primitive.TextureEntry Textures
187 { 187 {
188 get 188 get
189 { 189 {
190 //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length); 190 //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
191 return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); 191 return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length);
192 } 192 }
193 193
194 set { m_textureEntry = value.ToBytes(); } 194 set { m_textureEntry = value.ToBytes(); }
@@ -252,7 +252,7 @@ namespace OpenSim.Framework
252 252
253 public void SetScale(float side) 253 public void SetScale(float side)
254 { 254 {
255 _scale = new LLVector3(side, side, side); 255 _scale = new Vector3(side, side, side);
256 } 256 }
257 257
258 public void SetHeigth(float heigth) 258 public void SetHeigth(float heigth)
@@ -285,22 +285,22 @@ namespace OpenSim.Framework
285 return shape; 285 return shape;
286 } 286 }
287 287
288 public void SetPathRange(LLVector3 pathRange) 288 public void SetPathRange(Vector3 pathRange)
289 { 289 {
290 _pathBegin = LLObject.PackBeginCut(pathRange.X); 290 _pathBegin = Primitive.PackBeginCut(pathRange.X);
291 _pathEnd = LLObject.PackEndCut(pathRange.Y); 291 _pathEnd = Primitive.PackEndCut(pathRange.Y);
292 } 292 }
293 293
294 public void SetSculptData(byte sculptType, LLUUID SculptTextureUUID) 294 public void SetSculptData(byte sculptType, UUID SculptTextureUUID)
295 { 295 {
296 _sculptType = sculptType; 296 _sculptType = sculptType;
297 _sculptTexture = SculptTextureUUID; 297 _sculptTexture = SculptTextureUUID;
298 } 298 }
299 299
300 public void SetProfileRange(LLVector3 profileRange) 300 public void SetProfileRange(Vector3 profileRange)
301 { 301 {
302 _profileBegin = LLObject.PackBeginCut(profileRange.X); 302 _profileBegin = Primitive.PackBeginCut(profileRange.X);
303 _profileEnd = LLObject.PackEndCut(profileRange.Y); 303 _profileEnd = Primitive.PackEndCut(profileRange.Y);
304 } 304 }
305 305
306 public byte[] ExtraParams 306 public byte[] ExtraParams
@@ -477,7 +477,7 @@ namespace OpenSim.Framework
477 } 477 }
478 } 478 }
479 479
480 public LLVector3 Scale { 480 public Vector3 Scale {
481 get { 481 get {
482 return _scale; 482 return _scale;
483 } 483 }
@@ -513,7 +513,7 @@ namespace OpenSim.Framework
513 } 513 }
514 } 514 }
515 515
516 public LLUUID SculptTexture { 516 public UUID SculptTexture {
517 get { 517 get {
518 return _sculptTexture; 518 return _sculptTexture;
519 } 519 }
@@ -904,7 +904,7 @@ namespace OpenSim.Framework
904 public void ReadSculptData(byte[] data, int pos) 904 public void ReadSculptData(byte[] data, int pos)
905 { 905 {
906 byte[] SculptTextureUUID = new byte[16]; 906 byte[] SculptTextureUUID = new byte[16];
907 LLUUID SculptUUID = LLUUID.Zero; 907 UUID SculptUUID = UUID.Zero;
908 byte SculptTypel = data[16+pos]; 908 byte SculptTypel = data[16+pos];
909 909
910 if (data.Length+pos >= 17) 910 if (data.Length+pos >= 17)
@@ -913,12 +913,12 @@ namespace OpenSim.Framework
913 SculptTextureUUID = new byte[16]; 913 SculptTextureUUID = new byte[16];
914 SculptTypel = data[16 + pos]; 914 SculptTypel = data[16 + pos];
915 Array.Copy(data, pos, SculptTextureUUID,0, 16); 915 Array.Copy(data, pos, SculptTextureUUID,0, 16);
916 SculptUUID = new LLUUID(SculptTextureUUID, 0); 916 SculptUUID = new UUID(SculptTextureUUID, 0);
917 } 917 }
918 else 918 else
919 { 919 {
920 _sculptEntry = false; 920 _sculptEntry = false;
921 SculptUUID = LLUUID.Zero; 921 SculptUUID = UUID.Zero;
922 SculptTypel = 0x00; 922 SculptTypel = 0x00;
923 } 923 }
924 924
@@ -953,7 +953,7 @@ namespace OpenSim.Framework
953 _flexiDrag = (float)(data[pos++] & 0x7F) / 10.0f; 953 _flexiDrag = (float)(data[pos++] & 0x7F) / 10.0f;
954 _flexiGravity = (float)(data[pos++] / 10.0f) - 10.0f; 954 _flexiGravity = (float)(data[pos++] / 10.0f) - 10.0f;
955 _flexiWind = (float)data[pos++] / 10.0f; 955 _flexiWind = (float)data[pos++] / 10.0f;
956 LLVector3 lForce = new LLVector3(data, pos); 956 Vector3 lForce = new Vector3(data, pos);
957 _flexiForceX = lForce.X; 957 _flexiForceX = lForce.X;
958 _flexiForceY = lForce.Y; 958 _flexiForceY = lForce.Y;
959 _flexiForceZ = lForce.Z; 959 _flexiForceZ = lForce.Z;
@@ -986,7 +986,7 @@ namespace OpenSim.Framework
986 data[i++] |= (byte)((byte)(_flexiDrag * 10.01f) & 0x7F); 986 data[i++] |= (byte)((byte)(_flexiDrag * 10.01f) & 0x7F);
987 data[i++] = (byte)((_flexiGravity + 10.0f) * 10.01f); 987 data[i++] = (byte)((_flexiGravity + 10.0f) * 10.01f);
988 data[i++] = (byte)(_flexiWind * 10.01f); 988 data[i++] = (byte)(_flexiWind * 10.01f);
989 LLVector3 lForce = new LLVector3(_flexiForceX, _flexiForceY, _flexiForceZ); 989 Vector3 lForce = new Vector3(_flexiForceX, _flexiForceY, _flexiForceZ);
990 lForce.GetBytes().CopyTo(data, i); 990 lForce.GetBytes().CopyTo(data, i);
991 991
992 return data; 992 return data;
@@ -997,7 +997,7 @@ namespace OpenSim.Framework
997 if (data.Length - pos >= 16) 997 if (data.Length - pos >= 16)
998 { 998 {
999 _lightEntry = true; 999 _lightEntry = true;
1000 LLColor lColor = new LLColor(data, pos, false); 1000 Color4 lColor = new Color4(data, pos, false);
1001 _lightIntensity = lColor.A; 1001 _lightIntensity = lColor.A;
1002 _lightColorA = 1f; 1002 _lightColorA = 1f;
1003 _lightColorR = lColor.R; 1003 _lightColorR = lColor.R;
@@ -1027,7 +1027,7 @@ namespace OpenSim.Framework
1027 byte[] data = new byte[16]; 1027 byte[] data = new byte[16];
1028 1028
1029 // Alpha channel in color is intensity 1029 // Alpha channel in color is intensity
1030 LLColor tmpColor = new LLColor(_lightColorR,_lightColorG,_lightColorB,_lightIntensity); 1030 Color4 tmpColor = new Color4(_lightColorR,_lightColorG,_lightColorB,_lightIntensity);
1031 1031
1032 tmpColor.GetBytes().CopyTo(data, 0); 1032 tmpColor.GetBytes().CopyTo(data, 0);
1033 Helpers.FloatToBytes(_lightRadius).CopyTo(data, 4); 1033 Helpers.FloatToBytes(_lightRadius).CopyTo(data, 4);
diff --git a/OpenSim/Framework/ProxyCodec.cs b/OpenSim/Framework/ProxyCodec.cs
index cdba93d..9121bed 100644
--- a/OpenSim/Framework/ProxyCodec.cs
+++ b/OpenSim/Framework/ProxyCodec.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Net; 30using System.Net;
31using libsecondlife; 31using OpenMetaverse;
32using libsecondlife.Packets; 32using OpenMetaverse.Packets;
33 33
34namespace OpenSim.Framework 34namespace OpenSim.Framework
35{ 35{
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 2d0be15..5d3c2fe 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using OpenMetaverse;
31 31
32namespace OpenSim.Framework 32namespace OpenSim.Framework
33{ 33{
@@ -84,7 +84,7 @@ namespace OpenSim.Framework
84 } 84 }
85 85
86 // From User Server 86 // From User Server
87 public virtual void TriggerLogOffUser(ulong regionHandle, LLUUID agentID, LLUUID RegionSecret, string message) 87 public virtual void TriggerLogOffUser(ulong regionHandle, UUID agentID, UUID RegionSecret, string message)
88 { 88 {
89 handlerLogOffUser = OnLogOffUser; 89 handlerLogOffUser = OnLogOffUser;
90 if (handlerLogOffUser != null) 90 if (handlerLogOffUser != null)
@@ -95,7 +95,7 @@ namespace OpenSim.Framework
95 } 95 }
96 96
97 97
98 public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) 98 public virtual bool TriggerExpectPrim(ulong regionHandle, UUID primID, string objData, int XMLMethod)
99 { 99 {
100 handlerExpectPrim = OnExpectPrim; 100 handlerExpectPrim = OnExpectPrim;
101 if (handlerExpectPrim != null) 101 if (handlerExpectPrim != null)
@@ -128,7 +128,7 @@ namespace OpenSim.Framework
128 return false; 128 return false;
129 } 129 }
130 130
131 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, 131 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position,
132 bool isFlying) 132 bool isFlying)
133 { 133 {
134 handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion; 134 handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion;
@@ -140,7 +140,7 @@ namespace OpenSim.Framework
140 return false; 140 return false;
141 } 141 }
142 142
143 public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, 143 public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position,
144 bool isPhysical) 144 bool isPhysical)
145 { 145 {
146 handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion; 146 handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion;
@@ -152,7 +152,7 @@ namespace OpenSim.Framework
152 return false; 152 return false;
153 } 153 }
154 154
155 public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID) 155 public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, UUID agentID)
156 { 156 {
157 handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed; 157 handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed;
158 if (handlerAcknowledgeAgentCrossed != null) 158 if (handlerAcknowledgeAgentCrossed != null)
@@ -163,7 +163,7 @@ namespace OpenSim.Framework
163 return false; 163 return false;
164 } 164 }
165 165
166 public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) 166 public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, UUID primID)
167 { 167 {
168 handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed; 168 handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed;
169 if (handlerAcknowledgePrimCrossed != null) 169 if (handlerAcknowledgePrimCrossed != null)
@@ -174,7 +174,7 @@ namespace OpenSim.Framework
174 return false; 174 return false;
175 } 175 }
176 176
177 public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID) 177 public virtual bool TriggerCloseAgentConnection(ulong regionHandle, UUID agentID)
178 { 178 {
179 handlerCloseAgentConnection = OnCloseAgentConnection; 179 handlerCloseAgentConnection = OnCloseAgentConnection;
180 if (handlerCloseAgentConnection != null) 180 if (handlerCloseAgentConnection != null)
@@ -220,7 +220,7 @@ namespace OpenSim.Framework
220 return false; 220 return false;
221 } 221 }
222 222
223 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 223 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, UUID agentID)
224 { 224 {
225 handlerCloseAgentConnection = OnCloseAgentConnection; 225 handlerCloseAgentConnection = OnCloseAgentConnection;
226 if (handlerCloseAgentConnection != null) 226 if (handlerCloseAgentConnection != null)
diff --git a/OpenSim/Framework/RegionHandshakeArgs.cs b/OpenSim/Framework/RegionHandshakeArgs.cs
index 5e483f3..695c726 100644
--- a/OpenSim/Framework/RegionHandshakeArgs.cs
+++ b/OpenSim/Framework/RegionHandshakeArgs.cs
@@ -1,5 +1,5 @@
1using System; 1using System;
2using libsecondlife; 2using OpenMetaverse;
3 3
4namespace OpenSim.Framework 4namespace OpenSim.Framework
5{ 5{
@@ -19,14 +19,14 @@ namespace OpenSim.Framework
19 public float waterHeight; 19 public float waterHeight;
20 public uint regionFlags; 20 public uint regionFlags;
21 public string regionName; 21 public string regionName;
22 public LLUUID SimOwner; 22 public UUID SimOwner;
23 public LLUUID terrainBase0; 23 public UUID terrainBase0;
24 public LLUUID terrainBase1; 24 public UUID terrainBase1;
25 public LLUUID terrainBase2; 25 public UUID terrainBase2;
26 public LLUUID terrainBase3; 26 public UUID terrainBase3;
27 public LLUUID terrainDetail0; 27 public UUID terrainDetail0;
28 public LLUUID terrainDetail1; 28 public UUID terrainDetail1;
29 public LLUUID terrainDetail2; 29 public UUID terrainDetail2;
30 public LLUUID terrainDetail3; 30 public UUID terrainDetail3;
31 } 31 }
32} \ No newline at end of file 32}
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 9b12662..925c5be 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Net.Sockets; 31using System.Net.Sockets;
32using System.Xml; 32using System.Xml;
33using libsecondlife; 33using OpenMetaverse;
34using Nini.Config; 34using Nini.Config;
35 35
36namespace OpenSim.Framework 36namespace OpenSim.Framework
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
69 protected uint? m_regionLocX; 69 protected uint? m_regionLocX;
70 protected uint? m_regionLocY; 70 protected uint? m_regionLocY;
71 protected uint m_remotingPort; 71 protected uint m_remotingPort;
72 public LLUUID RegionID = LLUUID.Zero; 72 public UUID RegionID = UUID.Zero;
73 public string RemotingAddress; 73 public string RemotingAddress;
74 74
75 public SimpleRegionInfo() 75 public SimpleRegionInfo()
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
105 m_httpPort = ConvertFrom.HttpPort; 105 m_httpPort = ConvertFrom.HttpPort;
106 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 106 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
107 RemotingAddress = ConvertFrom.RemotingAddress; 107 RemotingAddress = ConvertFrom.RemotingAddress;
108 RegionID = LLUUID.Zero; 108 RegionID = UUID.Zero;
109 ServerURI = ConvertFrom.ServerURI; 109 ServerURI = ConvertFrom.ServerURI;
110 } 110 }
111 111
@@ -202,16 +202,16 @@ namespace OpenSim.Framework
202 202
203// public bool m_allow_alternate_ports; 203// public bool m_allow_alternate_ports;
204 204
205 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; 205 public UUID MasterAvatarAssignedUUID = UUID.Zero;
206 public string MasterAvatarFirstName = String.Empty; 206 public string MasterAvatarFirstName = String.Empty;
207 public string MasterAvatarLastName = String.Empty; 207 public string MasterAvatarLastName = String.Empty;
208 public string MasterAvatarSandboxPassword = String.Empty; 208 public string MasterAvatarSandboxPassword = String.Empty;
209 public LLUUID originRegionID = LLUUID.Zero; 209 public UUID originRegionID = UUID.Zero;
210 public string proxyUrl = ""; 210 public string proxyUrl = "";
211 public string RegionName = String.Empty; 211 public string RegionName = String.Empty;
212 public string regionSecret = LLUUID.Random().ToString(); 212 public string regionSecret = UUID.Random().ToString();
213 213
214 public LLUUID lastMapUUID = LLUUID.Zero; 214 public UUID lastMapUUID = UUID.Zero;
215 public string lastMapRefresh = "0"; 215 public string lastMapRefresh = "0";
216 216
217 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 217 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
@@ -248,7 +248,7 @@ namespace OpenSim.Framework
248 m_remotingPort = ConvertFrom.RemotingPort; 248 m_remotingPort = ConvertFrom.RemotingPort;
249 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 249 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
250 RemotingAddress = ConvertFrom.RemotingAddress; 250 RemotingAddress = ConvertFrom.RemotingAddress;
251 RegionID = LLUUID.Zero; 251 RegionID = UUID.Zero;
252 proxyUrl = ConvertFrom.ProxyUrl; 252 proxyUrl = ConvertFrom.ProxyUrl;
253 originRegionID = ConvertFrom.OriginRegionID; 253 originRegionID = ConvertFrom.OriginRegionID;
254 RegionName = ConvertFrom.RegionName; 254 RegionName = ConvertFrom.RegionName;
@@ -264,7 +264,7 @@ namespace OpenSim.Framework
264 m_remotingPort = ConvertFrom.RemotingPort; 264 m_remotingPort = ConvertFrom.RemotingPort;
265 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 265 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
266 RemotingAddress = ConvertFrom.RemotingAddress; 266 RemotingAddress = ConvertFrom.RemotingAddress;
267 RegionID = LLUUID.Zero; 267 RegionID = UUID.Zero;
268 ServerURI = ConvertFrom.ServerURI; 268 ServerURI = ConvertFrom.ServerURI;
269 } 269 }
270 270
@@ -315,7 +315,7 @@ namespace OpenSim.Framework
315 public void LoadFromNiniSource(IConfigSource source, string sectionName) 315 public void LoadFromNiniSource(IConfigSource source, string sectionName)
316 { 316 {
317 string errorMessage = String.Empty; 317 string errorMessage = String.Empty;
318 RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString())); 318 RegionID = new UUID(source.Configs[sectionName].GetString("Region_ID", UUID.Random().ToString()));
319 RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); 319 RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
320 m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); 320 m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
321 m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000")); 321 m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000"));
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
368 368
369 public void loadConfigurationOptionsFromMe() 369 public void loadConfigurationOptionsFromMe()
370 { 370 {
371 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID_NULL_FREE, 371 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_UUID_NULL_FREE,
372 "UUID of Region (Default is recommended, random UUID)", 372 "UUID of Region (Default is recommended, random UUID)",
373 RegionID.ToString(), true); 373 RegionID.ToString(), true);
374 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 374 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -393,7 +393,7 @@ namespace OpenSim.Framework
393 configMember.addConfigurationOption("external_host_name", 393 configMember.addConfigurationOption("external_host_name",
394 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 394 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
395 "External Host Name", m_externalHostName, true); 395 "External Host Name", m_externalHostName, true);
396 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 396 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
397 "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true); 397 "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true);
398 configMember.addConfigurationOption("master_avatar_first", 398 configMember.addConfigurationOption("master_avatar_first",
399 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 399 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -404,7 +404,7 @@ namespace OpenSim.Framework
404 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 404 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
405 "(Sandbox Mode Only)Password for Master Avatar account", 405 "(Sandbox Mode Only)Password for Master Avatar account",
406 MasterAvatarSandboxPassword, true); 406 MasterAvatarSandboxPassword, true);
407 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 407 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
408 "Last Map UUID", lastMapUUID.ToString(), true); 408 "Last Map UUID", lastMapUUID.ToString(), true);
409 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 409 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
410 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); 410 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
@@ -413,9 +413,9 @@ namespace OpenSim.Framework
413 413
414 public void loadConfigurationOptions() 414 public void loadConfigurationOptions()
415 { 415 {
416 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 416 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
417 "UUID of Region (Default is recommended, random UUID)", 417 "UUID of Region (Default is recommended, random UUID)",
418 LLUUID.Random().ToString(), true); 418 UUID.Random().ToString(), true);
419 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 419 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
420 "Region Name", "OpenSim Test", false); 420 "Region Name", "OpenSim Test", false);
421 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 421 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
@@ -436,8 +436,8 @@ namespace OpenSim.Framework
436 configMember.addConfigurationOption("external_host_name", 436 configMember.addConfigurationOption("external_host_name",
437 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 437 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
438 "External Host Name", "127.0.0.1", false); 438 "External Host Name", "127.0.0.1", false);
439 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 439 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
440 "Master Avatar UUID", LLUUID.Zero.ToString(), true); 440 "Master Avatar UUID", UUID.Zero.ToString(), true);
441 configMember.addConfigurationOption("master_avatar_first", 441 configMember.addConfigurationOption("master_avatar_first",
442 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 442 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
443 "First Name of Master Avatar", "Test", false, 443 "First Name of Master Avatar", "Test", false,
@@ -452,7 +452,7 @@ namespace OpenSim.Framework
452 "(Sandbox Mode Only)Password for Master Avatar account", "test", false, 452 "(Sandbox Mode Only)Password for Master Avatar account", "test", false,
453 (ConfigurationOption.ConfigurationOptionShouldBeAsked) 453 (ConfigurationOption.ConfigurationOptionShouldBeAsked)
454 shouldMasterAvatarDetailsBeAsked); 454 shouldMasterAvatarDetailsBeAsked);
455 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 455 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
456 "Last Map UUID", lastMapUUID.ToString(), true); 456 "Last Map UUID", lastMapUUID.ToString(), true);
457 457
458 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 458 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -461,7 +461,7 @@ namespace OpenSim.Framework
461 461
462 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) 462 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
463 { 463 {
464 return MasterAvatarAssignedUUID == LLUUID.Zero; 464 return MasterAvatarAssignedUUID == UUID.Zero;
465 } 465 }
466 466
467 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 467 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -469,8 +469,8 @@ namespace OpenSim.Framework
469 switch (configuration_key) 469 switch (configuration_key)
470 { 470 {
471 case "sim_UUID": 471 case "sim_UUID":
472 RegionID = (LLUUID) configuration_result; 472 RegionID = (UUID) configuration_result;
473 originRegionID = (LLUUID) configuration_result; 473 originRegionID = (UUID) configuration_result;
474 break; 474 break;
475 case "sim_name": 475 case "sim_name":
476 RegionName = (string) configuration_result; 476 RegionName = (string) configuration_result;
@@ -505,7 +505,7 @@ namespace OpenSim.Framework
505 } 505 }
506 break; 506 break;
507 case "master_avatar_uuid": 507 case "master_avatar_uuid":
508 MasterAvatarAssignedUUID = (LLUUID) configuration_result; 508 MasterAvatarAssignedUUID = (UUID) configuration_result;
509 break; 509 break;
510 case "master_avatar_first": 510 case "master_avatar_first":
511 MasterAvatarFirstName = (string) configuration_result; 511 MasterAvatarFirstName = (string) configuration_result;
@@ -518,7 +518,7 @@ namespace OpenSim.Framework
518 MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); 518 MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
519 break; 519 break;
520 case "lastmap_uuid": 520 case "lastmap_uuid":
521 lastMapUUID = (LLUUID)configuration_result; 521 lastMapUUID = (UUID)configuration_result;
522 break; 522 break;
523 case "lastmap_refresh": 523 case "lastmap_refresh":
524 lastMapRefresh = (string)configuration_result; 524 lastMapRefresh = (string)configuration_result;
@@ -528,7 +528,7 @@ namespace OpenSim.Framework
528 return true; 528 return true;
529 } 529 }
530 530
531 public void SaveLastMapUUID(LLUUID mapUUID) 531 public void SaveLastMapUUID(UUID mapUUID)
532 { 532 {
533 if (null == configMember) return; 533 if (null == configMember) return;
534 534
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index a371851..c7d317f 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -59,12 +59,12 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
59 Directory.CreateDirectory(regionConfigPath); 59 Directory.CreateDirectory(regionConfigPath);
60 } 60 }
61 61
62 string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); 62 string[] configFiles = Directory.GetFiles(regionConfigPath, "*.Xml");
63 63
64 if (configFiles.Length == 0) 64 if (configFiles.Length == 0)
65 { 65 {
66 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"), false); 66 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.Xml"), false);
67 configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); 67 configFiles = Directory.GetFiles(regionConfigPath, "*.Xml");
68 } 68 }
69 69
70 RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; 70 RegionInfo[] regionInfos = new RegionInfo[configFiles.Length];
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index e0a60e6..525a3f0 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33 33
34namespace OpenSim.Framework 34namespace OpenSim.Framework
@@ -45,7 +45,7 @@ namespace OpenSim.Framework
45 { 45 {
46 if (configMember == null) 46 if (configMember == null)
47 { 47 {
48 configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); 48 configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.Xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true);
49 configMember.performConfigurationRetrieve(); 49 configMember.performConfigurationRetrieve();
50 } 50 }
51 } 51 }
@@ -69,19 +69,19 @@ namespace OpenSim.Framework
69 String.Empty, "21", true); 69 String.Empty, "21", true);
70 70
71 configMember.addConfigurationOption("terrain_base_0", 71 configMember.addConfigurationOption("terrain_base_0",
72 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 72 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
73 String.Empty, "b8d3965a-ad78-bf43-699b-bff8eca6c975",true); 73 String.Empty, "b8d3965a-ad78-bf43-699b-bff8eca6c975",true);
74 74
75 configMember.addConfigurationOption("terrain_base_1", 75 configMember.addConfigurationOption("terrain_base_1",
76 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 76 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
77 String.Empty, "abb783e6-3e93-26c0-248a-247666855da3",true); 77 String.Empty, "abb783e6-3e93-26c0-248a-247666855da3",true);
78 78
79 configMember.addConfigurationOption("terrain_base_2", 79 configMember.addConfigurationOption("terrain_base_2",
80 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 80 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
81 String.Empty, "179cdabd-398a-9b6b-1391-4dc333ba321f",true); 81 String.Empty, "179cdabd-398a-9b6b-1391-4dc333ba321f",true);
82 82
83 configMember.addConfigurationOption("terrain_base_3", 83 configMember.addConfigurationOption("terrain_base_3",
84 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 84 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
85 String.Empty, "beb169c7-11ea-fff2-efe5-0f24dc881df2",true); 85 String.Empty, "beb169c7-11ea-fff2-efe5-0f24dc881df2",true);
86 86
87 configMember.addConfigurationOption("terrain_start_height_0", 87 configMember.addConfigurationOption("terrain_start_height_0",
@@ -179,16 +179,16 @@ namespace OpenSim.Framework
179 m_Maturity = 1; 179 m_Maturity = 1;
180 break; 180 break;
181 case "terrain_base_0": 181 case "terrain_base_0":
182 m_TerrainTexture1 = (LLUUID)value; 182 m_TerrainTexture1 = (UUID)value;
183 break; 183 break;
184 case "terrain_base_1": 184 case "terrain_base_1":
185 m_TerrainTexture2 = (LLUUID)value; 185 m_TerrainTexture2 = (UUID)value;
186 break; 186 break;
187 case "terrain_base_2": 187 case "terrain_base_2":
188 m_TerrainTexture3 = (LLUUID)value; 188 m_TerrainTexture3 = (UUID)value;
189 break; 189 break;
190 case "terrain_base_3": 190 case "terrain_base_3":
191 m_TerrainTexture4 = (LLUUID)value; 191 m_TerrainTexture4 = (UUID)value;
192 break; 192 break;
193 case "terrain_start_height_0": 193 case "terrain_start_height_0":
194 m_Elevation1SW = (double)value; 194 m_Elevation1SW = (double)value;
@@ -237,9 +237,9 @@ namespace OpenSim.Framework
237 OnSave(this); 237 OnSave(this);
238 } 238 }
239 239
240 private LLUUID m_RegionUUID = LLUUID.Zero; 240 private UUID m_RegionUUID = UUID.Zero;
241 241
242 public LLUUID RegionUUID 242 public UUID RegionUUID
243 { 243 {
244 get { return m_RegionUUID; } 244 get { return m_RegionUUID; }
245 set { m_RegionUUID = value; } 245 set { m_RegionUUID = value; }
@@ -349,57 +349,57 @@ namespace OpenSim.Framework
349 set { m_DisablePhysics = value; } 349 set { m_DisablePhysics = value; }
350 } 350 }
351 351
352 private LLUUID m_TerrainTexture1 = LLUUID.Zero; 352 private UUID m_TerrainTexture1 = UUID.Zero;
353 353
354 public LLUUID TerrainTexture1 354 public UUID TerrainTexture1
355 { 355 {
356 get { return m_TerrainTexture1; } 356 get { return m_TerrainTexture1; }
357 set 357 set
358 { 358 {
359 if (value == LLUUID.Zero) 359 if (value == UUID.Zero)
360 m_TerrainTexture1 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); 360 m_TerrainTexture1 = new UUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");
361 else 361 else
362 m_TerrainTexture1 = value; 362 m_TerrainTexture1 = value;
363 } 363 }
364 } 364 }
365 365
366 private LLUUID m_TerrainTexture2 = LLUUID.Zero; 366 private UUID m_TerrainTexture2 = UUID.Zero;
367 367
368 public LLUUID TerrainTexture2 368 public UUID TerrainTexture2
369 { 369 {
370 get { return m_TerrainTexture2; } 370 get { return m_TerrainTexture2; }
371 set 371 set
372 { 372 {
373 if (value == LLUUID.Zero) 373 if (value == UUID.Zero)
374 m_TerrainTexture2 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); 374 m_TerrainTexture2 = new UUID("abb783e6-3e93-26c0-248a-247666855da3");
375 else 375 else
376 m_TerrainTexture2 = value; 376 m_TerrainTexture2 = value;
377 } 377 }
378 } 378 }
379 379
380 private LLUUID m_TerrainTexture3 = LLUUID.Zero; 380 private UUID m_TerrainTexture3 = UUID.Zero;
381 381
382 public LLUUID TerrainTexture3 382 public UUID TerrainTexture3
383 { 383 {
384 get { return m_TerrainTexture3; } 384 get { return m_TerrainTexture3; }
385 set 385 set
386 { 386 {
387 if (value == LLUUID.Zero) 387 if (value == UUID.Zero)
388 m_TerrainTexture3 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); 388 m_TerrainTexture3 = new UUID("179cdabd-398a-9b6b-1391-4dc333ba321f");
389 else 389 else
390 m_TerrainTexture3 = value; 390 m_TerrainTexture3 = value;
391 } 391 }
392 } 392 }
393 393
394 private LLUUID m_TerrainTexture4 = LLUUID.Zero; 394 private UUID m_TerrainTexture4 = UUID.Zero;
395 395
396 public LLUUID TerrainTexture4 396 public UUID TerrainTexture4
397 { 397 {
398 get { return m_TerrainTexture4; } 398 get { return m_TerrainTexture4; }
399 set 399 set
400 { 400 {
401 if (value == LLUUID.Zero) 401 if (value == UUID.Zero)
402 m_TerrainTexture4 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); 402 m_TerrainTexture4 = new UUID("beb169c7-11ea-fff2-efe5-0f24dc881df2");
403 else 403 else
404 m_TerrainTexture4 = value; 404 m_TerrainTexture4 = value;
405 } 405 }
@@ -509,17 +509,17 @@ namespace OpenSim.Framework
509 set { m_Sandbox = value; } 509 set { m_Sandbox = value; }
510 } 510 }
511 511
512 private LLVector3 m_SunVector; 512 private Vector3 m_SunVector;
513 513
514 public LLVector3 SunVector 514 public Vector3 SunVector
515 { 515 {
516 get { return m_SunVector; } 516 get { return m_SunVector; }
517 set { m_SunVector = value; } 517 set { m_SunVector = value; }
518 } 518 }
519 519
520 private LLUUID m_TerrainImageID; 520 private UUID m_TerrainImageID;
521 521
522 public LLUUID TerrainImageID 522 public UUID TerrainImageID
523 { 523 {
524 get { return m_TerrainImageID; } 524 get { return m_TerrainImageID; }
525 set { m_TerrainImageID = value; } 525 set { m_TerrainImageID = value; }
@@ -541,9 +541,9 @@ namespace OpenSim.Framework
541 set { m_SunPosition = value; } 541 set { m_SunPosition = value; }
542 } 542 }
543 543
544 private LLUUID m_Covenant = LLUUID.Zero; 544 private UUID m_Covenant = UUID.Zero;
545 545
546 public LLUUID Covenant 546 public UUID Covenant
547 { 547 {
548 get { return m_Covenant; } 548 get { return m_Covenant; }
549 set { m_Covenant = value; } 549 set { m_Covenant = value; }
diff --git a/OpenSim/Framework/RequestAssetArgs.cs b/OpenSim/Framework/RequestAssetArgs.cs
index 9f64a5a..0595ffa 100644
--- a/OpenSim/Framework/RequestAssetArgs.cs
+++ b/OpenSim/Framework/RequestAssetArgs.cs
@@ -1,5 +1,5 @@
1using System; 1using System;
2using libsecondlife; 2using OpenMetaverse;
3 3
4namespace OpenSim.Framework 4namespace OpenSim.Framework
5{ 5{
@@ -8,6 +8,6 @@ namespace OpenSim.Framework
8 public int ChannelType; 8 public int ChannelType;
9 public float Priority; 9 public float Priority;
10 public int SourceType; 10 public int SourceType;
11 public LLUUID TransferID; 11 public UUID TransferID;
12 } 12 }
13} \ No newline at end of file 13}
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index 4965a43..2052470 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Net; 29using System.Net;
30using System.Net.Sockets; 30using System.Net.Sockets;
31using libsecondlife; 31using OpenMetaverse;
32 32
33namespace OpenSim.Framework 33namespace OpenSim.Framework
34{ 34{
@@ -47,14 +47,14 @@ namespace OpenSim.Framework
47 protected uint m_httpPort = 9000; 47 protected uint m_httpPort = 9000;
48 48
49 protected IPEndPoint m_internalEndPoint; 49 protected IPEndPoint m_internalEndPoint;
50 protected Guid m_originRegionID = LLUUID.Zero.UUID; 50 protected Guid m_originRegionID = UUID.Zero.Guid;
51 protected string m_proxyUrl; 51 protected string m_proxyUrl;
52 protected uint? m_regionLocX; 52 protected uint? m_regionLocX;
53 protected uint? m_regionLocY; 53 protected uint? m_regionLocY;
54 protected string m_regionName; 54 protected string m_regionName;
55 public uint m_remotingPort; 55 public uint m_remotingPort;
56 protected string m_serverURI; 56 protected string m_serverURI;
57 public Guid RegionID = LLUUID.Zero.UUID; 57 public Guid RegionID = UUID.Zero.Guid;
58 public string RemotingAddress; 58 public string RemotingAddress;
59 59
60 /// <summary> 60 /// <summary>
@@ -181,10 +181,10 @@ namespace OpenSim.Framework
181 set { m_proxyUrl = value; } 181 set { m_proxyUrl = value; }
182 } 182 }
183 183
184 public LLUUID OriginRegionID 184 public UUID OriginRegionID
185 { 185 {
186 get { return new LLUUID(m_originRegionID); } 186 get { return new UUID(m_originRegionID); }
187 set { m_originRegionID = value.UUID; } 187 set { m_originRegionID = value.Guid; }
188 } 188 }
189 189
190 public string RegionName 190 public string RegionName
@@ -199,4 +199,4 @@ namespace OpenSim.Framework
199 set { m_serverURI = value; } 199 set { m_serverURI = value; }
200 } 200 }
201 } 201 }
202} \ No newline at end of file 202}
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index d326b66..3787c38 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -35,7 +35,7 @@ using System.Reflection;
35using System.Text; 35using System.Text;
36using System.Threading; 36using System.Threading;
37using System.Xml; 37using System.Xml;
38using libsecondlife.StructuredData; 38using OpenMetaverse.StructuredData;
39using log4net; 39using log4net;
40using Nwc.XmlRpc; 40using Nwc.XmlRpc;
41 41
@@ -709,7 +709,7 @@ namespace OpenSim.Framework.Servers
709 // We'd like to put this into a text file parhaps that's easily editable. 709 // We'd like to put this into a text file parhaps that's easily editable.
710 // 710 //
711 // For this test to work, I used the following secondlife.exe parameters 711 // For this test to work, I used the following secondlife.exe parameters
712 // "C:\Program Files\SecondLifeWindLight\SecondLifeWindLight.exe" -settings settings_windlight.xml -channel "Second Life WindLight" -set SystemLanguage en-us -loginpage http://10.1.1.2:8002/?show_login_form=TRUE -loginuri http://10.1.1.2:8002 -user 10.1.1.2 712 // "C:\Program Files\SecondLifeWindLight\SecondLifeWindLight.exe" -settings settings_windlight.Xml -channel "Second Life WindLight" -set SystemLanguage en-us -loginpage http://10.1.1.2:8002/?show_login_form=TRUE -loginuri http://10.1.1.2:8002 -user 10.1.1.2
713 // 713 //
714 // Even after all that, there's still an error, but it's a start. 714 // Even after all that, there's still an error, but it's a start.
715 // 715 //
diff --git a/OpenSim/Framework/Servers/LLSDMethod.cs b/OpenSim/Framework/Servers/LLSDMethod.cs
index 7bb946e..6a39544 100644
--- a/OpenSim/Framework/Servers/LLSDMethod.cs
+++ b/OpenSim/Framework/Servers/LLSDMethod.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.StructuredData; 28using OpenMetaverse.StructuredData;
29 29
30namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
31{ 31{
diff --git a/OpenSim/Framework/Servers/LLSDMethodString.cs b/OpenSim/Framework/Servers/LLSDMethodString.cs
index 09736ba..e15b621 100644
--- a/OpenSim/Framework/Servers/LLSDMethodString.cs
+++ b/OpenSim/Framework/Servers/LLSDMethodString.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.StructuredData; 28using OpenMetaverse.StructuredData;
29 29
30namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
31{ 31{
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 58d5621..cc64ed6 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using OpenMetaverse;
32using libsecondlife.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework.Statistics.Interfaces; 33using OpenSim.Framework.Statistics.Interfaces;
34 34
35namespace OpenSim.Framework.Statistics 35namespace OpenSim.Framework.Statistics
@@ -122,8 +122,8 @@ namespace OpenSim.Framework.Statistics
122 /// <summary> 122 /// <summary>
123 /// Retain a dictionary of all packet queues stats reporters 123 /// Retain a dictionary of all packet queues stats reporters
124 /// </summary> 124 /// </summary>
125 private IDictionary<LLUUID, PacketQueueStatsCollector> packetQueueStatsCollectors 125 private IDictionary<UUID, PacketQueueStatsCollector> packetQueueStatsCollectors
126 = new Dictionary<LLUUID, PacketQueueStatsCollector>(); 126 = new Dictionary<UUID, PacketQueueStatsCollector>();
127 127
128 public void AddAbnormalClientThreadTermination() 128 public void AddAbnormalClientThreadTermination()
129 { 129 {
@@ -176,9 +176,9 @@ namespace OpenSim.Framework.Statistics
176 /// <summary> 176 /// <summary>
177 /// Register as a packet queue stats provider 177 /// Register as a packet queue stats provider
178 /// </summary> 178 /// </summary>
179 /// <param name="uuid">An agent LLUUID</param> 179 /// <param name="uuid">An agent UUID</param>
180 /// <param name="provider"></param> 180 /// <param name="provider"></param>
181 public void RegisterPacketQueueStatsProvider(LLUUID uuid, IPullStatsProvider provider) 181 public void RegisterPacketQueueStatsProvider(UUID uuid, IPullStatsProvider provider)
182 { 182 {
183 lock (packetQueueStatsCollectors) 183 lock (packetQueueStatsCollectors)
184 { 184 {
@@ -191,8 +191,8 @@ namespace OpenSim.Framework.Statistics
191 /// <summary> 191 /// <summary>
192 /// Deregister a packet queue stats provider 192 /// Deregister a packet queue stats provider
193 /// </summary> 193 /// </summary>
194 /// <param name="uuid">An agent LLUUID</param> 194 /// <param name="uuid">An agent UUID</param>
195 public void DeregisterPacketQueueStatsProvider(LLUUID uuid) 195 public void DeregisterPacketQueueStatsProvider(UUID uuid)
196 { 196 {
197 lock (packetQueueStatsCollectors) 197 lock (packetQueueStatsCollectors)
198 { 198 {
@@ -302,7 +302,7 @@ Asset service request failures: {5}"+ Environment.NewLine,
302 "Send", "In", "Out", "Resend", "Land", "Wind", "Cloud", "Task", "Texture", "Asset")); 302 "Send", "In", "Out", "Resend", "Land", "Wind", "Cloud", "Task", "Texture", "Asset"));
303 sb.Append(Environment.NewLine); 303 sb.Append(Environment.NewLine);
304 304
305 foreach (LLUUID key in packetQueueStatsCollectors.Keys) 305 foreach (UUID key in packetQueueStatsCollectors.Keys)
306 { 306 {
307 sb.Append(string.Format("{0}: ", key)); 307 sb.Append(string.Format("{0}: ", key));
308 sb.Append(packetQueueStatsCollectors[key].Report()); 308 sb.Append(packetQueueStatsCollectors[key].Report());
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index fc84041..60b22db 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -31,7 +31,7 @@ using System.Reflection;
31using System.Xml; 31using System.Xml;
32using System.Xml.Schema; 32using System.Xml.Schema;
33using System.Xml.Serialization; 33using System.Xml.Serialization;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36 36
37namespace OpenSim.Framework 37namespace OpenSim.Framework
@@ -41,7 +41,7 @@ namespace OpenSim.Framework
41 /// 41 ///
42 /// This class is not thread safe. Callers must synchronize on Dictionary methods. 42 /// This class is not thread safe. Callers must synchronize on Dictionary methods.
43 /// </summary> 43 /// </summary>
44 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>, 44 public class TaskInventoryDictionary : Dictionary<UUID, TaskInventoryItem>,
45 ICloneable, IXmlSerializable 45 ICloneable, IXmlSerializable
46 { 46 {
47 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -56,7 +56,7 @@ namespace OpenSim.Framework
56 56
57 lock (this) 57 lock (this)
58 { 58 {
59 foreach (LLUUID uuid in Keys) 59 foreach (UUID uuid in Keys)
60 { 60 {
61 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone()); 61 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
62 } 62 }
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
76 // at System.Xml.Serialization.TypeTranslator.GetTypeData (System.Type runtimeType, System.String xmlDataType) [0x001f6] in /build/buildd/mono-1.2.4/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs:217 76 // at System.Xml.Serialization.TypeTranslator.GetTypeData (System.Type runtimeType, System.String xmlDataType) [0x001f6] in /build/buildd/mono-1.2.4/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs:217
77 // ... 77 // ...
78// private static XmlSerializer tiiSerializer 78// private static XmlSerializer tiiSerializer
79// = new XmlSerializer(typeof(Dictionary<LLUUID, TaskInventoryItem>.ValueCollection)); 79// = new XmlSerializer(typeof(Dictionary<UUID, TaskInventoryItem>.ValueCollection));
80 80
81 // see IXmlSerializable 81 // see IXmlSerializable
82 82
@@ -203,31 +203,31 @@ namespace OpenSim.Framework
203 "gesture" 203 "gesture"
204 }; 204 };
205 205
206 private LLUUID _assetID = LLUUID.Zero; 206 private UUID _assetID = UUID.Zero;
207 207
208 private uint _baseMask = FULL_MASK_PERMISSIONS_GENERAL; 208 private uint _baseMask = FULL_MASK_PERMISSIONS_GENERAL;
209 private uint _creationDate = 0; 209 private uint _creationDate = 0;
210 private LLUUID _creatorID = LLUUID.Zero; 210 private UUID _creatorID = UUID.Zero;
211 private string _description = String.Empty; 211 private string _description = String.Empty;
212 private uint _everyoneMask = FULL_MASK_PERMISSIONS_GENERAL; 212 private uint _everyoneMask = FULL_MASK_PERMISSIONS_GENERAL;
213 private uint _flags = 0; 213 private uint _flags = 0;
214 private LLUUID _groupID = LLUUID.Zero; 214 private UUID _groupID = UUID.Zero;
215 private uint _groupMask = FULL_MASK_PERMISSIONS_GENERAL; 215 private uint _groupMask = FULL_MASK_PERMISSIONS_GENERAL;
216 216
217 private int _invType = 0; 217 private int _invType = 0;
218 private LLUUID _itemID = LLUUID.Zero; 218 private UUID _itemID = UUID.Zero;
219 private LLUUID _lastOwnerID = LLUUID.Zero; 219 private UUID _lastOwnerID = UUID.Zero;
220 private string _name = String.Empty; 220 private string _name = String.Empty;
221 private uint _nextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL; 221 private uint _nextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL;
222 private LLUUID _ownerID = LLUUID.Zero; 222 private UUID _ownerID = UUID.Zero;
223 private uint _ownerMask = FULL_MASK_PERMISSIONS_GENERAL; 223 private uint _ownerMask = FULL_MASK_PERMISSIONS_GENERAL;
224 private LLUUID _parentID = LLUUID.Zero; //parent folder id 224 private UUID _parentID = UUID.Zero; //parent folder id
225 private LLUUID _parentPartID = LLUUID.Zero; // SceneObjectPart this is inside 225 private UUID _parentPartID = UUID.Zero; // SceneObjectPart this is inside
226 private LLUUID _permsGranter; 226 private UUID _permsGranter;
227 private int _permsMask; 227 private int _permsMask;
228 private int _type = 0; 228 private int _type = 0;
229 229
230 public LLUUID AssetID { 230 public UUID AssetID {
231 get { 231 get {
232 return _assetID; 232 return _assetID;
233 } 233 }
@@ -254,7 +254,7 @@ namespace OpenSim.Framework
254 } 254 }
255 } 255 }
256 256
257 public LLUUID CreatorID { 257 public UUID CreatorID {
258 get { 258 get {
259 return _creatorID; 259 return _creatorID;
260 } 260 }
@@ -290,7 +290,7 @@ namespace OpenSim.Framework
290 } 290 }
291 } 291 }
292 292
293 public LLUUID GroupID { 293 public UUID GroupID {
294 get { 294 get {
295 return _groupID; 295 return _groupID;
296 } 296 }
@@ -317,7 +317,7 @@ namespace OpenSim.Framework
317 } 317 }
318 } 318 }
319 319
320 public LLUUID ItemID { 320 public UUID ItemID {
321 get { 321 get {
322 return _itemID; 322 return _itemID;
323 } 323 }
@@ -326,7 +326,7 @@ namespace OpenSim.Framework
326 } 326 }
327 } 327 }
328 328
329 public LLUUID LastOwnerID { 329 public UUID LastOwnerID {
330 get { 330 get {
331 return _lastOwnerID; 331 return _lastOwnerID;
332 } 332 }
@@ -353,7 +353,7 @@ namespace OpenSim.Framework
353 } 353 }
354 } 354 }
355 355
356 public LLUUID OwnerID { 356 public UUID OwnerID {
357 get { 357 get {
358 return _ownerID; 358 return _ownerID;
359 } 359 }
@@ -371,7 +371,7 @@ namespace OpenSim.Framework
371 } 371 }
372 } 372 }
373 373
374 public LLUUID ParentID { 374 public UUID ParentID {
375 get { 375 get {
376 return _parentID; 376 return _parentID;
377 } 377 }
@@ -380,7 +380,7 @@ namespace OpenSim.Framework
380 } 380 }
381 } 381 }
382 382
383 public LLUUID ParentPartID { 383 public UUID ParentPartID {
384 get { 384 get {
385 return _parentPartID; 385 return _parentPartID;
386 } 386 }
@@ -389,7 +389,7 @@ namespace OpenSim.Framework
389 } 389 }
390 } 390 }
391 391
392 public LLUUID PermsGranter { 392 public UUID PermsGranter {
393 get { 393 get {
394 return _permsGranter; 394 return _permsGranter;
395 } 395 }
@@ -428,12 +428,12 @@ namespace OpenSim.Framework
428 #endregion 428 #endregion
429 429
430 /// <summary> 430 /// <summary>
431 /// Reset the LLUUIDs for this item. 431 /// Reset the UUIDs for this item.
432 /// </summary> 432 /// </summary>
433 /// <param name="partID">The new part ID to which this item belongs</param> 433 /// <param name="partID">The new part ID to which this item belongs</param>
434 public void ResetIDs(LLUUID partID) 434 public void ResetIDs(UUID partID)
435 { 435 {
436 _itemID = LLUUID.Random(); 436 _itemID = UUID.Random();
437 _parentPartID = partID; 437 _parentPartID = partID;
438 } 438 }
439 } 439 }
diff --git a/OpenSim/Framework/TextureRequestArgs.cs b/OpenSim/Framework/TextureRequestArgs.cs
index fff1023..33971d6 100644
--- a/OpenSim/Framework/TextureRequestArgs.cs
+++ b/OpenSim/Framework/TextureRequestArgs.cs
@@ -1,5 +1,5 @@
1using System; 1using System;
2using libsecondlife; 2using OpenMetaverse;
3 3
4namespace OpenSim.Framework 4namespace OpenSim.Framework
5{ 5{
@@ -8,7 +8,7 @@ namespace OpenSim.Framework
8 private sbyte m_discardLevel; 8 private sbyte m_discardLevel;
9 private uint m_packetNumber; 9 private uint m_packetNumber;
10 private float m_priority; 10 private float m_priority;
11 protected LLUUID m_requestedAssetID; 11 protected UUID m_requestedAssetID;
12 12
13 public float Priority 13 public float Priority
14 { 14 {
@@ -37,10 +37,10 @@ namespace OpenSim.Framework
37 /// <summary> 37 /// <summary>
38 /// 38 ///
39 /// </summary> 39 /// </summary>
40 public LLUUID RequestedAssetID 40 public UUID RequestedAssetID
41 { 41 {
42 get { return m_requestedAssetID; } 42 get { return m_requestedAssetID; }
43 set { m_requestedAssetID = value; } 43 set { m_requestedAssetID = value; }
44 } 44 }
45 } 45 }
46} \ No newline at end of file 46}
diff --git a/OpenSim/Framework/UserAgentData.cs b/OpenSim/Framework/UserAgentData.cs
index 68f47ba..03a65c5 100644
--- a/OpenSim/Framework/UserAgentData.cs
+++ b/OpenSim/Framework/UserAgentData.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
@@ -58,12 +58,12 @@ namespace OpenSim.Framework
58 /// <summary> 58 /// <summary>
59 /// The position of the user within the region 59 /// The position of the user within the region
60 /// </summary> 60 /// </summary>
61 private LLVector3 currentPos; 61 private Vector3 currentPos;
62 62
63 /// <summary> 63 /// <summary>
64 /// Current region the user is logged into 64 /// Current region the user is logged into
65 /// </summary> 65 /// </summary>
66 private LLUUID currentRegion; 66 private UUID currentRegion;
67 67
68 /// <summary> 68 /// <summary>
69 /// A unix timestamp from when the user logged in 69 /// A unix timestamp from when the user logged in
@@ -78,25 +78,25 @@ namespace OpenSim.Framework
78 /// <summary> 78 /// <summary>
79 /// The region the user logged into initially 79 /// The region the user logged into initially
80 /// </summary> 80 /// </summary>
81 private LLUUID regionID; 81 private UUID regionID;
82 82
83 /// <summary> 83 /// <summary>
84 /// The "secure" session ID for the user 84 /// The "secure" session ID for the user
85 /// </summary> 85 /// </summary>
86 /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> 86 /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks>
87 private LLUUID secureSessionID; 87 private UUID secureSessionID;
88 88
89 /// <summary> 89 /// <summary>
90 /// The session ID for the user (also the agent ID) 90 /// The session ID for the user (also the agent ID)
91 /// </summary> 91 /// </summary>
92 private LLUUID sessionID; 92 private UUID sessionID;
93 93
94 /// <summary> 94 /// <summary>
95 /// The UUID of the users avatar (not the agent!) 95 /// The UUID of the users avatar (not the agent!)
96 /// </summary> 96 /// </summary>
97 private LLUUID UUID; 97 private UUID UUID;
98 98
99 public virtual LLUUID ProfileID 99 public virtual UUID ProfileID
100 { 100 {
101 get { return UUID; } 101 get { return UUID; }
102 set { UUID = value; } 102 set { UUID = value; }
@@ -120,19 +120,19 @@ namespace OpenSim.Framework
120 set { agentOnline = value; } 120 set { agentOnline = value; }
121 } 121 }
122 122
123 public virtual LLUUID SessionID 123 public virtual UUID SessionID
124 { 124 {
125 get { return sessionID; } 125 get { return sessionID; }
126 set { sessionID = value; } 126 set { sessionID = value; }
127 } 127 }
128 128
129 public virtual LLUUID SecureSessionID 129 public virtual UUID SecureSessionID
130 { 130 {
131 get { return secureSessionID; } 131 get { return secureSessionID; }
132 set { secureSessionID = value; } 132 set { secureSessionID = value; }
133 } 133 }
134 134
135 public virtual LLUUID InitialRegion 135 public virtual UUID InitialRegion
136 { 136 {
137 get { return regionID; } 137 get { return regionID; }
138 set { regionID = value; } 138 set { regionID = value; }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework
150 set { logoutTime = value; } 150 set { logoutTime = value; }
151 } 151 }
152 152
153 public virtual LLUUID Region 153 public virtual UUID Region
154 { 154 {
155 get { return currentRegion; } 155 get { return currentRegion; }
156 set { currentRegion = value; } 156 set { currentRegion = value; }
@@ -162,7 +162,7 @@ namespace OpenSim.Framework
162 set { currentHandle = value; } 162 set { currentHandle = value; }
163 } 163 }
164 164
165 public virtual LLVector3 Position 165 public virtual Vector3 Position
166 { 166 {
167 get { return currentPos; } 167 get { return currentPos; }
168 set { currentPos = value; } 168 set { currentPos = value; }
@@ -186,4 +186,4 @@ namespace OpenSim.Framework
186 set { currentPos.Z = value; } 186 set { currentPos.Z = value; }
187 } 187 }
188 } 188 }
189} \ No newline at end of file 189}
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 2d06148..bc93766 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
@@ -53,12 +53,12 @@ namespace OpenSim.Framework
53 /// <summary> 53 /// <summary>
54 /// The coordinates inside the region of the home location 54 /// The coordinates inside the region of the home location
55 /// </summary> 55 /// </summary>
56 private LLVector3 _homeLocation; 56 private Vector3 _homeLocation;
57 57
58 /// <summary> 58 /// <summary>
59 /// Where the user will be looking when they rez. 59 /// Where the user will be looking when they rez.
60 /// </summary> 60 /// </summary>
61 private LLVector3 _homeLookAt; 61 private Vector3 _homeLookAt;
62 62
63 private uint _homeRegionX; 63 private uint _homeRegionX;
64 private uint _homeRegionY; 64 private uint _homeRegionY;
@@ -66,7 +66,7 @@ namespace OpenSim.Framework
66 /// <summary> 66 /// <summary>
67 /// The ID value for this user 67 /// The ID value for this user
68 /// </summary> 68 /// </summary>
69 private LLUUID _id; 69 private UUID _id;
70 70
71 /// <summary> 71 /// <summary>
72 /// A UNIX Timestamp for the users last login date / time 72 /// A UNIX Timestamp for the users last login date / time
@@ -97,7 +97,7 @@ namespace OpenSim.Framework
97 /// <summary> 97 /// <summary>
98 /// The profile image for the users first life tab 98 /// The profile image for the users first life tab
99 /// </summary> 99 /// </summary>
100 private LLUUID _profileFirstImage; 100 private UUID _profileFirstImage;
101 101
102 /// <summary> 102 /// <summary>
103 /// The first life about text listed in a users profile 103 /// The first life about text listed in a users profile
@@ -107,14 +107,14 @@ namespace OpenSim.Framework
107 /// <summary> 107 /// <summary>
108 /// The profile image for an avatar stored on the asset server 108 /// The profile image for an avatar stored on the asset server
109 /// </summary> 109 /// </summary>
110 private LLUUID _profileImage; 110 private UUID _profileImage;
111 111
112 /// <summary> 112 /// <summary>
113 /// A uint mask containing the "I want to do" part of the users profile 113 /// A uint mask containing the "I want to do" part of the users profile
114 /// </summary> 114 /// </summary>
115 private uint _profileWantDoMask; // Profile window "I want to" mask 115 private uint _profileWantDoMask; // Profile window "I want to" mask
116 116
117 private LLUUID _rootInventoryFolderID; 117 private UUID _rootInventoryFolderID;
118 118
119 /// <summary> 119 /// <summary>
120 /// The second component of a users account name 120 /// The second component of a users account name
@@ -134,7 +134,7 @@ namespace OpenSim.Framework
134 /// <summary> 134 /// <summary>
135 /// The last used Web_login_key 135 /// The last used Web_login_key
136 /// </summary> 136 /// </summary>
137 private LLUUID _webLoginKey; 137 private UUID _webLoginKey;
138 138
139 // Data for estates and other goodies 139 // Data for estates and other goodies
140 // to get away from per-machine configs a little 140 // to get away from per-machine configs a little
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
142 private int _userFlags; 142 private int _userFlags;
143 private int _godLevel; 143 private int _godLevel;
144 private string _customType; 144 private string _customType;
145 private LLUUID _partner; 145 private UUID _partner;
146 146
147 /// <summary> 147 /// <summary>
148 /// The regionhandle of the users preferred home region. If 148 /// The regionhandle of the users preferred home region. If
@@ -159,26 +159,26 @@ namespace OpenSim.Framework
159 } 159 }
160 } 160 }
161 161
162 private LLUUID _homeRegionID; 162 private UUID _homeRegionID;
163 /// <summary> 163 /// <summary>
164 /// The regionID of the users home region. This is unique; 164 /// The regionID of the users home region. This is unique;
165 /// even if the position of the region changes within the 165 /// even if the position of the region changes within the
166 /// grid, this will refer to the same region. 166 /// grid, this will refer to the same region.
167 /// </summary> 167 /// </summary>
168 public LLUUID HomeRegionID 168 public UUID HomeRegionID
169 { 169 {
170 get { return _homeRegionID; } 170 get { return _homeRegionID; }
171 set { _homeRegionID = value; } 171 set { _homeRegionID = value; }
172 } 172 }
173 173
174 // Property wrappers 174 // Property wrappers
175 public virtual LLUUID ID 175 public virtual UUID ID
176 { 176 {
177 get { return _id; } 177 get { return _id; }
178 set { _id = value; } 178 set { _id = value; }
179 } 179 }
180 180
181 public virtual LLUUID WebLoginKey 181 public virtual UUID WebLoginKey
182 { 182 {
183 get { return _webLoginKey; } 183 get { return _webLoginKey; }
184 set { _webLoginKey = value; } 184 set { _webLoginKey = value; }
@@ -220,7 +220,7 @@ namespace OpenSim.Framework
220 set { _homeRegionY = value; } 220 set { _homeRegionY = value; }
221 } 221 }
222 222
223 public virtual LLVector3 HomeLocation 223 public virtual Vector3 HomeLocation
224 { 224 {
225 get { return _homeLocation; } 225 get { return _homeLocation; }
226 set { _homeLocation = value; } 226 set { _homeLocation = value; }
@@ -246,7 +246,7 @@ namespace OpenSim.Framework
246 } 246 }
247 247
248 248
249 public virtual LLVector3 HomeLookAt 249 public virtual Vector3 HomeLookAt
250 { 250 {
251 get { return _homeLookAt; } 251 get { return _homeLookAt; }
252 set { _homeLookAt = value; } 252 set { _homeLookAt = value; }
@@ -283,7 +283,7 @@ namespace OpenSim.Framework
283 set { _lastLogin = value; } 283 set { _lastLogin = value; }
284 } 284 }
285 285
286 public virtual LLUUID RootInventoryFolderID 286 public virtual UUID RootInventoryFolderID
287 { 287 {
288 get { return _rootInventoryFolderID; } 288 get { return _rootInventoryFolderID; }
289 set { _rootInventoryFolderID = value; } 289 set { _rootInventoryFolderID = value; }
@@ -325,13 +325,13 @@ namespace OpenSim.Framework
325 set { _profileFirstText = value; } 325 set { _profileFirstText = value; }
326 } 326 }
327 327
328 public virtual LLUUID Image 328 public virtual UUID Image
329 { 329 {
330 get { return _profileImage; } 330 get { return _profileImage; }
331 set { _profileImage = value; } 331 set { _profileImage = value; }
332 } 332 }
333 333
334 public virtual LLUUID FirstLifeImage 334 public virtual UUID FirstLifeImage
335 { 335 {
336 get { return _profileFirstImage; } 336 get { return _profileFirstImage; }
337 set { _profileFirstImage = value; } 337 set { _profileFirstImage = value; }
@@ -361,7 +361,7 @@ namespace OpenSim.Framework
361 set { _customType = value; } 361 set { _customType = value; }
362 } 362 }
363 363
364 public virtual LLUUID Partner 364 public virtual UUID Partner
365 { 365 {
366 get { return _partner; } 366 get { return _partner; }
367 set { _partner = value; } 367 set { _partner = value; }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 09bf029..d7dcf19 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -38,7 +38,7 @@ using System.Security.Cryptography;
38using System.Text; 38using System.Text;
39using System.Text.RegularExpressions; 39using System.Text.RegularExpressions;
40using System.Xml; 40using System.Xml;
41using libsecondlife; 41using OpenMetaverse;
42using log4net; 42using log4net;
43using Nini.Config; 43using Nini.Config;
44using Nwc.XmlRpc; 44using Nwc.XmlRpc;
@@ -67,7 +67,7 @@ namespace OpenSim.Framework
67 /// <param name="a">A 3d vector</param> 67 /// <param name="a">A 3d vector</param>
68 /// <param name="b">A 3d vector</param> 68 /// <param name="b">A 3d vector</param>
69 /// <returns>The distance between the two vectors</returns> 69 /// <returns>The distance between the two vectors</returns>
70 public static double GetDistanceTo(LLVector3 a, LLVector3 b) 70 public static double GetDistanceTo(Vector3 a, Vector3 b)
71 { 71 {
72 float dx = a.X - b.X; 72 float dx = a.X - b.X;
73 float dy = a.Y - b.Y; 73 float dy = a.Y - b.Y;
@@ -80,7 +80,7 @@ namespace OpenSim.Framework
80 /// </summary> 80 /// </summary>
81 /// <param name="a">A 3d vector</param> 81 /// <param name="a">A 3d vector</param>
82 /// <returns>The magnitude of the vector</returns> 82 /// <returns>The magnitude of the vector</returns>
83 public static double GetMagnitude(LLVector3 a) 83 public static double GetMagnitude(Vector3 a)
84 { 84 {
85 return Math.Sqrt((a.X * a.X) + (a.Y * a.Y) + (a.Z * a.Z)); 85 return Math.Sqrt((a.X * a.X) + (a.Y * a.Y) + (a.Z * a.Z));
86 } 86 }
@@ -91,20 +91,20 @@ namespace OpenSim.Framework
91 /// <param name="a">A 3d vector</param> 91 /// <param name="a">A 3d vector</param>
92 /// <returns>A new vector which is normalized form of the vector</returns> 92 /// <returns>A new vector which is normalized form of the vector</returns>
93 /// <remarks>The vector paramater cannot be <0,0,0></remarks> 93 /// <remarks>The vector paramater cannot be <0,0,0></remarks>
94 public static LLVector3 GetNormalizedVector(LLVector3 a) 94 public static Vector3 GetNormalizedVector(Vector3 a)
95 { 95 {
96 if (IsZeroVector(a)) 96 if (IsZeroVector(a))
97 throw new ArgumentException("Vector paramater cannot be a zero vector."); 97 throw new ArgumentException("Vector paramater cannot be a zero vector.");
98 98
99 float Mag = (float) GetMagnitude(a); 99 float Mag = (float) GetMagnitude(a);
100 return new LLVector3(a.X / Mag, a.Y / Mag, a.Z / Mag); 100 return new Vector3(a.X / Mag, a.Y / Mag, a.Z / Mag);
101 } 101 }
102 102
103 /// <summary> 103 /// <summary>
104 /// Returns if a vector is a zero vector (has all zero components) 104 /// Returns if a vector is a zero vector (has all zero components)
105 /// </summary> 105 /// </summary>
106 /// <returns></returns> 106 /// <returns></returns>
107 public static bool IsZeroVector(LLVector3 v) 107 public static bool IsZeroVector(Vector3 v)
108 { 108 {
109 if (v.X == 0 && v.Y == 0 && v.Z == 0) 109 if (v.X == 0 && v.Y == 0 && v.Z == 0)
110 { 110 {
@@ -268,7 +268,7 @@ namespace OpenSim.Framework
268 268
269 public static string GetRandomCapsPath() 269 public static string GetRandomCapsPath()
270 { 270 {
271 LLUUID caps = LLUUID.Random(); 271 UUID caps = UUID.Random();
272 string capsPath = caps.ToString(); 272 string capsPath = caps.ToString();
273 capsPath = capsPath.Remove(capsPath.Length - 4, 4); 273 capsPath = capsPath.Remove(capsPath.Length - 4, 4);
274 return capsPath; 274 return capsPath;
@@ -525,13 +525,13 @@ namespace OpenSim.Framework
525 } 525 }
526 526
527 /// <summary> 527 /// <summary>
528 /// Convert an LLUUID to a raw uuid string. Right now this is a string without hyphens. 528 /// Convert an UUID to a raw uuid string. Right now this is a string without hyphens.
529 /// </summary> 529 /// </summary>
530 /// <param name="lluuid"></param> 530 /// <param name="UUID"></param>
531 /// <returns></returns> 531 /// <returns></returns>
532 public static String ToRawUuidString(LLUUID lluuid) 532 public static String ToRawUuidString(UUID UUID)
533 { 533 {
534 return lluuid.UUID.ToString("n"); 534 return UUID.Guid.ToString("n");
535 } 535 }
536 536
537 public static string CleanString(string input) 537 public static string CleanString(string input)
@@ -728,16 +728,16 @@ namespace OpenSim.Framework
728 } 728 }
729 729
730 // used for RemoteParcelRequest (for "About Landmark") 730 // used for RemoteParcelRequest (for "About Landmark")
731 public static LLUUID BuildFakeParcelID(ulong regionHandle, uint x, uint y) { 731 public static UUID BuildFakeParcelID(ulong regionHandle, uint x, uint y) {
732 byte[] bytes = { 732 byte[] bytes = {
733 (byte)(regionHandle >> 56), (byte)(regionHandle >> 48), (byte)(regionHandle >> 40), (byte)(regionHandle >> 32), 733 (byte)(regionHandle >> 56), (byte)(regionHandle >> 48), (byte)(regionHandle >> 40), (byte)(regionHandle >> 32),
734 (byte)(regionHandle >> 24), (byte)(regionHandle >> 16), (byte)(regionHandle >> 8), (byte)regionHandle, 734 (byte)(regionHandle >> 24), (byte)(regionHandle >> 16), (byte)(regionHandle >> 8), (byte)regionHandle,
735 (byte)(x >> 24), (byte)(x >> 16), (byte)(x >> 8), (byte)x, 735 (byte)(x >> 24), (byte)(x >> 16), (byte)(x >> 8), (byte)x,
736 (byte)(y >> 24), (byte)(y >> 16), (byte)(y >> 8), (byte)y }; 736 (byte)(y >> 24), (byte)(y >> 16), (byte)(y >> 8), (byte)y };
737 return new LLUUID(bytes, 0); 737 return new UUID(bytes, 0);
738 } 738 }
739 739
740 public static void ParseFakeParcelID(LLUUID parcelID, out ulong regionHandle, out uint x, out uint y) { 740 public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y) {
741 byte[] bytes = parcelID.GetBytes(); 741 byte[] bytes = parcelID.GetBytes();
742 regionHandle = Helpers.BytesToUInt64(bytes); 742 regionHandle = Helpers.BytesToUInt64(bytes);
743 x = Helpers.BytesToUInt(bytes, 8); 743 x = Helpers.BytesToUInt(bytes, 8);
diff --git a/OpenSim/Framework/ViewerEffectEventHandlerArg.cs b/OpenSim/Framework/ViewerEffectEventHandlerArg.cs
index 6d7e2ab..3c7f36d 100644
--- a/OpenSim/Framework/ViewerEffectEventHandlerArg.cs
+++ b/OpenSim/Framework/ViewerEffectEventHandlerArg.cs
@@ -1,15 +1,15 @@
1using System; 1using System;
2using libsecondlife; 2using OpenMetaverse;
3 3
4namespace OpenSim.Framework 4namespace OpenSim.Framework
5{ 5{
6 public class ViewerEffectEventHandlerArg : EventArgs 6 public class ViewerEffectEventHandlerArg : EventArgs
7 { 7 {
8 public LLUUID AgentID; 8 public UUID AgentID;
9 public byte[] Color; 9 public byte[] Color;
10 public float Duration; 10 public float Duration;
11 public LLUUID ID; 11 public UUID ID;
12 public byte Type; 12 public byte Type;
13 public byte[] TypeData; 13 public byte[] TypeData;
14 } 14 }
15} \ No newline at end of file 15}
diff --git a/OpenSim/Framework/sLLVector3.cs b/OpenSim/Framework/sLLVector3.cs
index c0bafb2..e69de29 100644
--- a/OpenSim/Framework/sLLVector3.cs
+++ b/OpenSim/Framework/sLLVector3.cs
@@ -1,51 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using libsecondlife;
30
31namespace OpenSim.Framework
32{
33 [Serializable]
34 public class sLLVector3
35 {
36 public float x = 0;
37 public float y = 0;
38 public float z = 0;
39
40 public sLLVector3()
41 {
42 }
43
44 public sLLVector3(LLVector3 v)
45 {
46 x = v.X;
47 y = v.Y;
48 z = v.Z;
49 }
50 }
51} \ No newline at end of file
generated by cgit v1.1 at 2024-07-01 08:49:20 +0000