aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorBrian McBee2008-02-02 18:20:25 +0000
committerBrian McBee2008-02-02 18:20:25 +0000
commitbd32563c4c376cd655e745715ea157aa3d421edf (patch)
tree609ef4c3bcec6961e94fd922595039fdde9c3ae8 /OpenSim/Framework
parent* Added a way to temporarily disable physics using the estate tools (diff)
downloadopensim-SC_OLD-bd32563c4c376cd655e745715ea157aa3d421edf.zip
opensim-SC_OLD-bd32563c4c376cd655e745715ea157aa3d421edf.tar.gz
opensim-SC_OLD-bd32563c4c376cd655e745715ea157aa3d421edf.tar.bz2
opensim-SC_OLD-bd32563c4c376cd655e745715ea157aa3d421edf.tar.xz
fix for error on null owner_uuid field
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index dba367e..3df0242 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -343,7 +343,14 @@ namespace OpenSim.Framework.Data.MySQL
343 // for the UUID of the region's owner (master avatar) 343 // for the UUID of the region's owner (master avatar)
344 // 344 //
345 //retval.owner_uuid = (string) reader["owner_uuid"]; 345 //retval.owner_uuid = (string) reader["owner_uuid"];
346 retval.owner_uuid = new LLUUID((string)reader["owner_uuid"]); 346 try
347 {
348 retval.owner_uuid = new LLUUID((string)reader["owner_uuid"]);
349 }
350 catch
351 {
352 retval.owner_uuid = LLUUID.Zero;
353 }
347 // 354 //
348 // end of daTwitch's mods to this file 355 // end of daTwitch's mods to this file
349 } 356 }