diff options
| author | Justin Clark-Casey (justincc) | 2015-01-14 00:00:02 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2015-01-14 00:00:02 +0000 |
| commit | 9363d4c7848f9332fdb0d43219f0f05313e6e2d5 (patch) | |
| tree | 80663db95f597786fc52a9b835ac16b16952d66f | |
| parent | Fix PGSQLUserProfilesData.GetUserPreferences error when no usersettings yet e... (diff) | |
| download | opensim-SC-9363d4c7848f9332fdb0d43219f0f05313e6e2d5.zip opensim-SC-9363d4c7848f9332fdb0d43219f0f05313e6e2d5.tar.gz opensim-SC-9363d4c7848f9332fdb0d43219f0f05313e6e2d5.tar.bz2 opensim-SC-9363d4c7848f9332fdb0d43219f0f05313e6e2d5.tar.xz | |
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
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs | 10 |
1 files changed, 5 insertions, 5 deletions
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 | |||
| 814 | { | 814 | { |
| 815 | while (reader.Read()) | 815 | while (reader.Read()) |
| 816 | { | 816 | { |
| 817 | data.Add(new OSDString((string)reader["snapshotuuid"])); | 817 | data.Add(new OSDString(reader["snapshotuuid"].ToString())); |
| 818 | } | 818 | } |
| 819 | } | 819 | } |
| 820 | } | 820 | } |
| @@ -833,7 +833,7 @@ namespace OpenSim.Data.PGSQL | |||
| 833 | { | 833 | { |
| 834 | while (reader.Read()) | 834 | while (reader.Read()) |
| 835 | { | 835 | { |
| 836 | data.Add(new OSDString((string)reader["snapshotuuid"])); | 836 | data.Add(new OSDString(reader["snapshotuuid"].ToString())); |
| 837 | } | 837 | } |
| 838 | } | 838 | } |
| 839 | } | 839 | } |
| @@ -854,8 +854,8 @@ namespace OpenSim.Data.PGSQL | |||
| 854 | { | 854 | { |
| 855 | while (reader.Read()) | 855 | while (reader.Read()) |
| 856 | { | 856 | { |
| 857 | data.Add(new OSDString((string)reader["profileImage"])); | 857 | data.Add(new OSDString(reader["profileImage"].ToString())); |
| 858 | data.Add(new OSDString((string)reader["profileFirstImage"])); | 858 | data.Add(new OSDString(reader["profileFirstImage"].ToString())); |
| 859 | } | 859 | } |
| 860 | } | 860 | } |
| 861 | } | 861 | } |
| @@ -864,7 +864,7 @@ namespace OpenSim.Data.PGSQL | |||
| 864 | } | 864 | } |
| 865 | catch (Exception e) | 865 | catch (Exception e) |
| 866 | { | 866 | { |
| 867 | m_log.Error("[PROFILES_DATA]: GetAvatarNotes exception ", e); | 867 | m_log.Error("[PROFILES_DATA]: GetUserImageAssets exception ", e); |
| 868 | } | 868 | } |
| 869 | 869 | ||
| 870 | return data; | 870 | return data; |