diff options
author | diva | 2009-05-22 04:23:59 +0000 |
---|---|---|
committer | diva | 2009-05-22 04:23:59 +0000 |
commit | da170cde4684ea0f8ed90ea4ed0b30172ad9981d (patch) | |
tree | 0ffc809b31853d81479fee0c4e053025d31adb9d /OpenSim/Framework/AssetBase.cs | |
parent | Removing the [UserService] section, because it's not working yet. (diff) | |
download | opensim-SC-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.zip opensim-SC-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.tar.gz opensim-SC-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.tar.bz2 opensim-SC-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.tar.xz |
Cleaning up a few HG things. HG Posts may now work in grids, but if the home grid is a standalone, this still doesn't work -- something wrong with RegionAssetService's DB connection.
Diffstat (limited to 'OpenSim/Framework/AssetBase.cs')
-rw-r--r-- | OpenSim/Framework/AssetBase.cs | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 0551533..361a6fa 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
@@ -160,6 +160,8 @@ namespace OpenSim.Framework | |||
160 | public class AssetMetadata | 160 | public class AssetMetadata |
161 | { | 161 | { |
162 | private UUID m_fullid; | 162 | private UUID m_fullid; |
163 | // m_id added as a dirty hack to transition from FullID to ID | ||
164 | private string m_id; | ||
163 | private string m_name = String.Empty; | 165 | private string m_name = String.Empty; |
164 | private string m_description = String.Empty; | 166 | private string m_description = String.Empty; |
165 | private DateTime m_creation_date; | 167 | private DateTime m_creation_date; |
@@ -174,13 +176,25 @@ namespace OpenSim.Framework | |||
174 | public UUID FullID | 176 | public UUID FullID |
175 | { | 177 | { |
176 | get { return m_fullid; } | 178 | get { return m_fullid; } |
177 | set { m_fullid = value; } | 179 | set { m_fullid = value; m_id = m_fullid.ToString(); } |
178 | } | 180 | } |
179 | 181 | ||
180 | public string ID | 182 | public string ID |
181 | { | 183 | { |
182 | get { return m_fullid.ToString(); } | 184 | //get { return m_fullid.ToString(); } |
183 | set { m_fullid = new UUID(value); } | 185 | //set { m_fullid = new UUID(value); } |
186 | get { return m_id; } | ||
187 | set | ||
188 | { | ||
189 | UUID uuid = UUID.Zero; | ||
190 | if (UUID.TryParse(value, out uuid)) | ||
191 | { | ||
192 | m_fullid = uuid; | ||
193 | m_id = m_fullid.ToString(); | ||
194 | } | ||
195 | else | ||
196 | m_id = value; | ||
197 | } | ||
184 | } | 198 | } |
185 | 199 | ||
186 | public string Name | 200 | public string Name |