diff options
author | Justin Clarke Casey | 2008-07-02 16:20:54 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-02 16:20:54 +0000 |
commit | 9052c43319ab69f57b80e363d965780be625b0e2 (patch) | |
tree | 3e17e9c0908be54ecb01ddff824d6c1a32020e88 /OpenSim/Framework | |
parent | Mantis#1647. Thank you kindly, Sempuki for a patch that: (diff) | |
download | opensim-SC_OLD-9052c43319ab69f57b80e363d965780be625b0e2.zip opensim-SC_OLD-9052c43319ab69f57b80e363d965780be625b0e2.tar.gz opensim-SC_OLD-9052c43319ab69f57b80e363d965780be625b0e2.tar.bz2 opensim-SC_OLD-9052c43319ab69f57b80e363d965780be625b0e2.tar.xz |
* Drop InvType from the assets table since it is no longer used
* Migration should be automatic on sqlite and mysql
* Migration is not automatic on mssql, you will need to drop the invType column manually
* Migration should be fine, but as for any db change, I would recommend making sure you have backups before moving past this revision
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AssetBase.cs | 9 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 1 |
3 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 2b37daa..c3e4095 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
@@ -76,15 +76,6 @@ namespace OpenSim.Framework | |||
76 | set { _type = value; } | 76 | set { _type = value; } |
77 | } | 77 | } |
78 | 78 | ||
79 | /// <summary> | ||
80 | /// PLEASE DON'T USE ME. I'm probably going away soon. | ||
81 | /// </summary> | ||
82 | public virtual sbyte InvType | ||
83 | { | ||
84 | get { return _invtype; } | ||
85 | set { _invtype = value; } | ||
86 | } | ||
87 | |||
88 | public virtual string Name | 79 | public virtual string Name |
89 | { | 80 | { |
90 | get { return _name; } | 81 | get { return _name; } |
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 95af28b..f160ce4 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -701,7 +701,6 @@ namespace OpenSim.Framework.Communications.Cache | |||
701 | Data = aBase.Data; | 701 | Data = aBase.Data; |
702 | FullID = aBase.FullID; | 702 | FullID = aBase.FullID; |
703 | Type = aBase.Type; | 703 | Type = aBase.Type; |
704 | InvType = aBase.InvType; | ||
705 | Name = aBase.Name; | 704 | Name = aBase.Name; |
706 | Description = aBase.Description; | 705 | Description = aBase.Description; |
707 | } | 706 | } |
@@ -718,7 +717,6 @@ namespace OpenSim.Framework.Communications.Cache | |||
718 | Data = aBase.Data; | 717 | Data = aBase.Data; |
719 | FullID = aBase.FullID; | 718 | FullID = aBase.FullID; |
720 | Type = aBase.Type; | 719 | Type = aBase.Type; |
721 | InvType = aBase.InvType; | ||
722 | Name = aBase.Name; | 720 | Name = aBase.Name; |
723 | Description = aBase.Description; | 721 | Description = aBase.Description; |
724 | } | 722 | } |
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 5aba086..7350d4d 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -670,7 +670,6 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
670 | asset = new AssetBase(); | 670 | asset = new AssetBase(); |
671 | asset.FullID = assetID; | 671 | asset.FullID = assetID; |
672 | asset.Type = assType; | 672 | asset.Type = assType; |
673 | asset.InvType = inType; | ||
674 | asset.Name = assetName; | 673 | asset.Name = assetName; |
675 | asset.Data = data; | 674 | asset.Data = data; |
676 | m_assetCache.AddAsset(asset); | 675 | m_assetCache.AddAsset(asset); |