diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Data/SQLite/SQLiteXInventoryData.cs | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteXInventoryData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteXInventoryData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs index 02edc30..16f9046 100644 --- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs +++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs | |||
| @@ -41,7 +41,7 @@ using OpenSim.Framework; | |||
| 41 | namespace OpenSim.Data.SQLite | 41 | namespace OpenSim.Data.SQLite |
| 42 | { | 42 | { |
| 43 | /// <summary> | 43 | /// <summary> |
| 44 | /// A MySQL Interface for the Asset Server | 44 | /// A SQLite Interface for the Asset Server |
| 45 | /// </summary> | 45 | /// </summary> |
| 46 | public class SQLiteXInventoryData : IXInventoryData | 46 | public class SQLiteXInventoryData : IXInventoryData |
| 47 | { | 47 | { |