From 9363d4c7848f9332fdb0d43219f0f05313e6e2d5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Jan 2015 00:00:02 +0000
Subject: Use ToString() on uuids returned in
 PGSQLUserProfilesData.GetUserImageAssets().  These are Guids rather than
 strings so casting to string generates a casting exception.

Relates to http://opensimulator.org/mantis/view.php?id=7398
---
 OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index 301d3dd..d00c3cf 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -814,7 +814,7 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"]));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
@@ -833,7 +833,7 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"]));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
@@ -854,8 +854,8 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["profileImage"]));
-                                    data.Add(new OSDString((string)reader["profileFirstImage"]));
+                                    data.Add(new OSDString(reader["profileImage"].ToString()));
+                                    data.Add(new OSDString(reader["profileFirstImage"].ToString()));
                                 }
                             }
                         }
@@ -864,7 +864,7 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.Error("[PROFILES_DATA]: GetAvatarNotes exception ", e);
+                m_log.Error("[PROFILES_DATA]: GetUserImageAssets exception ", e);
             }
 
             return data;
-- 
cgit v1.1