aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorSean Dague2008-07-23 22:14:37 +0000
committerSean Dague2008-07-23 22:14:37 +0000
commit1c9551eaaed5c35eb22075cbecbe24fe15343cbd (patch)
tree9d8ed9b3aa95585b79cbe84f4fca21fee1c90a63 /OpenSim/Data
parentcatch a null case in the convenience RegionID property (diff)
downloadopensim-SC_OLD-1c9551eaaed5c35eb22075cbecbe24fe15343cbd.zip
opensim-SC_OLD-1c9551eaaed5c35eb22075cbecbe24fe15343cbd.tar.gz
opensim-SC_OLD-1c9551eaaed5c35eb22075cbecbe24fe15343cbd.tar.bz2
opensim-SC_OLD-1c9551eaaed5c35eb22075cbecbe24fe15343cbd.tar.xz
few additional fixed to get prim inventory up on nhibernate
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs4
-rw-r--r--OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql1
-rw-r--r--OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml3
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 86a93f2..52db32d 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -259,7 +259,9 @@ namespace OpenSim.Data.NHibernate
259 { 259 {
260 inventory.Add(i); 260 inventory.Add(i);
261 } 261 }
262 p.RestoreInventoryItems(inventory); 262
263 if (inventory.Count > 0)
264 p.RestoreInventoryItems(inventory);
263 } 265 }
264 foreach (SceneObjectGroup g in SOG.Values) 266 foreach (SceneObjectGroup g in SOG.Values)
265 { 267 {
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql
index 2cf46b5..230e93c 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql
@@ -2,7 +2,6 @@ BEGIN;
2 2
3CREATE TABLE `PrimItems` ( 3CREATE TABLE `PrimItems` (
4 `InvType` int(11) default NULL, 4 `InvType` int(11) default NULL,
5 `AssetType` int(11) default NULL,
6 `Name` varchar(255) default NULL, 5 `Name` varchar(255) default NULL,
7 `Description` varchar(255) default NULL, 6 `Description` varchar(255) default NULL,
8 `CreationDate` bigint(20) default NULL, 7 `CreationDate` bigint(20) default NULL,
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
index ffaea51..ef3ab9b 100644
--- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
@@ -116,7 +116,7 @@
116 </id> 116 </id>
117 <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 117 <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
118 <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 118 <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
119 <property name="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 119 <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
120 <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 120 <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
121 <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 121 <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
122 <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 122 <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
@@ -131,6 +131,5 @@
131 <property name="CreationDate" type="System.UInt32" /> 131 <property name="CreationDate" type="System.UInt32" />
132 <property name="Flags" type="System.UInt32" /> 132 <property name="Flags" type="System.UInt32" />
133 <property name="InvType" type="System.Int32" /> 133 <property name="InvType" type="System.Int32" />
134 <property name="AssetType" type="System.Int32" />
135 </class> 134 </class>
136</hibernate-mapping> \ No newline at end of file 135</hibernate-mapping> \ No newline at end of file