aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorJohn Hurliman2010-02-22 14:18:59 -0800
committerJohn Hurliman2010-02-22 14:18:59 -0800
commitdf76e95aa2dc9f3f3a0c546761b7624adc183ed0 (patch)
tree74e7cc684b12ca9b67e01e62bfcf481c1da98eb2 /OpenSim/Services/Connectors
parentMerge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... (diff)
downloadopensim-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/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 966af0b..6847852 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Services.Connectors
243 if (metadata == null) 243 if (metadata == null)
244 return false; 244 return false;
245 245
246 asset = new AssetBase(metadata.FullID, metadata.Name, metadata.Type, UUID.Zero); 246 asset = new AssetBase(metadata.FullID, metadata.Name, metadata.Type, UUID.Zero.ToString());
247 asset.Metadata = metadata; 247 asset.Metadata = metadata;
248 } 248 }
249 asset.Data = data; 249 asset.Data = data;
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index bbe4a94..9f73b38 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, regionID); 134 AssetBase ass = new AssetBase(UUID.Random(), "region " + filename, (sbyte)AssetType.Texture, regionID.ToString());
135 135
136 // !!! for now 136 // !!! for now
137 //info.RegionSettings.TerrainImageID = ass.FullID; 137 //info.RegionSettings.TerrainImageID = ass.FullID;