diff options
| author | John Hurliman | 2010-02-22 13:27:17 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-22 13:27:17 -0800 |
| commit | 7665aad002ef066fc31fa9497225d2668641c769 (patch) | |
| tree | ce2ad89f1ffd20c6f5e9a3b6558f7b90c651c830 /OpenSim/Services/Connectors/Hypergrid | |
| parent | * Added a sanity check for missing asset data in LLClientView (diff) | |
| download | opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.zip opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.gz opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.bz2 opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.xz | |
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid')
| -rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 608228d..bbe4a94 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
| @@ -131,7 +131,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 131 | Bitmap m = new Bitmap(filename + ".jpg"); | 131 | Bitmap m = new Bitmap(filename + ".jpg"); |
| 132 | //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); | 132 | //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); |
| 133 | byte[] imageData = OpenJPEG.EncodeFromImage(m, true); | 133 | byte[] imageData = OpenJPEG.EncodeFromImage(m, true); |
| 134 | AssetBase ass = new AssetBase(UUID.Random(), "region " + filename, (sbyte)AssetType.Texture); | 134 | AssetBase ass = new AssetBase(UUID.Random(), "region " + filename, (sbyte)AssetType.Texture, regionID); |
| 135 | 135 | ||
| 136 | // !!! for now | 136 | // !!! for now |
| 137 | //info.RegionSettings.TerrainImageID = ass.FullID; | 137 | //info.RegionSettings.TerrainImageID = ass.FullID; |