diff options
author | Mike Mazur | 2009-02-17 01:36:44 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-17 01:36:44 +0000 |
commit | 76c0935ec744f2d230489398f879eb7f42b11d37 (patch) | |
tree | a68253554e3899f10b6c341db369ce4a029dfaa5 /OpenSim/Region/Communications/Hypergrid | |
parent | Major change to how appearance is managed, including changes in login and use... (diff) | |
download | opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.zip opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.tar.gz opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.tar.bz2 opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.tar.xz |
- remove the Metadata property from AssetBase and return all previous
properties as before
- prefix private variables with m_ in AssetBase.cs
- related to Mantis #3122, as mentioned in
https://lists.berlios.de/pipermail/opensim-dev/2009-February/005088.html
- all services will likely need to be upgraded after this commit
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index 72c0f42..a61c07a 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | |||
@@ -318,9 +318,9 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
318 | //Console.WriteLine("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); | 318 | //Console.WriteLine("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); |
319 | byte[] imageData = OpenJPEG.EncodeFromImage(m, true); | 319 | byte[] imageData = OpenJPEG.EncodeFromImage(m, true); |
320 | AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString()); | 320 | AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString()); |
321 | info.RegionSettings.TerrainImageID = ass.Metadata.FullID; | 321 | info.RegionSettings.TerrainImageID = ass.FullID; |
322 | ass.Metadata.Type = (int)AssetType.Texture; | 322 | ass.Type = (int)AssetType.Texture; |
323 | ass.Metadata.Temporary = false; | 323 | ass.Temporary = false; |
324 | ass.Data = imageData; | 324 | ass.Data = imageData; |
325 | m_assetcache.AddAsset(ass); | 325 | m_assetcache.AddAsset(ass); |
326 | 326 | ||