diff options
| author | John Hurliman | 2010-02-22 14:18:59 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-22 14:18:59 -0800 |
| commit | df76e95aa2dc9f3f3a0c546761b7624adc183ed0 (patch) | |
| tree | 74e7cc684b12ca9b67e01e62bfcf481c1da98eb2 /OpenSim/ApplicationPlugins/Rest | |
| parent | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... (diff) | |
| download | opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.zip opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.gz opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.bz2 opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.xz | |
Changed asset CreatorID to a string
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | 4 | ||||
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index 54ce80e..4ba3d77 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | |||
| @@ -261,7 +261,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 261 | modified = (asset != null); | 261 | modified = (asset != null); |
| 262 | created = !modified; | 262 | created = !modified; |
| 263 | 263 | ||
| 264 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero); | 264 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero.ToString()); |
| 265 | asset.Description = xml.GetAttribute("desc"); | 265 | asset.Description = xml.GetAttribute("desc"); |
| 266 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; | 266 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; |
| 267 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; | 267 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; |
| @@ -338,7 +338,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 338 | modified = (asset != null); | 338 | modified = (asset != null); |
| 339 | created = !modified; | 339 | created = !modified; |
| 340 | 340 | ||
| 341 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero); | 341 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero.ToString()); |
| 342 | asset.Description = xml.GetAttribute("desc"); | 342 | asset.Description = xml.GetAttribute("desc"); |
| 343 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; | 343 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; |
| 344 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; | 344 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 9ab2763..10f387d 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
| @@ -1871,7 +1871,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 1871 | 1871 | ||
| 1872 | // Create AssetBase entity to hold the inlined asset | 1872 | // Create AssetBase entity to hold the inlined asset |
| 1873 | 1873 | ||
| 1874 | asset = new AssetBase(uuid, name, type, UUID.Zero); | 1874 | asset = new AssetBase(uuid, name, type, UUID.Zero.ToString()); |
| 1875 | 1875 | ||
| 1876 | asset.Description = desc; | 1876 | asset.Description = desc; |
| 1877 | asset.Local = local; | 1877 | asset.Local = local; |