diff options
author | Dan Lake | 2011-07-20 15:01:32 -0700 |
---|---|---|
committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
tree | d593e3d1130e78ec74a11650d413f451a9a844da /OpenSim/Data/SQLite/SQLiteXInventoryData.cs | |
parent | Merge branch 'master' into bulletsim (diff) | |
parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
download | opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to '')
-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 | { |