diff options
-rw-r--r-- | OpenSim/Data/Migration.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql | 2 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml | 4 | ||||
-rw-r--r-- | prebuild.xml | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index 30cd3b6..9447deb 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs | |||
@@ -227,10 +227,11 @@ namespace OpenSim.Data | |||
227 | 227 | ||
228 | foreach (string s in names) | 228 | foreach (string s in names) |
229 | { | 229 | { |
230 | m_log.InfoFormat("[MIGRATION] - testing resoure {0}", s); | ||
230 | Match m = _match.Match(s); | 231 | Match m = _match.Match(s); |
231 | if (m.Success) | 232 | if (m.Success) |
232 | { | 233 | { |
233 | // m_log.Info("MIGRATION: Match: " + m.Groups[1].ToString()); | 234 | m_log.Info("MIGRATION: Match: " + m.Groups[1].ToString()); |
234 | int version = int.Parse(m.Groups[1].ToString()); | 235 | int version = int.Parse(m.Groups[1].ToString()); |
235 | if (version > after) { | 236 | if (version > after) { |
236 | using (Stream resource = _assem.GetManifestResourceStream(s)) | 237 | using (Stream resource = _assem.GetManifestResourceStream(s)) |
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql index e553cff..07994f4 100644 --- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql +++ b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql | |||
@@ -8,7 +8,7 @@ create table Assets( | |||
8 | Description varchar(64), | 8 | Description varchar(64), |
9 | Local boolean, | 9 | Local boolean, |
10 | Temporary boolean, | 10 | Temporary boolean, |
11 | Data blob, | 11 | Data blob |
12 | ); | 12 | ); |
13 | 13 | ||
14 | END; \ No newline at end of file | 14 | END; \ No newline at end of file |
diff --git a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml index 85d888d..0070e06 100644 --- a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | 1 | <?xml version="1.0" encoding="utf-8" ?> |
2 | <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> | 2 | <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> |
3 | <class name="OpenSim.Framework.UserAppearance, OpenSim.Framework" table="UserAppearances" lazy="false"> | 3 | <class name="OpenSim.Framework.AvatarAppearance, OpenSim.Framework" table="UserAppearances" lazy="false"> |
4 | <id name="User" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> | 4 | <id name="Owner" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> |
5 | <generator class="assigned" /> | 5 | <generator class="assigned" /> |
6 | </id> | 6 | </id> |
7 | <property name="BodyItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> | 7 | <property name="BodyItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> |
diff --git a/prebuild.xml b/prebuild.xml index e5dd324..7413b1b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1339,6 +1339,9 @@ | |||
1339 | <Files> | 1339 | <Files> |
1340 | <Match pattern="*.cs" recurse="true"/> | 1340 | <Match pattern="*.cs" recurse="true"/> |
1341 | <Match path="Resources" pattern="*.xml" buildAction="EmbeddedResource"/> | 1341 | <Match path="Resources" pattern="*.xml" buildAction="EmbeddedResource"/> |
1342 | <!-- add more as you go --> | ||
1343 | <Match path="Resources/SQLiteDialect" pattern="*.sql" buildAction="EmbeddedResource"/> | ||
1344 | <Match path="Resources/MySQLDialect" pattern="*.sql" buildAction="EmbeddedResource"/> | ||
1342 | </Files> | 1345 | </Files> |
1343 | </Project> | 1346 | </Project> |
1344 | 1347 | ||