From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * 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. --- OpenSim/Data/MSSQL/MSSQLAssetData.cs | 8 +- OpenSim/Data/MSSQL/MSSQLEstateData.cs | 26 +++--- OpenSim/Data/MSSQL/MSSQLGridData.cs | 14 +-- OpenSim/Data/MSSQL/MSSQLInventoryData.cs | 48 +++++------ OpenSim/Data/MSSQL/MSSQLManager.cs | 38 ++++---- OpenSim/Data/MSSQL/MSSQLRegionData.cs | 144 +++++++++++++++---------------- OpenSim/Data/MSSQL/MSSQLUserData.cs | 116 ++++++++++++------------- 7 files changed, 197 insertions(+), 197 deletions(-) (limited to 'OpenSim/Data/MSSQL') diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index e10e3aa..ed1c91b 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; @@ -84,7 +84,7 @@ namespace OpenSim.Data.MSSQL /// /// the asset UUID /// - override public AssetBase FetchAsset(LLUUID assetID) + override public AssetBase FetchAsset(UUID assetID) { Dictionary param = new Dictionary(); param["id"] = assetID.ToString(); @@ -102,7 +102,7 @@ namespace OpenSim.Data.MSSQL /// the asset override public void CreateAsset(AssetBase asset) { - if (ExistsAsset((LLUUID) asset.FullID)) + if (ExistsAsset((UUID) asset.FullID)) { return; } @@ -181,7 +181,7 @@ namespace OpenSim.Data.MSSQL /// /// /// true if exist. - override public bool ExistsAsset(LLUUID uuid) + override public bool ExistsAsset(UUID uuid) { if (FetchAsset(uuid) != null) { diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs index 74eecd8..b42c67f 100644 --- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs +++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; @@ -102,7 +102,7 @@ namespace OpenSim.Data.MSSQL /// /// region ID. /// - public EstateSettings LoadEstateSettings(LLUUID regionID) + public EstateSettings LoadEstateSettings(UUID regionID) { EstateSettings es = new EstateSettings(); @@ -128,10 +128,10 @@ namespace OpenSim.Data.MSSQL else _FieldMap[name].SetValue(es, false); } - else if (_FieldMap[name].GetValue(es) is LLUUID) + else if (_FieldMap[name].GetValue(es) is UUID) { - LLUUID uuid; - LLUUID.TryParse(reader[name].ToString(), out uuid); + UUID uuid; + UUID.TryParse(reader[name].ToString(), out uuid); _FieldMap[name].SetValue(es, uuid); } @@ -333,8 +333,8 @@ namespace OpenSim.Data.MSSQL { EstateBan eb = new EstateBan(); - LLUUID uuid; - LLUUID.TryParse(reader["bannedUUID"].ToString(), out uuid); + UUID uuid; + UUID.TryParse(reader["bannedUUID"].ToString(), out uuid); eb.bannedUUID = uuid; eb.bannedIP = "0.0.0.0"; @@ -345,9 +345,9 @@ namespace OpenSim.Data.MSSQL } } - private LLUUID[] LoadUUIDList(uint estateID, string table) + private UUID[] LoadUUIDList(uint estateID, string table) { - List uuids = new List(); + List uuids = new List(); string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table); @@ -361,8 +361,8 @@ namespace OpenSim.Data.MSSQL { // EstateBan eb = new EstateBan(); - LLUUID uuid; - LLUUID.TryParse(reader["uuid"].ToString(), out uuid); + UUID uuid; + UUID.TryParse(reader["uuid"].ToString(), out uuid); uuids.Add(uuid); } @@ -399,7 +399,7 @@ namespace OpenSim.Data.MSSQL } } - private void SaveUUIDList(uint estateID, string table, LLUUID[] data) + private void SaveUUIDList(uint estateID, string table, UUID[] data) { //Delete first string sql = string.Format("delete from {0} where EstateID = @EstateID", table); @@ -416,7 +416,7 @@ namespace OpenSim.Data.MSSQL bool createParamOnce = true; - foreach (LLUUID uuid in data) + foreach (UUID uuid in data) { if (createParamOnce) { diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs index 423d4aa..47edc4b 100644 --- a/OpenSim/Data/MSSQL/MSSQLGridData.cs +++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs @@ -31,7 +31,7 @@ using System.Data; using System.Reflection; using System.Security.Cryptography; using System.Text; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; @@ -176,7 +176,7 @@ namespace OpenSim.Data.MSSQL /// /// The region UUID /// The sim profile - override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) + override public RegionProfileData GetProfileByUUID(UUID uuid) { Dictionary param = new Dictionary(); param["uuid"] = uuid.ToString(); @@ -284,7 +284,7 @@ namespace OpenSim.Data.MSSQL parameters["regionHandle"] = profile.regionHandle.ToString(); parameters["regionName"] = profile.regionName; - parameters["uuid"] = profile.UUID.ToString(); + parameters["uuid"] = profile.ToString(); parameters["regionRecvKey"] = profile.regionRecvKey; parameters["regionSecret"] = profile.regionSecret; parameters["regionSendKey"] = profile.regionSendKey; @@ -352,7 +352,7 @@ namespace OpenSim.Data.MSSQL parameters["regionHandle"] = profile.regionHandle.ToString(); parameters["regionName"] = profile.regionName; - parameters["uuid"] = profile.UUID.ToString(); + parameters["uuid"] = profile.ToString(); parameters["regionRecvKey"] = profile.regionRecvKey; parameters["regionSecret"] = profile.regionSecret; parameters["regionSendKey"] = profile.regionSendKey; @@ -403,14 +403,14 @@ namespace OpenSim.Data.MSSQL /// The attempted regionHandle of the challenger /// The secret /// Whether the secret and regionhandle match the database entry for UUID - override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) + override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey) { bool throwHissyFit = false; // Should be true by 1.0 if (throwHissyFit) throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); - RegionProfileData data = GetProfileByLLUUID(uuid); + RegionProfileData data = GetProfileByUUID(uuid); return (handle == data.regionHandle && authkey == data.regionSecret); } @@ -424,7 +424,7 @@ namespace OpenSim.Data.MSSQL /// /// /// - public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) + public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge) { // SHA512Managed HashProvider = new SHA512Managed(); // Encoding TextProvider = new UTF8Encoding(); diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index 9e60b16..e7df7c1 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; @@ -167,7 +167,7 @@ namespace OpenSim.Data.MSSQL /// /// The folder to search /// A list containing inventory items - public List getInventoryInFolder(LLUUID folderID) + public List getInventoryInFolder(UUID folderID) { try { @@ -201,13 +201,13 @@ namespace OpenSim.Data.MSSQL /// /// The user whos inventory is to be searched /// A list of folder objects - public List getUserRootFolders(LLUUID user) + public List getUserRootFolders(UUID user) { try { Dictionary param = new Dictionary(); param["uuid"] = user.ToString(); - param["zero"] = LLUUID.Zero.ToString(); + param["zero"] = UUID.Zero.ToString(); using (IDbCommand result = database.Query( @@ -235,13 +235,13 @@ namespace OpenSim.Data.MSSQL /// /// the User UUID /// - public InventoryFolderBase getUserRootFolder(LLUUID user) + public InventoryFolderBase getUserRootFolder(UUID user) { try { Dictionary param = new Dictionary(); param["uuid"] = user.ToString(); - param["zero"] = LLUUID.Zero.ToString(); + param["zero"] = UUID.Zero.ToString(); using (IDbCommand result = database.Query( @@ -281,7 +281,7 @@ namespace OpenSim.Data.MSSQL /// /// The folder to search /// A list of inventory folders - public List getInventoryFolders(LLUUID parentID) + public List getInventoryFolders(UUID parentID) { try { @@ -318,23 +318,23 @@ namespace OpenSim.Data.MSSQL { InventoryItemBase item = new InventoryItemBase(); - item.ID = new LLUUID((string) reader["inventoryID"]); - item.AssetID = new LLUUID((string) reader["assetID"]); + item.ID = new UUID((string) reader["inventoryID"]); + item.AssetID = new UUID((string) reader["assetID"]); item.AssetType = (int) reader["assetType"]; - item.Folder = new LLUUID((string) reader["parentFolderID"]); - item.Owner = new LLUUID((string) reader["avatarID"]); + item.Folder = new UUID((string) reader["parentFolderID"]); + item.Owner = new UUID((string) reader["avatarID"]); item.Name = (string) reader["inventoryName"]; item.Description = (string) reader["inventoryDescription"]; item.NextPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryNextPermissions"]); item.CurrentPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryCurrentPermissions"]); item.InvType = (int) reader["invType"]; - item.Creator = new LLUUID((string) reader["creatorID"]); + item.Creator = new UUID((string) reader["creatorID"]); item.BasePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryBasePermissions"]); item.EveryOnePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryEveryOnePermissions"]); item.SalePrice = (int) reader["salePrice"]; item.SaleType = Convert.ToByte(reader["saleType"]); item.CreationDate = (int) reader["creationDate"]; - item.GroupID = new LLUUID(reader["groupID"].ToString()); + item.GroupID = new UUID(reader["groupID"].ToString()); item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); item.Flags = ConvertInt32BitFieldToUint32((int)reader["flags"]); @@ -353,7 +353,7 @@ namespace OpenSim.Data.MSSQL /// /// The item to return /// An inventory item - public InventoryItemBase getInventoryItem(LLUUID itemID) + public InventoryItemBase getInventoryItem(UUID itemID) { try { @@ -389,9 +389,9 @@ namespace OpenSim.Data.MSSQL try { InventoryFolderBase folder = new InventoryFolderBase(); - folder.Owner = new LLUUID((string) reader["agentID"]); - folder.ParentID = new LLUUID((string) reader["parentFolderID"]); - folder.ID = new LLUUID((string) reader["folderID"]); + folder.Owner = new UUID((string) reader["agentID"]); + folder.ParentID = new UUID((string) reader["parentFolderID"]); + folder.ID = new UUID((string) reader["folderID"]); folder.Name = (string) reader["folderName"]; folder.Type = (short) reader["type"]; folder.Version = Convert.ToUInt16(reader["version"]); @@ -410,7 +410,7 @@ namespace OpenSim.Data.MSSQL /// /// The folder to return /// A folder class - public InventoryFolderBase getInventoryFolder(LLUUID folderID) + public InventoryFolderBase getInventoryFolder(UUID folderID) { try { @@ -556,7 +556,7 @@ namespace OpenSim.Data.MSSQL /// Delete an item in inventory database /// /// the item UUID - public void deleteInventoryItem(LLUUID itemID) + public void deleteInventoryItem(UUID itemID) { try { @@ -679,7 +679,7 @@ namespace OpenSim.Data.MSSQL /// /// list where folders will be appended /// ID of parent - protected void getInventoryFolders(ref List folders, LLUUID parentID) + protected void getInventoryFolders(ref List folders, UUID parentID) { List subfolderList = getInventoryFolders(parentID); @@ -688,7 +688,7 @@ namespace OpenSim.Data.MSSQL } // See IInventoryDataPlugin - public List getFolderHierarchy(LLUUID parentID) + public List getFolderHierarchy(UUID parentID) { List folders = new List(); getInventoryFolders(ref folders, parentID); @@ -703,7 +703,7 @@ namespace OpenSim.Data.MSSQL /// Delete a folder in inventory databasae /// /// the folder UUID - protected void deleteOneFolder(LLUUID folderID) + protected void deleteOneFolder(UUID folderID) { try { @@ -725,7 +725,7 @@ namespace OpenSim.Data.MSSQL /// Delete an item in inventory database /// /// the item ID - protected void deleteItemsInFolder(LLUUID folderID) + protected void deleteItemsInFolder(UUID folderID) { try { @@ -749,7 +749,7 @@ namespace OpenSim.Data.MSSQL /// Delete an inventory folder /// /// Id of folder to delete - public void deleteInventoryFolder(LLUUID folderID) + public void deleteInventoryFolder(UUID folderID) { // lock (database) { diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs index 535cf33..abbcddf 100644 --- a/OpenSim/Data/MSSQL/MSSQLManager.cs +++ b/OpenSim/Data/MSSQL/MSSQLManager.cs @@ -31,7 +31,7 @@ using System.Data; using System.Data.SqlClient; using System.IO; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; @@ -220,7 +220,7 @@ namespace OpenSim.Data.MSSQL { return SqlDbType.Bit; } - if (type == typeof(LLUUID)) + if (type == typeof(UUID)) { return SqlDbType.VarChar; } @@ -244,7 +244,7 @@ namespace OpenSim.Data.MSSQL { Type valueType = value.GetType(); - if (valueType == typeof(LLUUID)) + if (valueType == typeof(UUID)) { return value.ToString(); } @@ -335,7 +335,7 @@ namespace OpenSim.Data.MSSQL // Region Main regionprofile.regionHandle = Convert.ToUInt64(reader["regionHandle"]); regionprofile.regionName = (string)reader["regionName"]; - regionprofile.UUID = new LLUUID((string)reader["uuid"]); + regionprofile.UUID = new UUID((string)reader["uuid"]); // Secrets regionprofile.regionRecvKey = (string)reader["regionRecvKey"]; @@ -372,16 +372,16 @@ namespace OpenSim.Data.MSSQL regionprofile.regionUserURI = (string)reader["regionUserURI"]; regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"]; regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"]; - regionprofile.owner_uuid = new LLUUID((string) reader["owner_uuid"]); + regionprofile.owner_uuid = new UUID((string) reader["owner_uuid"]); // World Map Addition string tempRegionMap = reader["regionMapTexture"].ToString(); if (tempRegionMap != String.Empty) { - regionprofile.regionMapTextureID = new LLUUID(tempRegionMap); + regionprofile.regionMapTextureID = new UUID(tempRegionMap); } else { - regionprofile.regionMapTextureID = new LLUUID(); + regionprofile.regionMapTextureID = new UUID(); } } else @@ -403,7 +403,7 @@ namespace OpenSim.Data.MSSQL if (reader.Read()) { - retval.ID = new LLUUID((string)reader["UUID"]); + retval.ID = new UUID((string)reader["UUID"]); retval.FirstName = (string)reader["username"]; retval.SurName = (string)reader["lastname"]; @@ -411,11 +411,11 @@ namespace OpenSim.Data.MSSQL retval.PasswordSalt = (string)reader["passwordSalt"]; retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); - retval.HomeLocation = new LLVector3( + retval.HomeLocation = new Vector3( Convert.ToSingle(reader["homeLocationX"].ToString()), Convert.ToSingle(reader["homeLocationY"].ToString()), Convert.ToSingle(reader["homeLocationZ"].ToString())); - retval.HomeLookAt = new LLVector3( + retval.HomeLookAt = new Vector3( Convert.ToSingle(reader["homeLookAtX"].ToString()), Convert.ToSingle(reader["homeLookAtY"].ToString()), Convert.ToSingle(reader["homeLookAtZ"].ToString())); @@ -432,9 +432,9 @@ namespace OpenSim.Data.MSSQL retval.AboutText = (string)reader["profileAboutText"]; retval.FirstLifeAboutText = (string)reader["profileFirstText"]; - retval.Image = new LLUUID((string)reader["profileImage"]); - retval.FirstLifeImage = new LLUUID((string)reader["profileFirstImage"]); - retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]); + retval.Image = new UUID((string)reader["profileImage"]); + retval.FirstLifeImage = new UUID((string)reader["profileFirstImage"]); + retval.WebLoginKey = new UUID((string)reader["webLoginKey"]); } else { @@ -455,9 +455,9 @@ namespace OpenSim.Data.MSSQL if (reader.Read()) { // Agent IDs - retval.ProfileID = new LLUUID((string)reader["UUID"]); - retval.SessionID = new LLUUID((string)reader["sessionID"]); - retval.SecureSessionID = new LLUUID((string)reader["secureSessionID"]); + retval.ProfileID = new UUID((string)reader["UUID"]); + retval.SessionID = new UUID((string)reader["sessionID"]); + retval.SecureSessionID = new UUID((string)reader["secureSessionID"]); // Agent Who? retval.AgentIP = (string)reader["agentIP"]; @@ -471,8 +471,8 @@ namespace OpenSim.Data.MSSQL // Current position retval.Region = (string)reader["currentRegion"]; retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString()); - LLVector3 tmp_v; - LLVector3.TryParse((string)reader["currentPos"], out tmp_v); + Vector3 tmp_v; + Vector3.TryParse((string)reader["currentPos"], out tmp_v); retval.Position = tmp_v; } @@ -497,7 +497,7 @@ namespace OpenSim.Data.MSSQL asset = new AssetBase(); asset.Data = (byte[])reader["data"]; asset.Description = (string)reader["description"]; - asset.FullID = new LLUUID((string)reader["id"]); + asset.FullID = new UUID((string)reader["id"]); asset.Local = Convert.ToBoolean(reader["local"]); // ((sbyte)reader["local"]) != 0 ? true : false; asset.Name = (string)reader["name"]; asset.Type = Convert.ToSByte(reader["assetType"]); diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index 46aa6c9..d267e41 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs @@ -31,7 +31,7 @@ using System.Data; using System.Data.SqlClient; using System.IO; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; @@ -174,12 +174,12 @@ namespace OpenSim.Data.MSSQL /// /// The region UUID. /// - public List LoadObjects(LLUUID regionUUID) + public List LoadObjects(UUID regionUUID) { - Dictionary createdObjects = new Dictionary(); + Dictionary createdObjects = new Dictionary(); //Retrieve all values of current region - RetrievePrimsDataForRegion(regionUUID, LLUUID.Zero, ""); + RetrievePrimsDataForRegion(regionUUID, UUID.Zero, ""); List retvals = new List(); @@ -235,7 +235,7 @@ namespace OpenSim.Data.MSSQL "No shape found for prim in storage, so setting default box shape"); prim.Shape = PrimitiveBaseShape.Default; } - createdObjects[new LLUUID(objID)].AddPart(prim); + createdObjects[new UUID(objID)].AddPart(prim); } LoadItems(prim); @@ -292,7 +292,7 @@ namespace OpenSim.Data.MSSQL // } // else // { -// createdObjects[new LLUUID(objID)].AddPart(prim); +// createdObjects[new UUID(objID)].AddPart(prim); // } // } // } @@ -307,7 +307,7 @@ namespace OpenSim.Data.MSSQL // { // while (readerShapes.Read()) // { -// LLUUID UUID = new LLUUID((string) readerShapes["UUID"]); +// UUID UUID = new UUID((string) readerShapes["UUID"]); // // foreach (SceneObjectGroup objectGroup in createdObjects.Values) // { @@ -324,7 +324,7 @@ namespace OpenSim.Data.MSSQL #endregion } - public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) + public void StoreObject(SceneObjectGroup obj, UUID regionUUID) { //Retrieve all values of current region, and current scene/or prims //Build primID's, we use IN so I can select all prims from objgroup @@ -341,9 +341,9 @@ namespace OpenSim.Data.MSSQL foreach (SceneObjectPart prim in obj.Children.Values) { - if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0 - && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 - && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) + if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 + && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0 + && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) { lock (_PrimsDataSet) { @@ -391,7 +391,7 @@ namespace OpenSim.Data.MSSQL /// /// id of scenegroup /// regionUUID (is this used anyway - public void RemoveObject(LLUUID objectID, LLUUID regionUUID) + public void RemoveObject(UUID objectID, UUID regionUUID) { _Log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", objectID, regionUUID); @@ -418,7 +418,7 @@ namespace OpenSim.Data.MSSQL /// /// /// - public void StorePrimInventory(LLUUID primID, ICollection items) + public void StorePrimInventory(UUID primID, ICollection items) { _Log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID); @@ -456,7 +456,7 @@ namespace OpenSim.Data.MSSQL /// /// regionID. /// - public double[,] LoadTerrain(LLUUID regionID) + public double[,] LoadTerrain(UUID regionID) { double[,] terrain = new double[256, 256]; terrain.Initialize(); @@ -501,7 +501,7 @@ namespace OpenSim.Data.MSSQL /// /// terrain map data. /// regionID. - public void StoreTerrain(double[,] terrain, LLUUID regionID) + public void StoreTerrain(double[,] terrain, UUID regionID) { int revision = Util.UnixTimeSinceEpoch(); @@ -532,7 +532,7 @@ namespace OpenSim.Data.MSSQL /// /// The region UUID. /// - public List LoadLandObjects(LLUUID regionUUID) + public List LoadLandObjects(UUID regionUUID) { List landDataForRegion = new List(); @@ -617,7 +617,7 @@ VALUES /// Removes a land object from DB. /// /// UUID of landobject - public void RemoveLandObject(LLUUID globalID) + public void RemoveLandObject(UUID globalID) { using (AutoClosingSqlCommand cmd = _Database.Query("delete from land where UUID=@UUID")) { @@ -637,7 +637,7 @@ VALUES /// /// The region UUID. /// - public RegionSettings LoadRegionSettings(LLUUID regionUUID) + public RegionSettings LoadRegionSettings(UUID regionUUID) { string sql = "select * from regionsettings where regionUUID = @regionUUID"; RegionSettings regionSettings; @@ -801,7 +801,7 @@ VALUES //TODO change this is some more generic code so we doesnt have to change it every time a new field is added? RegionSettings newSettings = new RegionSettings(); - newSettings.RegionUUID = new LLUUID((string)row["regionUUID"]); + newSettings.RegionUUID = new UUID((string)row["regionUUID"]); newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]); newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]); newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]); @@ -815,10 +815,10 @@ VALUES newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]); newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]); newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]); - newSettings.TerrainTexture1 = new LLUUID((String)row["terrain_texture_1"]); - newSettings.TerrainTexture2 = new LLUUID((String)row["terrain_texture_2"]); - newSettings.TerrainTexture3 = new LLUUID((String)row["terrain_texture_3"]); - newSettings.TerrainTexture4 = new LLUUID((String)row["terrain_texture_4"]); + newSettings.TerrainTexture1 = new UUID((String)row["terrain_texture_1"]); + newSettings.TerrainTexture2 = new UUID((String)row["terrain_texture_2"]); + newSettings.TerrainTexture3 = new UUID((String)row["terrain_texture_3"]); + newSettings.TerrainTexture4 = new UUID((String)row["terrain_texture_4"]); newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]); newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]); newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]); @@ -834,7 +834,7 @@ VALUES newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]); newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); - newSettings.Covenant = new LLUUID((String)row["covenant"]); + newSettings.Covenant = new UUID((String)row["covenant"]); return newSettings; } @@ -848,7 +848,7 @@ VALUES { LandData newData = new LandData(); - newData.GlobalID = new LLUUID((String)row["UUID"]); + newData.GlobalID = new UUID((String)row["UUID"]); newData.LocalID = Convert.ToInt32(row["LocalLandID"]); // Bitmap is a byte[512] @@ -864,41 +864,41 @@ VALUES //Enum libsecondlife.Parcel.ParcelCategory newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]); - newData.GroupID = new LLUUID((String)row["GroupUUID"]); + newData.GroupID = new UUID((String)row["GroupUUID"]); newData.SalePrice = Convert.ToInt32(row["SalePrice"]); newData.Status = (Parcel.ParcelStatus)Convert.ToInt32(row["LandStatus"]); //Enum. libsecondlife.Parcel.ParcelStatus newData.Flags = Convert.ToUInt32(row["LandFlags"]); newData.LandingType = Convert.ToByte(row["LandingType"]); newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]); - newData.MediaID = new LLUUID((String)row["MediaTextureUUID"]); + newData.MediaID = new UUID((String)row["MediaTextureUUID"]); newData.MediaURL = (String)row["MediaURL"]; newData.MusicURL = (String)row["MusicURL"]; newData.PassHours = Convert.ToSingle(row["PassHours"]); newData.PassPrice = Convert.ToInt32(row["PassPrice"]); - LLUUID authedbuyer; - LLUUID snapshotID; + UUID authedbuyer; + UUID snapshotID; - if (LLUUID.TryParse((string)row["AuthBuyerID"], out authedbuyer)) + if (UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer)) newData.AuthBuyerID = authedbuyer; - if (LLUUID.TryParse((string)row["SnapshotUUID"], out snapshotID)) + if (UUID.TryParse((string)row["SnapshotUUID"], out snapshotID)) newData.SnapshotID = snapshotID; try { newData.UserLocation = - new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), + new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), Convert.ToSingle(row["UserLocationZ"])); newData.UserLookAt = - new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]), + new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]), Convert.ToSingle(row["UserLookAtZ"])); } catch (InvalidCastException) { - newData.UserLocation = LLVector3.Zero; - newData.UserLookAt = LLVector3.Zero; + newData.UserLocation = Vector3.Zero; + newData.UserLookAt = Vector3.Zero; _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); } @@ -915,7 +915,7 @@ VALUES private static ParcelManager.ParcelAccessEntry buildLandAccessData(IDataRecord row) { ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); - entry.AgentID = new LLUUID((string)row["AccessUUID"]); + entry.AgentID = new UUID((string)row["AccessUUID"]); entry.Flags = (ParcelManager.AccessList)Convert.ToInt32(row["Flags"]); entry.Time = new DateTime(); return entry; @@ -930,7 +930,7 @@ VALUES { SceneObjectPart prim = new SceneObjectPart(); - prim.UUID = new LLUUID((String)row["UUID"]); + prim.UUID = new UUID((String)row["UUID"]); // explicit conversion of integers is required, which sort // of sucks. No idea if there is a shortcut here or not. prim.ParentID = Convert.ToUInt32(row["ParentID"]); @@ -943,54 +943,54 @@ VALUES prim.TouchName = (String)row["TouchName"]; // permissions prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); - prim.CreatorID = new LLUUID((String)row["CreatorID"]); - prim.OwnerID = new LLUUID((String)row["OwnerID"]); - prim.GroupID = new LLUUID((String)row["GroupID"]); - prim.LastOwnerID = new LLUUID((String)row["LastOwnerID"]); + prim.CreatorID = new UUID((String)row["CreatorID"]); + prim.OwnerID = new UUID((String)row["OwnerID"]); + prim.GroupID = new UUID((String)row["GroupID"]); + prim.LastOwnerID = new UUID((String)row["LastOwnerID"]); prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]); prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]); prim.GroupMask = Convert.ToUInt32(row["GroupMask"]); prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]); prim.BaseMask = Convert.ToUInt32(row["BaseMask"]); // vectors - prim.OffsetPosition = new LLVector3( + prim.OffsetPosition = new Vector3( Convert.ToSingle(row["PositionX"]), Convert.ToSingle(row["PositionY"]), Convert.ToSingle(row["PositionZ"]) ); - prim.GroupPosition = new LLVector3( + prim.GroupPosition = new Vector3( Convert.ToSingle(row["GroupPositionX"]), Convert.ToSingle(row["GroupPositionY"]), Convert.ToSingle(row["GroupPositionZ"]) ); - prim.Velocity = new LLVector3( + prim.Velocity = new Vector3( Convert.ToSingle(row["VelocityX"]), Convert.ToSingle(row["VelocityY"]), Convert.ToSingle(row["VelocityZ"]) ); - prim.AngularVelocity = new LLVector3( + prim.AngularVelocity = new Vector3( Convert.ToSingle(row["AngularVelocityX"]), Convert.ToSingle(row["AngularVelocityY"]), Convert.ToSingle(row["AngularVelocityZ"]) ); - prim.Acceleration = new LLVector3( + prim.Acceleration = new Vector3( Convert.ToSingle(row["AccelerationX"]), Convert.ToSingle(row["AccelerationY"]), Convert.ToSingle(row["AccelerationZ"]) ); // quaternions - prim.RotationOffset = new LLQuaternion( + prim.RotationOffset = new Quaternion( Convert.ToSingle(row["RotationX"]), Convert.ToSingle(row["RotationY"]), Convert.ToSingle(row["RotationZ"]), Convert.ToSingle(row["RotationW"]) ); - prim.SitTargetPositionLL = new LLVector3( + prim.SitTargetPositionLL = new Vector3( Convert.ToSingle(row["SitTargetOffsetX"]), Convert.ToSingle(row["SitTargetOffsetY"]), Convert.ToSingle(row["SitTargetOffsetZ"]) ); - prim.SitTargetOrientationLL = new LLQuaternion( + prim.SitTargetOrientationLL = new Quaternion( Convert.ToSingle(row["SitTargetOrientX"]), Convert.ToSingle(row["SitTargetOrientY"]), Convert.ToSingle(row["SitTargetOrientZ"]), @@ -1003,14 +1003,14 @@ VALUES prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]); prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]); - prim.Sound = new LLUUID(row["LoopedSound"].ToString()); + prim.Sound = new UUID(row["LoopedSound"].ToString()); prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]); prim.SoundFlags = 1; // If it's persisted at all, it's looped if (row["TextureAnimation"] != null && row["TextureAnimation"] != DBNull.Value) prim.TextureAnimation = (Byte[])row["TextureAnimation"]; - prim.RotationalVelocity = new LLVector3( + prim.RotationalVelocity = new Vector3( Convert.ToSingle(row["OmegaX"]), Convert.ToSingle(row["OmegaY"]), Convert.ToSingle(row["OmegaZ"]) @@ -1019,13 +1019,13 @@ VALUES // TODO: Rotation // OmegaX, OmegaY, OmegaZ - prim.SetCameraEyeOffset(new LLVector3( + prim.SetCameraEyeOffset(new Vector3( Convert.ToSingle(row["CameraEyeOffsetX"]), Convert.ToSingle(row["CameraEyeOffsetY"]), Convert.ToSingle(row["CameraEyeOffsetZ"]) )); - prim.SetCameraAtOffset(new LLVector3( + prim.SetCameraAtOffset(new Vector3( Convert.ToSingle(row["CameraAtOffsetX"]), Convert.ToSingle(row["CameraAtOffsetY"]), Convert.ToSingle(row["CameraAtOffsetZ"]) @@ -1056,7 +1056,7 @@ VALUES private static PrimitiveBaseShape buildShape(DataRow row) { PrimitiveBaseShape s = new PrimitiveBaseShape(); - s.Scale = new LLVector3( + s.Scale = new Vector3( Convert.ToSingle(row["ScaleX"]), Convert.ToSingle(row["ScaleY"]), Convert.ToSingle(row["ScaleZ"]) @@ -1108,10 +1108,10 @@ VALUES { TaskInventoryItem taskItem = new TaskInventoryItem(); - taskItem.ItemID = new LLUUID((String)row["itemID"]); - taskItem.ParentPartID = new LLUUID((String)row["primID"]); - taskItem.AssetID = new LLUUID((String)row["assetID"]); - taskItem.ParentID = new LLUUID((String)row["parentFolderID"]); + taskItem.ItemID = new UUID((String)row["itemID"]); + taskItem.ParentPartID = new UUID((String)row["primID"]); + taskItem.AssetID = new UUID((String)row["assetID"]); + taskItem.ParentID = new UUID((String)row["parentFolderID"]); taskItem.InvType = Convert.ToInt32(row["invType"]); taskItem.Type = Convert.ToInt32(row["assetType"]); @@ -1119,10 +1119,10 @@ VALUES taskItem.Name = (String)row["name"]; taskItem.Description = (String)row["description"]; taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); - taskItem.CreatorID = new LLUUID((String)row["creatorID"]); - taskItem.OwnerID = new LLUUID((String)row["ownerID"]); - taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); - taskItem.GroupID = new LLUUID((String)row["groupID"]); + taskItem.CreatorID = new UUID((String)row["creatorID"]); + taskItem.OwnerID = new UUID((String)row["ownerID"]); + taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]); + taskItem.GroupID = new UUID((String)row["groupID"]); taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]); taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]); @@ -1225,7 +1225,7 @@ VALUES /// land parameters. /// region UUID. /// - private SqlParameter[] CreateLandParameters(LandData land, LLUUID regionUUID) + private SqlParameter[] CreateLandParameters(LandData land, UUID regionUUID) { SqlParameter[] parameters = new SqlParameter[32]; @@ -1274,7 +1274,7 @@ VALUES /// parcel access entry. /// parcel ID. /// - private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, LLUUID parcelID) + private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, UUID parcelID) { SqlParameter[] parameters = new SqlParameter[3]; @@ -1292,7 +1292,7 @@ VALUES /// prim data. /// scenegroup ID. /// regionUUID. - private static void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) + private static void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID) { row["UUID"] = prim.UUID.ToString(); row["RegionUUID"] = regionUUID.ToString(); @@ -1340,12 +1340,12 @@ VALUES row["RotationW"] = prim.RotationOffset.W; // Sit target - LLVector3 sitTargetPos = prim.SitTargetPositionLL; + Vector3 sitTargetPos = prim.SitTargetPositionLL; row["SitTargetOffsetX"] = sitTargetPos.X; row["SitTargetOffsetY"] = sitTargetPos.Y; row["SitTargetOffsetZ"] = sitTargetPos.Z; - LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL; + Quaternion sitTargetOrient = prim.SitTargetOrientationLL; row["SitTargetOrientW"] = sitTargetOrient.W; row["SitTargetOrientX"] = sitTargetOrient.X; row["SitTargetOrientY"] = sitTargetOrient.Y; @@ -1364,7 +1364,7 @@ VALUES } else { - row["LoopedSound"] = LLUUID.Zero; + row["LoopedSound"] = UUID.Zero; row["LoopedSoundGain"] = 0.0f; } @@ -1446,13 +1446,13 @@ VALUES #endregion - private void RetrievePrimsDataForRegion(LLUUID regionUUID, LLUUID sceneGroupID, string primID) + private void RetrievePrimsDataForRegion(UUID regionUUID, UUID sceneGroupID, string primID) { using (SqlConnection connection = _Database.DatabaseConnection()) { _PrimDataAdapter.SelectCommand.Connection = connection; _PrimDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString(); - if (sceneGroupID != LLUUID.Zero) + if (sceneGroupID != UUID.Zero) _PrimDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString(); else _PrimDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%"; @@ -1462,7 +1462,7 @@ VALUES _ShapeDataAdapter.SelectCommand.Connection = connection; _ShapeDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString(); - if (sceneGroupID != LLUUID.Zero) + if (sceneGroupID != UUID.Zero) _ShapeDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString(); else _ShapeDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%"; @@ -1472,7 +1472,7 @@ VALUES _ItemsDataAdapter.SelectCommand.Connection = connection; _ItemsDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString(); - if (sceneGroupID != LLUUID.Zero) + if (sceneGroupID != UUID.Zero) _ItemsDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString(); else _ItemsDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%"; diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index cfe5f50..9118012 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; @@ -183,13 +183,13 @@ namespace OpenSim.Data.MSSQL /// UUID of the friendlist owner /// Friend's UUID /// Permission flag - override public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) + override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { int dtvalue = Util.UnixTimeSinceEpoch(); Dictionary param = new Dictionary(); - param["@ownerID"] = friendlistowner.UUID.ToString(); - param["@friendID"] = friend.UUID.ToString(); + param["@ownerID"] = friendlistowner.ToString(); + param["@friendID"] = friend.ToString(); param["@friendPerms"] = perms.ToString(); param["@datetimestamp"] = dtvalue.ToString(); @@ -229,11 +229,11 @@ namespace OpenSim.Data.MSSQL /// /// UUID of the friendlist owner /// UUID of the not-so-friendly user to remove from the list - override public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) + override public void RemoveUserFriend(UUID friendlistowner, UUID friend) { Dictionary param = new Dictionary(); - param["@ownerID"] = friendlistowner.UUID.ToString(); - param["@friendID"] = friend.UUID.ToString(); + param["@ownerID"] = friendlistowner.ToString(); + param["@friendID"] = friend.ToString(); try @@ -267,11 +267,11 @@ namespace OpenSim.Data.MSSQL /// UUID of the friendlist owner /// UUID of the friend /// new permission flag - override public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) + override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) { Dictionary param = new Dictionary(); - param["@ownerID"] = friendlistowner.UUID.ToString(); - param["@friendID"] = friend.UUID.ToString(); + param["@ownerID"] = friendlistowner.ToString(); + param["@friendID"] = friend.ToString(); param["@friendPerms"] = perms.ToString(); @@ -298,12 +298,12 @@ namespace OpenSim.Data.MSSQL /// /// UUID of the friendlist owner /// Friendlist list - override public List GetUserFriendList(LLUUID friendlistowner) + override public List GetUserFriendList(UUID friendlistowner) { List Lfli = new List(); Dictionary param = new Dictionary(); - param["@ownerID"] = friendlistowner.UUID.ToString(); + param["@ownerID"] = friendlistowner.ToString(); try { @@ -318,8 +318,8 @@ namespace OpenSim.Data.MSSQL while (reader.Read()) { FriendListItem fli = new FriendListItem(); - fli.FriendListOwner = new LLUUID((string)reader["ownerID"]); - fli.Friend = new LLUUID((string)reader["friendID"]); + fli.FriendListOwner = new UUID((string)reader["ownerID"]); + fli.Friend = new UUID((string)reader["friendID"]); fli.FriendPerms = (uint)Convert.ToInt32(reader["friendPerms"]); // This is not a real column in the database table, it's a joined column from the opposite record @@ -345,7 +345,7 @@ namespace OpenSim.Data.MSSQL /// avatar uuid /// region uuid /// region handle - override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) + override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) { //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); } @@ -356,7 +356,7 @@ namespace OpenSim.Data.MSSQL /// /// /// - override public List GeneratePickerResults(LLUUID queryID, string query) + override public List GeneratePickerResults(UUID queryID, string query) { List returnlist = new List(); string[] querysplit; @@ -375,7 +375,7 @@ namespace OpenSim.Data.MSSQL while (reader.Read()) { AvatarPickerAvatar user = new AvatarPickerAvatar(); - user.AvatarID = new LLUUID((string)reader["UUID"]); + user.AvatarID = new UUID((string)reader["UUID"]); user.firstName = (string)reader["username"]; user.lastName = (string)reader["lastname"]; returnlist.Add(user); @@ -400,7 +400,7 @@ namespace OpenSim.Data.MSSQL while (reader.Read()) { AvatarPickerAvatar user = new AvatarPickerAvatar(); - user.AvatarID = new LLUUID((string)reader["UUID"]); + user.AvatarID = new UUID((string)reader["UUID"]); user.firstName = (string)reader["username"]; user.lastName = (string)reader["lastname"]; returnlist.Add(user); @@ -420,7 +420,7 @@ namespace OpenSim.Data.MSSQL /// /// /// - override public UserProfileData GetUserByUUID(LLUUID uuid) + override public UserProfileData GetUserByUUID(UUID uuid) { try { @@ -467,7 +467,7 @@ namespace OpenSim.Data.MSSQL /// /// The accounts UUID /// The users session - override public UserAgentData GetAgentByUUID(LLUUID uuid) + override public UserAgentData GetAgentByUUID(UUID uuid) { try { @@ -493,7 +493,7 @@ namespace OpenSim.Data.MSSQL /// The agent UUID /// the WebLogin Key /// unused ? - override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) + override public void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey) { UserProfileData user = GetUserByUUID(AgentID); user.WebLoginKey = WebLoginKey; @@ -549,12 +549,12 @@ namespace OpenSim.Data.MSSQL /// UUID for profile image /// UUID for firstlife image /// Success? - private bool InsertUserRow(LLUUID uuid, string username, string lastname, string passwordHash, + private bool InsertUserRow(UUID uuid, string username, string lastname, string passwordHash, string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ, float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, string aboutText, string firstText, - LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey) + UUID profileImage, UUID firstImage, UUID webLoginKey) { string sql = "INSERT INTO "+m_usersTableName; sql += " ([UUID], [username], [lastname], [passwordHash], [passwordSalt], [homeRegion], "; @@ -594,7 +594,7 @@ namespace OpenSim.Data.MSSQL parameters["profileFirstText"] = firstText; parameters["profileImage"] = profileImage.ToString(); parameters["profileFirstImage"] = firstImage.ToString(); - parameters["webLoginKey"] = LLUUID.Random().ToString(); + parameters["webLoginKey"] = UUID.Random().ToString(); try @@ -683,7 +683,7 @@ namespace OpenSim.Data.MSSQL SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString()); SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString()); SqlParameter param23 = new SqlParameter("@keyUUUID", user.ID.ToString()); - SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString()); + SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.ToString()); command.Parameters.Add(param1); command.Parameters.Add(param2); command.Parameters.Add(param3); @@ -728,7 +728,7 @@ namespace OpenSim.Data.MSSQL /// The receivers account ID /// The amount to transfer /// false - override public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) + override public bool MoneyTransferRequest(UUID from, UUID to, uint amount) { return false; } @@ -741,14 +741,14 @@ namespace OpenSim.Data.MSSQL /// The receivers account ID /// The item to transfer /// false - override public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) + override public bool InventoryTransferRequest(UUID from, UUID to, UUID item) { return false; } /// Appearance /// TODO: stubs for now to get us to a compiling state gently - override public AvatarAppearance GetUserAppearance(LLUUID user) + override public AvatarAppearance GetUserAppearance(UUID user) { // return new AvatarAppearance(); try @@ -784,37 +784,37 @@ namespace OpenSim.Data.MSSQL { AvatarAppearance appearance = new AvatarAppearance(); - appearance.Owner = new LLUUID((string)reader["owner"]); + appearance.Owner = new UUID((string)reader["owner"]); appearance.Serial = Convert.ToInt32(reader["serial"]); appearance.VisualParams = (byte[])reader["visual_params"]; - appearance.Texture = new LLObject.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length); + appearance.Texture = new Primitive.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length); appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]); - appearance.BodyItem = new LLUUID((string)reader["body_item"]); - appearance.BodyAsset = new LLUUID((string)reader["body_asset"]); - appearance.SkinItem = new LLUUID((string)reader["skin_item"]); - appearance.SkinAsset = new LLUUID((string)reader["skin_asset"]); - appearance.HairItem = new LLUUID((string)reader["hair_item"]); - appearance.HairAsset = new LLUUID((string)reader["hair_asset"]); - appearance.EyesItem = new LLUUID((string)reader["eyes_item"]); - appearance.EyesAsset = new LLUUID((string)reader["eyes_asset"]); - appearance.ShirtItem = new LLUUID((string)reader["shirt_item"]); - appearance.ShirtAsset = new LLUUID((string)reader["shirt_asset"]); - appearance.PantsItem = new LLUUID((string)reader["pants_item"]); - appearance.PantsAsset = new LLUUID((string)reader["pants_asset"]); - appearance.ShoesItem = new LLUUID((string)reader["shoes_item"]); - appearance.ShoesAsset = new LLUUID((string)reader["shoes_asset"]); - appearance.SocksItem = new LLUUID((string)reader["socks_item"]); - appearance.SocksAsset = new LLUUID((string)reader["socks_asset"]); - appearance.JacketItem = new LLUUID((string)reader["jacket_item"]); - appearance.JacketAsset = new LLUUID((string)reader["jacket_asset"]); - appearance.GlovesItem = new LLUUID((string)reader["gloves_item"]); - appearance.GlovesAsset = new LLUUID((string)reader["gloves_asset"]); - appearance.UnderShirtItem = new LLUUID((string)reader["undershirt_item"]); - appearance.UnderShirtAsset = new LLUUID((string)reader["undershirt_asset"]); - appearance.UnderPantsItem = new LLUUID((string)reader["underpants_item"]); - appearance.UnderPantsAsset = new LLUUID((string)reader["underpants_asset"]); - appearance.SkirtItem = new LLUUID((string)reader["skirt_item"]); - appearance.SkirtAsset = new LLUUID((string)reader["skirt_asset"]); + appearance.BodyItem = new UUID((string)reader["body_item"]); + appearance.BodyAsset = new UUID((string)reader["body_asset"]); + appearance.SkinItem = new UUID((string)reader["skin_item"]); + appearance.SkinAsset = new UUID((string)reader["skin_asset"]); + appearance.HairItem = new UUID((string)reader["hair_item"]); + appearance.HairAsset = new UUID((string)reader["hair_asset"]); + appearance.EyesItem = new UUID((string)reader["eyes_item"]); + appearance.EyesAsset = new UUID((string)reader["eyes_asset"]); + appearance.ShirtItem = new UUID((string)reader["shirt_item"]); + appearance.ShirtAsset = new UUID((string)reader["shirt_asset"]); + appearance.PantsItem = new UUID((string)reader["pants_item"]); + appearance.PantsAsset = new UUID((string)reader["pants_asset"]); + appearance.ShoesItem = new UUID((string)reader["shoes_item"]); + appearance.ShoesAsset = new UUID((string)reader["shoes_asset"]); + appearance.SocksItem = new UUID((string)reader["socks_item"]); + appearance.SocksAsset = new UUID((string)reader["socks_asset"]); + appearance.JacketItem = new UUID((string)reader["jacket_item"]); + appearance.JacketAsset = new UUID((string)reader["jacket_asset"]); + appearance.GlovesItem = new UUID((string)reader["gloves_item"]); + appearance.GlovesAsset = new UUID((string)reader["gloves_asset"]); + appearance.UnderShirtItem = new UUID((string)reader["undershirt_item"]); + appearance.UnderShirtAsset = new UUID((string)reader["undershirt_asset"]); + appearance.UnderPantsItem = new UUID((string)reader["underpants_item"]); + appearance.UnderPantsAsset = new UUID((string)reader["underpants_asset"]); + appearance.SkirtItem = new UUID((string)reader["skirt_item"]); + appearance.SkirtAsset = new UUID((string)reader["skirt_asset"]); return appearance; } @@ -831,7 +831,7 @@ namespace OpenSim.Data.MSSQL /// /// the used UUID /// the appearence - override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) + override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance) { string sql = String.Empty; sql += "DELETE FROM avatarappearance WHERE owner=@owner "; @@ -918,7 +918,7 @@ namespace OpenSim.Data.MSSQL { } - override public void ResetAttachments(LLUUID userID) + override public void ResetAttachments(UUID userID) { } } -- cgit v1.1