aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-08-11 20:02:34 +0000
committerMW2007-08-11 20:02:34 +0000
commitcea2e45da99681a73fa846e71fdb76526cc3b2f4 (patch)
tree22e395d28318aa1635321dfae174e49cf0659361
parentApplied danx0r 's ODE patch [mantis issue 263] (diff)
downloadopensim-SC_OLD-cea2e45da99681a73fa846e71fdb76526cc3b2f4.zip
opensim-SC_OLD-cea2e45da99681a73fa846e71fdb76526cc3b2f4.tar.gz
opensim-SC_OLD-cea2e45da99681a73fa846e71fdb76526cc3b2f4.tar.bz2
opensim-SC_OLD-cea2e45da99681a73fa846e71fdb76526cc3b2f4.tar.xz
A attempt to fix the user manager db4o crash bug (where you have to delete userprofiles.yap to get opensim to start)
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oManager.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 0e32938..c582866 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -123,7 +123,10 @@ namespace OpenSim.Framework.Data.DB4o
123 IObjectSet result = database.Get(typeof(UserProfileData)); 123 IObjectSet result = database.Get(typeof(UserProfileData));
124 foreach (UserProfileData row in result) 124 foreach (UserProfileData row in result)
125 { 125 {
126 userProfiles.Add(row.UUID, row); 126 if (!userProfiles.ContainsKey(row.UUID))
127 {
128 userProfiles.Add(row.UUID, row);
129 }
127 } 130 }
128 database.Close(); 131 database.Close();
129 } 132 }