diff options
| author | Jonathan Freedman | 2010-11-21 20:01:48 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 20:01:48 -0800 |
| commit | b7f5e8284360f92e0e102b9546076573c57d9397 (patch) | |
| tree | 132663da8c1882e524241b55a739ef2758ef8958 /OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |
| parent | Merge https://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC-b7f5e8284360f92e0e102b9546076573c57d9397.zip opensim-SC-b7f5e8284360f92e0e102b9546076573c57d9397.tar.gz opensim-SC-b7f5e8284360f92e0e102b9546076573c57d9397.tar.bz2 opensim-SC-b7f5e8284360f92e0e102b9546076573c57d9397.tar.xz | |
Merge branch 'master-core' into mantis5110
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index d606f11..7dc07ec 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |||
| @@ -156,7 +156,7 @@ namespace OpenSim.Data.SQLite | |||
| 156 | item.InvType = Convert.ToInt32(row["invType"]); | 156 | item.InvType = Convert.ToInt32(row["invType"]); |
| 157 | item.Folder = new UUID((string) row["parentFolderID"]); | 157 | item.Folder = new UUID((string) row["parentFolderID"]); |
| 158 | item.Owner = new UUID((string) row["avatarID"]); | 158 | item.Owner = new UUID((string) row["avatarID"]); |
| 159 | item.CreatorId = (string)row["creatorsID"]; | 159 | item.CreatorIdentification = (string)row["creatorsID"]; |
| 160 | item.Name = (string) row["inventoryName"]; | 160 | item.Name = (string) row["inventoryName"]; |
| 161 | item.Description = (string) row["inventoryDescription"]; | 161 | item.Description = (string) row["inventoryDescription"]; |
| 162 | 162 | ||
| @@ -201,7 +201,7 @@ namespace OpenSim.Data.SQLite | |||
| 201 | row["invType"] = item.InvType; | 201 | row["invType"] = item.InvType; |
| 202 | row["parentFolderID"] = item.Folder.ToString(); | 202 | row["parentFolderID"] = item.Folder.ToString(); |
| 203 | row["avatarID"] = item.Owner.ToString(); | 203 | row["avatarID"] = item.Owner.ToString(); |
| 204 | row["creatorsID"] = item.CreatorId.ToString(); | 204 | row["creatorsID"] = item.CreatorIdentification.ToString(); |
| 205 | row["inventoryName"] = item.Name; | 205 | row["inventoryName"] = item.Name; |
| 206 | row["inventoryDescription"] = item.Description; | 206 | row["inventoryDescription"] = item.Description; |
| 207 | 207 | ||