diff options
author | Justin Clarke Casey | 2007-12-20 19:13:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2007-12-20 19:13:34 +0000 |
commit | f1ebe79824aa82fa30af35d07bf6720e719cd741 (patch) | |
tree | 18f43d04bdf2547dd66274a96f22c85171fc892a /OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs | |
parent | Establish Util.ToRawUuidString to get LLUUIDs in unhyphenated form (diff) | |
download | opensim-SC-f1ebe79824aa82fa30af35d07bf6720e719cd741.zip opensim-SC-f1ebe79824aa82fa30af35d07bf6720e719cd741.tar.gz opensim-SC-f1ebe79824aa82fa30af35d07bf6720e719cd741.tar.bz2 opensim-SC-f1ebe79824aa82fa30af35d07bf6720e719cd741.tar.xz |
Fix up other sqlite db interactions to use non-hyphenated uuid
Inventory contents retrieval and persistent region storage standalone now appear to work as well as they did before :)
This patch will not fix grid problems.
May be bugs present due to conversions I didn't spot.
I personally probably don't have any more time for this today. I'm also not entirely convinced this is the right way forward
so this might be a handy pause for thought. I'll also be delighted if I wake up tommorrow and everything is fine again.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs index bf43e6e..6199911 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
79 | public AssetBase FetchAsset(LLUUID uuid) | 79 | public AssetBase FetchAsset(LLUUID uuid) |
80 | { | 80 | { |
81 | AssetBase asset = new AssetBase(); | 81 | AssetBase asset = new AssetBase(); |
82 | DataRow row = ds.Tables["assets"].Rows.Find(uuid); | 82 | DataRow row = ds.Tables["assets"].Rows.Find(Util.ToRawUuidString(uuid)); |
83 | if (row != null) | 83 | if (row != null) |
84 | { | 84 | { |
85 | return buildAsset(row); | 85 | return buildAsset(row); |
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
103 | DataTable assets = ds.Tables["assets"]; | 103 | DataTable assets = ds.Tables["assets"]; |
104 | lock (ds) | 104 | lock (ds) |
105 | { | 105 | { |
106 | DataRow row = assets.Rows.Find(asset.FullID); | 106 | DataRow row = assets.Rows.Find(Util.ToRawUuidString(asset.FullID)); |
107 | if (row == null) | 107 | if (row == null) |
108 | { | 108 | { |
109 | row = assets.NewRow(); | 109 | row = assets.NewRow(); |
@@ -130,7 +130,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
130 | 130 | ||
131 | public bool ExistsAsset(LLUUID uuid) | 131 | public bool ExistsAsset(LLUUID uuid) |
132 | { | 132 | { |
133 | DataRow row = ds.Tables["assets"].Rows.Find(uuid); | 133 | DataRow row = ds.Tables["assets"].Rows.Find(Util.ToRawUuidString(uuid)); |
134 | return (row != null); | 134 | return (row != null); |
135 | } | 135 | } |
136 | 136 | ||
@@ -138,7 +138,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
138 | { | 138 | { |
139 | lock (ds) | 139 | lock (ds) |
140 | { | 140 | { |
141 | DataRow row = ds.Tables["assets"].Rows.Find(uuid); | 141 | DataRow row = ds.Tables["assets"].Rows.Find(Util.ToRawUuidString(uuid)); |
142 | if (row != null) | 142 | if (row != null) |
143 | { | 143 | { |
144 | row.Delete(); | 144 | row.Delete(); |
@@ -210,7 +210,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
210 | 210 | ||
211 | private void fillAssetRow(DataRow row, AssetBase asset) | 211 | private void fillAssetRow(DataRow row, AssetBase asset) |
212 | { | 212 | { |
213 | row["UUID"] = asset.FullID; | 213 | row["UUID"] = Util.ToRawUuidString(asset.FullID); |
214 | row["Name"] = asset.Name; | 214 | row["Name"] = asset.Name; |
215 | if (asset.Description != null) | 215 | if (asset.Description != null) |
216 | { | 216 | { |