From fdce1be3db287bed901332b90ba57165e201d3fc Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Mon, 19 Oct 2009 16:52:27 -0700 Subject: * Removed OpenSim.Data.NHibernate * Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing --- .../Resources/MsSql2005Dialect/001_AssetStore.sql | 10 -- .../Resources/MsSql2005Dialect/001_EstateStore.sql | 72 -------------- .../Resources/MsSql2005Dialect/001_GridStore.sql | 35 ------- .../MsSql2005Dialect/001_InventoryStore.sql | 36 ------- .../Resources/MsSql2005Dialect/001_RegionStore.sql | 104 --------------------- .../Resources/MsSql2005Dialect/001_UserStore.sql | 77 --------------- .../Resources/MsSql2005Dialect/002_RegionStore.sql | 51 ---------- .../Resources/MsSql2005Dialect/002_UserStore.sql | 27 ------ 8 files changed, 412 deletions(-) delete mode 100644 OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_InventoryStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_UserStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql (limited to 'OpenSim/Data/NHibernate/Resources/MsSql2005Dialect') diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql deleted file mode 100644 index deee78b..0000000 --- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql +++ /dev/null @@ -1,10 +0,0 @@ -create table Assets ( - ID NVARCHAR(36) not null, - Type SMALLINT null, - Name NVARCHAR(64) null, - Description NVARCHAR(64) null, - Local BIT null, - Temporary BIT null, - Data VARBINARY(max) null, - primary key (ID) -) diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql deleted file mode 100644 index dd579f9..0000000 --- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql +++ /dev/null @@ -1,72 +0,0 @@ -CREATE TABLE EstateSettings ( - EstateID INT NOT NULL, - ParentEstateID INT NULL, - EstateOwnerID NVARCHAR(36) NULL, - Name NVARCHAR(64) NULL, - RedirectGridX INT NULL, - RedirectGridY INT NULL, - BillableFactor REAL NULL, - PricePerMeter INT NULL, - SunPosition FLOAT NULL, - - UseGlobalTime BIT NULL, - FixedSun BIT NULL, - AllowVoice BIT NULL, - AllowDirectTeleport BIT NULL, - ResetHomeOnTeleport BIT NULL, - PublicAccess BIT NULL, - DenyAnonymous BIT NULL, - DenyIdentified BIT NULL, - DenyTransacted BIT NULL, - DenyMinors BIT NULL, - BlockDwell BIT NULL, - EstateSkipScripts BIT NULL, - TaxFree BIT NULL, - AbuseEmailToEstateOwner BIT NULL, - - AbuseEmail NVARCHAR(255) NULL, - - PRIMARY KEY (EstateID) -); - -CREATE TABLE EstateRegionLink ( - EstateRegionLinkID NVARCHAR(36) NOT NULL, - EstateID INT NULL, - RegionID NVARCHAR(36) NULL, - PRIMARY KEY (EstateRegionLinkID) -); - -CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID); -CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID); - - -CREATE TABLE EstateManagers ( - EstateID INT NOT NULL, - ManagerID NVARCHAR(36) NOT NULL, - ArrayIndex INT NOT NULL, - PRIMARY KEY (EstateID,ArrayIndex) -); - -CREATE TABLE EstateUsers ( - EstateID INT NOT NULL, - UserID NVARCHAR(36) NOT NULL, - ArrayIndex INT NOT NULL, - PRIMARY KEY (EstateID,ArrayIndex) -); - -CREATE TABLE EstateGroups ( - EstateID INT NOT NULL, - GroupID NVARCHAR(36) NOT NULL, - ArrayIndex INT NOT NULL, - PRIMARY KEY (EstateID,ArrayIndex) -); - -CREATE TABLE EstateBans ( - EstateID INT NOT NULL, - ArrayIndex INT NOT NULL, - BannedUserID NVARCHAR(36) NOT NULL, - BannedHostAddress NVARCHAR(16) NOT NULL, - BannedHostIPMask NVARCHAR(16) NOT NULL, - BannedHostNameMask NVARCHAR(16) NOT NULL, - PRIMARY KEY (EstateID,ArrayIndex) -); \ No newline at end of file diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql deleted file mode 100644 index e4ad525..0000000 --- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql +++ /dev/null @@ -1,35 +0,0 @@ -create table Regions ( - Uuid NVARCHAR(36) not null, - RegionHandle BIGINT null, - RegionName NVARCHAR(32) null, - RegionRecvKey NVARCHAR(128) null, - RegionSendKey NVARCHAR(128) null, - RegionSecret NVARCHAR(128) null, - RegionDataURI NVARCHAR(255) null, - ServerIP NVARCHAR(64) null, - ServerPort INT null, - ServerURI NVARCHAR(255) null, - RegionLocX INT null, - RegionLocY INT null, - RegionLocZ INT null, - EastOverrideHandle BIGINT null, - WestOverrideHandle BIGINT null, - SouthOverrideHandle BIGINT null, - NorthOverrideHandle BIGINT null, - RegionAssetURI NVARCHAR(255) null, - RegionAssetRecvKey NVARCHAR(128) null, - RegionAssetSendKey NVARCHAR(128) null, - RegionUserURI NVARCHAR(255) null, - RegionUserRecvKey NVARCHAR(128) null, - RegionUserSendKey NVARCHAR(128) null, - ServerHttpPort INT null, - ServerRemotingPort INT null, - RegionMapTextureID NVARCHAR(36) null, - Owner_uuid NVARCHAR(36) null, - OriginUUID NVARCHAR(36) null, - primary key (Uuid) -) -create index region_handle on Regions (RegionHandle) -create index region_name on Regions (RegionName) -create index overrideHandles on Regions (EastOverrideHandle, WestOverrideHandle, SouthOverrideHandle, NorthOverrideHandle) - diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_InventoryStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_InventoryStore.sql deleted file mode 100644 index 82936c4..0000000 --- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_InventoryStore.sql +++ /dev/null @@ -1,36 +0,0 @@ -create table InventoryFolders ( - ID NVARCHAR(255) not null, - Type SMALLINT null, - Version INT null, - ParentID NVARCHAR(255) null, - Owner NVARCHAR(255) null, - Name NVARCHAR(64) null, - primary key (ID) -) -create table InventoryItems ( - ID NVARCHAR(255) not null, - InvType INT null, - AssetType INT null, - AssetID NVARCHAR(255) null, - Folder NVARCHAR(255) null, - Owner NVARCHAR(255) null, - Creator NVARCHAR(255) null, - Name NVARCHAR(64) null, - Description NVARCHAR(64) null, - NextPermissions INT null, - CurrentPermissions INT null, - BasePermissions INT null, - EveryOnePermissions INT null, - GroupID NVARCHAR(255) null, - GroupOwned BIT null, - SalePrice INT null, - SaleType TINYINT null, - Flags INT null, - CreationDate INT null, - primary key (ID) -) -create index item_group_id on InventoryItems (GroupID) -create index item_folder_id on InventoryItems (Folder) -create index item_owner_id on InventoryItems (Owner) -create index folder_owner_id on InventoryFolders (Owner) -create index folder_parent_id on InventoryFolders (ParentID) diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql deleted file mode 100644 index 181a74c..0000000 --- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql +++ /dev/null @@ -1,104 +0,0 @@ -create table Prims ( - UUID NVARCHAR(255) not null, - ParentID INT null, - ParentUUID NVARCHAR(255) null, - RegionID NVARCHAR(255) null, - CreationDate INT null, - Name NVARCHAR(255) null, - Text NVARCHAR(255) null, - Description NVARCHAR(255) null, - SitName NVARCHAR(255) null, - TouchName NVARCHAR(255) null, - ObjectFlags INT null, - CreatorID NVARCHAR(255) null, - OwnerID NVARCHAR(255) null, - GroupID NVARCHAR(255) null, - LastOwnerID NVARCHAR(255) null, - OwnerMask INT null, - NextOwnerMask INT null, - GroupMask INT null, - EveryoneMask INT null, - BaseMask INT null, - PositionX REAL null, - PositionY REAL null, - PositionZ REAL null, - GroupPositionX REAL null, - GroupPositionY REAL null, - GroupPositionZ REAL null, - VelocityX REAL null, - VelocityY REAL null, - VelocityZ REAL null, - AngularVelocityX REAL null, - AngularVelocityY REAL null, - AngularVelocityZ REAL null, - AccelerationX REAL null, - AccelerationY REAL null, - AccelerationZ REAL null, - SitTargetOffsetX REAL null, - SitTargetOffsetY REAL null, - SitTargetOffsetZ REAL null, - RotationX REAL null, - RotationY REAL null, - RotationZ REAL null, - RotationW REAL null, - SitTargetOrientX REAL null, - SitTargetOrientY REAL null, - SitTargetOrientZ REAL null, - SitTargetOrientW REAL null, - ScaleX REAL null, - ScaleY REAL null, - ScaleZ REAL null, - PCode TINYINT null, - PathBegin INT null, - PathEnd INT null, - PathScaleX TINYINT null, - PathScaleY TINYINT null, - PathShearX TINYINT null, - PathShearY TINYINT null, - PathSkew TINYINT null, - PathCurve TINYINT null, - PathRadiusOffset TINYINT null, - PathRevolutions TINYINT null, - PathTaperX TINYINT null, - PathTaperY TINYINT null, - PathTwist TINYINT null, - ProfileBegin INT null, - ProfileEnd INT null, - ProfileCurve TINYINT null, - ProfileHollow INT null, - Texture VARBINARY(8000) null, - ExtraParams VARBINARY(8000) null, - State TINYINT null, - primary key (UUID) -) - -create table PrimItems ( - ItemID NVARCHAR(255) not null, - PrimID NVARCHAR(255) null, - AssetID NVARCHAR(255) null, - ParentFolderID NVARCHAR(255) null, - CreatorID NVARCHAR(255) null, - OwnerID NVARCHAR(255) null, - GroupID NVARCHAR(255) null, - LastOwnerID NVARCHAR(255) null, - CurrentPermissions INT null, - BasePermissions INT null, - EveryonePermissions INT null, - GroupPermissions INT null, - NextPermissions INT null, - Name NVARCHAR(255) null, - Description NVARCHAR(255) null, - CreationDate INT null, - Flags INT null, - Type INT null, - InvType INT null, - primary key (ItemID) -) - -create table Terrain ( - RegionID NVARCHAR(255) not null, - MapData VARBINARY(max) null, - primary key (RegionID) -) - - diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_UserStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_UserStore.sql deleted file mode 100644 index c9c6c89..0000000 --- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_UserStore.sql +++ /dev/null @@ -1,77 +0,0 @@ -create table UserAgents ( - ProfileID NVARCHAR(255) not null, - AgentIP NVARCHAR(24) null, - AgentPort INT null, - AgentOnline BIT null, - SessionID NVARCHAR(255) null, - SecureSessionID NVARCHAR(255) null, - InitialRegion NVARCHAR(255) null, - Region NVARCHAR(255) null, - LoginTime INT null, - LogoutTime INT null, - Handle BIGINT null, - primary key (ProfileID) -) - -create table UserProfiles ( - ID NVARCHAR(255) not null, - FirstName NVARCHAR(32) null, - SurName NVARCHAR(32) null, - PasswordHash NVARCHAR(32) null, - PasswordSalt NVARCHAR(32) null, - WebLoginKey NVARCHAR(255) null, - HomeRegionX INT null, - HomeRegionY INT null, - HomeLocationX REAL null, - HomeLocationY REAL null, - HomeLocationZ REAL null, - HomeLookAtX REAL null, - HomeLookAtY REAL null, - HomeLookAtZ REAL null, - Created INT null, - LastLogin INT null, - RootInventoryFolderID NVARCHAR(255) null, - UserInventoryURI NVARCHAR(255) null, - UserAssetURI NVARCHAR(255) null, - Image NVARCHAR(255) null, - FirstLifeImage NVARCHAR(255) null, - AboutText NVARCHAR(255) null, - FirstLifeAboutText NVARCHAR(255) null, - primary key (ID) -) -create table UserAppearances ( - Owner NVARCHAR(255) not null, - BodyItem NVARCHAR(255) null, - BodyAsset NVARCHAR(255) null, - SkinItem NVARCHAR(255) null, - SkinAsset NVARCHAR(255) null, - HairItem NVARCHAR(255) null, - HairAsset NVARCHAR(255) null, - EyesItem NVARCHAR(255) null, - EyesAsset NVARCHAR(255) null, - ShirtItem NVARCHAR(255) null, - ShirtAsset NVARCHAR(255) null, - PantsItem NVARCHAR(255) null, - PantsAsset NVARCHAR(255) null, - ShoesItem NVARCHAR(255) null, - ShoesAsset NVARCHAR(255) null, - SocksItem NVARCHAR(255) null, - SocksAsset NVARCHAR(255) null, - JacketItem NVARCHAR(255) null, - JacketAsset NVARCHAR(255) null, - GlovesItem NVARCHAR(255) null, - GlovesAsset NVARCHAR(255) null, - UnderShirtItem NVARCHAR(255) null, - UnderShirtAsset NVARCHAR(255) null, - UnderPantsItem NVARCHAR(255) null, - UnderPantsAsset NVARCHAR(255) null, - SkirtItem NVARCHAR(255) null, - SkirtAsset NVARCHAR(255) null, - Texture VARBINARY(8000) null, - VisualParams VARBINARY(8000) null, - Serial INT null, - primary key (Owner) -) - -create index user_surname on UserProfiles (SurName) -create index user_firstname on UserProfiles (FirstName) diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql deleted file mode 100644 index dfaac6e..0000000 --- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql +++ /dev/null @@ -1,51 +0,0 @@ -ALTER TABLE Prims ADD LinkNum INT null; -ALTER TABLE Prims ADD Material TINYINT null; -ALTER TABLE Prims ADD ScriptAccessPin INT null; -ALTER TABLE Prims ADD TextureAnimation VARBINARY(max) null; -ALTER TABLE Prims ADD ParticleSystem VARBINARY(max) null; -ALTER TABLE Prims ADD ClickAction TINYINT null; -ALTER TABLE Prims ADD Color INT null; - -CREATE TABLE RegionSettings -( - RegionID NVARCHAR(255) NOT NULL, - BlockTerraform bit NOT NULL, - BlockFly bit NOT NULL, - AllowDamage bit NOT NULL, - RestrictPushing bit NOT NULL, - AllowLandResell bit NOT NULL, - AllowLandJoinDivide bit NOT NULL, - BlockShowInSearch bit NOT NULL, - AgentLimit int NOT NULL, - ObjectBonus float(53) NOT NULL, - Maturity int NOT NULL, - DisableScripts bit NOT NULL, - DisableCollisions bit NOT NULL, - DisablePhysics bit NOT NULL, - TerrainTexture1 NVARCHAR(36) NOT NULL, - TerrainTexture2 NVARCHAR(36) NOT NULL, - TerrainTexture3 NVARCHAR(36) NOT NULL, - TerrainTexture4 NVARCHAR(36) NOT NULL, - Elevation1NW float(53) NOT NULL, - Elevation2NW float(53) NOT NULL, - Elevation1NE float(53) NOT NULL, - Elevation2NE float(53) NOT NULL, - Elevation1SE float(53) NOT NULL, - Elevation2SE float(53) NOT NULL, - Elevation1SW float(53) NOT NULL, - Elevation2SW float(53) NOT NULL, - WaterHeight float(53) NOT NULL, - TerrainRaiseLimit float(53) NOT NULL, - TerrainLowerLimit float(53) NOT NULL, - UseEstateSun bit NOT NULL, - FixedSun bit NOT NULL, - SunPosition float(53) NOT NULL, - Covenant NVARCHAR(36) NULL DEFAULT (NULL), - Sandbox bit NOT NULL, - SunVectorX float(53) NOT NULL DEFAULT ((0)), - SunVectorY float(53) NOT NULL DEFAULT ((0)), - SunVectorZ float(53) NOT NULL DEFAULT ((0)), - - primary key (RegionID) -) - diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql deleted file mode 100644 index f5e0c00..0000000 --- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql +++ /dev/null @@ -1,27 +0,0 @@ -ALTER TABLE UserAgents ADD PositionX REAL null; -ALTER TABLE UserAgents ADD PositionY REAL null; -ALTER TABLE UserAgents ADD PositionZ REAL null; -ALTER TABLE UserAgents ADD LookAtX REAL null; -ALTER TABLE UserAgents ADD LookAtY REAL null; -ALTER TABLE UserAgents ADD LookAtZ REAL null; - -ALTER TABLE UserProfiles ADD Email NVARCHAR(250) null; -ALTER TABLE UserProfiles ADD HomeRegionID NVARCHAR(36) null; -ALTER TABLE UserProfiles ADD CanDoMask INT null; -ALTER TABLE UserProfiles ADD WantDoMask INT null; -ALTER TABLE UserProfiles ADD UserFlags INT null; -ALTER TABLE UserProfiles ADD GodLevel INT null; -ALTER TABLE UserProfiles ADD CustomType NVARCHAR(32) null; -ALTER TABLE UserProfiles ADD Partner NVARCHAR(36) null; - -ALTER TABLE UserAppearances ADD AvatarHeight FLOAT null; - -CREATE TABLE UserFriends ( - UserFriendID NVARCHAR(36) NOT NULL, - OwnerID NVARCHAR(36) NULL, - FriendID NVARCHAR(36) NULL, - FriendPermissions INT NULL, - PRIMARY KEY (UserFriendID) -); - -CREATE INDEX UserFriendsOwnerIdFriendIdIndex ON UserFriends (OwnerID,FriendID); -- cgit v1.1