aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.MySQL
diff options
context:
space:
mode:
authorlbsa712007-12-28 08:34:38 +0000
committerlbsa712007-12-28 08:34:38 +0000
commit8cd72beb86d2a563bdaf88b20aa76d9bafa6b971 (patch)
tree8eaac3b70eb4b62db89cdfc7b854e85fa2430255 /OpenSim/Framework/Data.MySQL
parent* Patch from Melanie. Thanks Melanie! (diff)
downloadopensim-SC_OLD-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.zip
opensim-SC_OLD-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.gz
opensim-SC_OLD-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.bz2
opensim-SC_OLD-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.xz
* Moved PrimitiveBaseShape subclasses into factory methods - the subclassing scheme won't hold for serialization
* Extracted out the 'old' AddNewPrimitive that places an object at an exact pos, without the raytracing
Diffstat (limited to 'OpenSim/Framework/Data.MySQL')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index fcf8c6f..3c25533 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -203,7 +203,7 @@ namespace OpenSim.Framework.Data.MySQL
203 { 203 {
204 MainLog.Instance.Notice( 204 MainLog.Instance.Notice(
205 "No shape found for prim in storage, so setting default box shape"); 205 "No shape found for prim in storage, so setting default box shape");
206 prim.Shape = BoxShape.Default; 206 prim.Shape = PrimitiveBaseShape.Default;
207 } 207 }
208 group.AddPart(prim); 208 group.AddPart(prim);
209 group.RootPart = prim; 209 group.RootPart = prim;
@@ -223,7 +223,7 @@ namespace OpenSim.Framework.Data.MySQL
223 { 223 {
224 MainLog.Instance.Notice( 224 MainLog.Instance.Notice(
225 "No shape found for prim in storage, so setting default box shape"); 225 "No shape found for prim in storage, so setting default box shape");
226 prim.Shape = BoxShape.Default; 226 prim.Shape = PrimitiveBaseShape.Default;
227 } 227 }
228 createdObjects[new LLUUID(objID)].AddPart(prim); 228 createdObjects[new LLUUID(objID)].AddPart(prim);
229 } 229 }