Thank you kindly, TLaukkan (Tommil) for a patch that:

* Created value object for EstateRegionLink for storing the estate region relationship.
* Refactored slightly NHibernateManager and NHibernateXXXXData implementations for accesing nhibernate generated ID on insert.
** Changed NHibernateManager.Save method name to Insert as it does Insert.
** Changed NHibernateManager.Save return value object as ID can be both UUID and uint currently.
** Changed NHibernateManager.Load method Id parameter to object as it can be both UUID and uint.
* Created NHibernateEstateData implementation. This is the actual estate storage.
* Created NHibernate mapping files for both EstateSettings and EstateRegionLink
* Created MigrationSyntaxDifferences.txt files to write notes about differences in migration scripts between different databases.
* Created estate storage migration scripts for all four databases.
* Created estate unit test classes for all four databases.
* Updated one missing field to BasicEstateTest.cs
* Tested NHibernate unit tests with NUnit GUI. Asset databases fail but that is not related to this patch.
* Tested build with both Visual Studio and nant.
* Executed build tests with nant succesfully.

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 7dfdcb5..3f1f260 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Data.NHibernate
             if (!ExistsUser(profile.ID))
             {
                 m_log.InfoFormat("[NHIBERNATE] AddNewUserProfile {0}", profile.ID);
-                manager.Save(profile);
+                manager.Insert(profile);
                 // Agent should not be saved according to BasicUserTest.T015_UserPersistency()
                 // SetAgentData(profile.ID, profile.CurrentAgent);
 
@@ -169,7 +169,7 @@ namespace OpenSim.Data.NHibernate
                 manager.Delete(old);
             }
             
-            manager.Save(agent);
+            manager.Insert(agent);
             
         }
 
@@ -245,11 +245,11 @@ namespace OpenSim.Data.NHibernate
         {
             if (!FriendRelationExists(ownerId,friendId))
             {
-                manager.Save(new UserFriend(UUID.Random(), ownerId, friendId, perms));
+                manager.Insert(new UserFriend(UUID.Random(), ownerId, friendId, perms));
             }
             if (!FriendRelationExists(friendId, ownerId))
             {
-                manager.Save(new UserFriend(UUID.Random(), friendId, ownerId, perms));
+                manager.Insert(new UserFriend(UUID.Random(), friendId, ownerId, perms));
             }
             return;         
         }
@@ -426,7 +426,7 @@ namespace OpenSim.Data.NHibernate
             }
             else
             {
-                manager.Save(appearance);
+                manager.Insert(appearance);
             }
         }