From 15ea9a5bf8c1ab6b06d302c7dde625b7f4d3e183 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 9 May 2024 23:04:05 +0100 Subject: [PATCH] change pgsql UUID casting (UNTESTED :( ) --- OpenSim/Data/PGSQL/PGSQLManager.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs index 183704b141..aedbb26952 100644 --- a/OpenSim/Data/PGSQL/PGSQLManager.cs +++ b/OpenSim/Data/PGSQL/PGSQLManager.cs @@ -166,10 +166,6 @@ namespace OpenSim.Data.PGSQL { Type valueType = value.GetType(); - if (valueType == typeof(UUID)) //TODO check if this works - { - return ((UUID) value).Guid; - } if (valueType == typeof(UUID)) { return ((UUID)value).Guid; @@ -199,9 +195,9 @@ namespace OpenSim.Data.PGSQL { if (PGFieldType == "uuid") { - UUID uidout; - UUID.TryParse(value.ToString(), out uidout); - return uidout; + if(value is not UUID uid) + UUID.TryParse(value.ToString(), out uid); + return uid.Guid; } if (PGFieldType == "integer") {