diff options
author | Sean Dague | 2008-07-16 21:27:55 +0000 |
---|---|---|
committer | Sean Dague | 2008-07-16 21:27:55 +0000 |
commit | d3190236cc8a9ec3ed8b112d845e85dd69fcbcdf (patch) | |
tree | 9f0de83f906664cba67ffbefb7c1a2ee1a68f72a /OpenSim | |
parent | made SOP have a blank setter for 2 convenience properties. (diff) | |
download | opensim-SC-d3190236cc8a9ec3ed8b112d845e85dd69fcbcdf.zip opensim-SC-d3190236cc8a9ec3ed8b112d845e85dd69fcbcdf.tar.gz opensim-SC-d3190236cc8a9ec3ed8b112d845e85dd69fcbcdf.tar.bz2 opensim-SC-d3190236cc8a9ec3ed8b112d845e85dd69fcbcdf.tar.xz |
fix RegionStore creation so that the .sql file works
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateRegionData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs index 1c9e363..98d82a1 100644 --- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs +++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs | |||
@@ -54,10 +54,10 @@ namespace OpenSim.Data.NHibernate | |||
54 | private ISessionFactory factory; | 54 | private ISessionFactory factory; |
55 | private ISession session; | 55 | private ISession session; |
56 | 56 | ||
57 | public void Initialise() | 57 | // public void Initialise() |
58 | { | 58 | // { |
59 | Initialise("SQLiteDialect;SqliteClientDriver;URI=file:OpenSim.db,version=3", true); | 59 | // Initialise("SQLiteDialect;SqliteClientDriver;URI=file:OpenSim.db,version=3", true); |
60 | } | 60 | // } |
61 | 61 | ||
62 | public void Initialise(string connect, bool persistpriminventories) | 62 | public void Initialise(string connect, bool persistpriminventories) |
63 | { | 63 | { |
@@ -67,7 +67,7 @@ namespace OpenSim.Data.NHibernate | |||
67 | if (parts.Length != 3) | 67 | if (parts.Length != 3) |
68 | { | 68 | { |
69 | // TODO: make this a real exception type | 69 | // TODO: make this a real exception type |
70 | throw new Exception("Malformed Inventory connection string '" + connect + "'"); | 70 | throw new Exception("Malformed Region connection string '" + connect + "'"); |
71 | } | 71 | } |
72 | 72 | ||
73 | string dialect = parts[0]; | 73 | string dialect = parts[0]; |
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql index 1811a44..99a5227 100644 --- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql | |||
@@ -74,6 +74,6 @@ CREATE TABLE `Prims` ( | |||
74 | `ExtraParams` longblob, | 74 | `ExtraParams` longblob, |
75 | PRIMARY KEY (`UUID`), | 75 | PRIMARY KEY (`UUID`), |
76 | KEY `prims_regionuuid` (`RegionID`), | 76 | KEY `prims_regionuuid` (`RegionID`), |
77 | KEY 'prims_parentuuid' ('ParentUUID') | 77 | KEY `prims_parentuuid` (`ParentUUID`) |
78 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | 78 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
79 | 79 | ||