aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorBrian McBee2007-08-12 16:17:04 +0000
committerBrian McBee2007-08-12 16:17:04 +0000
commit95b89096c45f0a8768bc72f0dfe67c9d0d135d25 (patch)
tree54382e3a85318a1a4f727dd1a7898eacee8c8638 /OpenSim/Framework
parentInitial LSL to C# converter, not working yet! (diff)
downloadopensim-SC-95b89096c45f0a8768bc72f0dfe67c9d0d135d25.zip
opensim-SC-95b89096c45f0a8768bc72f0dfe67c9d0d135d25.tar.gz
opensim-SC-95b89096c45f0a8768bc72f0dfe67c9d0d135d25.tar.bz2
opensim-SC-95b89096c45f0a8768bc72f0dfe67c9d0d135d25.tar.xz
Hopefully fixes userprofiles.yap problem on startup. (thanks Adam!)
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oManager.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 230a707..ef8f7dd 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -123,11 +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 if (!userProfiles.ContainsKey(row.UUID)) 126 if (userProfiles.ContainsKey(row.UUID))
127 { 127 userProfiles[row.UUID] = row;
128 else
128 userProfiles.Add(row.UUID, row); 129 userProfiles.Add(row.UUID, row);
129 }
130
131 } 130 }
132 database.Close(); 131 database.Close();
133 } 132 }