aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-01-18 23:31:13 +0000
committerMelanie Thielker2009-01-18 23:31:13 +0000
commitc5395feadd0af49cfdb21f31eae8180330c75c2b (patch)
treed6bd80b1c56dbc70f5e5d9c78aff06a6f15e63f4 /OpenSim
parentMoved applying an impulse to a newly rezzed object to minimise the delay gett... (diff)
downloadopensim-SC_OLD-c5395feadd0af49cfdb21f31eae8180330c75c2b.zip
opensim-SC_OLD-c5395feadd0af49cfdb21f31eae8180330c75c2b.tar.gz
opensim-SC_OLD-c5395feadd0af49cfdb21f31eae8180330c75c2b.tar.bz2
opensim-SC_OLD-c5395feadd0af49cfdb21f31eae8180330c75c2b.tar.xz
Avoid an invalid cast on legacy data
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 23077f1..d4a7980 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -142,7 +142,14 @@ namespace OpenSim.Data.MySQL
142 asset.Data = (byte[]) dbReader["data"]; 142 asset.Data = (byte[]) dbReader["data"];
143 asset.Description = (string) dbReader["description"]; 143 asset.Description = (string) dbReader["description"];
144 asset.FullID = assetID; 144 asset.FullID = assetID;
145 asset.Local = (bool)dbReader["local"]; 145 try
146 {
147 asset.Local = (bool)dbReader["local"];
148 }
149 catch (System.InvalidCastException)
150 {
151 asset.Local = false;
152 }
146 asset.Name = (string) dbReader["name"]; 153 asset.Name = (string) dbReader["name"];
147 asset.Type = (sbyte) dbReader["assetType"]; 154 asset.Type = (sbyte) dbReader["assetType"];
148 } 155 }