aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs22
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs6
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs20
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs26
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs12
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs18
-rw-r--r--OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs16
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs16
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs28
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs54
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs14
19 files changed, 131 insertions, 133 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3b8b48f..dd0f6ac 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -7679,7 +7679,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7679 { 7679 {
7680 Transfer.TransferInfo.Params = new byte[20]; 7680 Transfer.TransferInfo.Params = new byte[20];
7681 Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); 7681 Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
7682 int assType = req.AssetInf.Metadata.Type; 7682 int assType = req.AssetInf.Type;
7683 Array.Copy(Utils.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4); 7683 Array.Copy(Utils.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4);
7684 } 7684 }
7685 else if (req.AssetRequestSource == 3) 7685 else if (req.AssetRequestSource == 3)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
index f79f62e..697bbe6 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
@@ -198,13 +198,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
198 private void Initialise(UUID fileID, string fileName) 198 private void Initialise(UUID fileID, string fileName)
199 { 199 {
200 m_asset = new AssetBase(); 200 m_asset = new AssetBase();
201 m_asset.Metadata.FullID = fileID; 201 m_asset.FullID = fileID;
202 m_asset.Metadata.Type = type; 202 m_asset.Type = type;
203 m_asset.Data = new byte[0]; 203 m_asset.Data = new byte[0];
204 m_asset.Metadata.Name = fileName; 204 m_asset.Name = fileName;
205 m_asset.Metadata.Description = "empty"; 205 m_asset.Description = "empty";
206 m_asset.Metadata.Local = true; 206 m_asset.Local = true;
207 m_asset.Metadata.Temporary = true; 207 m_asset.Temporary = true;
208 mXferID = Util.GetNextXferID(); 208 mXferID = Util.GetNextXferID();
209 } 209 }
210 210
@@ -215,13 +215,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
215 215
216 public void RequestStartXfer(IClientAPI pRemoteClient) 216 public void RequestStartXfer(IClientAPI pRemoteClient)
217 { 217 {
218 if (!String.IsNullOrEmpty(m_asset.Metadata.Name)) 218 if (!String.IsNullOrEmpty(m_asset.Name))
219 { 219 {
220 pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, Utils.StringToBytes(m_asset.Metadata.Name)); 220 pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name));
221 } 221 }
222 else 222 else
223 { 223 {
224 pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, new byte[0]); 224 pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, new byte[0]);
225 } 225 }
226 } 226 }
227 227
@@ -265,7 +265,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
265 handlerUploadDone = UploadDone; 265 handlerUploadDone = UploadDone;
266 if (handlerUploadDone != null) 266 if (handlerUploadDone != null)
267 { 267 {
268 handlerUploadDone(m_asset.Metadata.Name, m_asset.Metadata.FullID, mXferID, m_asset.Data, remoteClient); 268 handlerUploadDone(m_asset.Name, m_asset.FullID, mXferID, m_asset.Data, remoteClient);
269 } 269 }
270 } 270 }
271 271
@@ -274,7 +274,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
274 handlerAbort = UploadAborted; 274 handlerAbort = UploadAborted;
275 if (handlerAbort != null) 275 if (handlerAbort != null)
276 { 276 {
277 handlerAbort(m_asset.Metadata.Name, m_asset.Metadata.FullID, mXferID, remoteClient); 277 handlerAbort(m_asset.Name, m_asset.FullID, mXferID, remoteClient);
278 } 278 }
279 } 279 }
280 } 280 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 6efe3e1..23ed798 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -405,7 +405,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
405 /// </summary> 405 /// </summary>
406 public UUID AssetId 406 public UUID AssetId
407 { 407 {
408 get { return m_asset_ref.Metadata.FullID; } 408 get { return m_asset_ref.FullID; }
409 } 409 }
410 410
411 /// <summary> 411 /// <summary>
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
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 0bf91e0..eefcfe8 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -172,10 +172,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
172 "[ASSET TRANSACTIONS]: Updating task item {0} in {1} with asset in transaction {2}", 172 "[ASSET TRANSACTIONS]: Updating task item {0} in {1} with asset in transaction {2}",
173 item.Name, part.Name, transactionID); 173 item.Name, part.Name, transactionID);
174 174
175 asset.Metadata.Name = item.Name; 175 asset.Name = item.Name;
176 asset.Metadata.Description = item.Description; 176 asset.Description = item.Description;
177 asset.Metadata.Type = (sbyte)item.Type; 177 asset.Type = (sbyte)item.Type;
178 item.AssetID = asset.Metadata.FullID; 178 item.AssetID = asset.FullID;
179 179
180 Manager.MyScene.CommsManager.AssetCache.AddAsset(asset); 180 Manager.MyScene.CommsManager.AssetCache.AddAsset(asset);
181 181
@@ -207,14 +207,14 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
207 asset = GetTransactionAsset(transactionID); 207 asset = GetTransactionAsset(transactionID);
208 } 208 }
209 209
210 if (asset != null && asset.Metadata.FullID == assetID) 210 if (asset != null && asset.FullID == assetID)
211 { 211 {
212 // Assets never get updated, new ones get created 212 // Assets never get updated, new ones get created
213 asset.Metadata.FullID = UUID.Random(); 213 asset.FullID = UUID.Random();
214 asset.Metadata.Name = item.Name; 214 asset.Name = item.Name;
215 asset.Metadata.Description = item.Description; 215 asset.Description = item.Description;
216 asset.Metadata.Type = (sbyte)item.AssetType; 216 asset.Type = (sbyte)item.AssetType;
217 item.AssetID = asset.Metadata.FullID; 217 item.AssetID = asset.FullID;
218 218
219 Manager.MyScene.CommsManager.AssetCache.AddAsset(asset); 219 Manager.MyScene.CommsManager.AssetCache.AddAsset(asset);
220 } 220 }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 9af764f..b71c2a6 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -111,13 +111,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
111 { 111 {
112 ourClient = remoteClient; 112 ourClient = remoteClient;
113 m_asset = new AssetBase(); 113 m_asset = new AssetBase();
114 m_asset.Metadata.FullID = assetID; 114 m_asset.FullID = assetID;
115 m_asset.Metadata.Type = type; 115 m_asset.Type = type;
116 m_asset.Data = data; 116 m_asset.Data = data;
117 m_asset.Metadata.Name = "blank"; 117 m_asset.Name = "blank";
118 m_asset.Metadata.Description = "empty"; 118 m_asset.Description = "empty";
119 m_asset.Metadata.Local = storeLocal; 119 m_asset.Local = storeLocal;
120 m_asset.Metadata.Temporary = tempFile; 120 m_asset.Temporary = tempFile;
121 121
122 TransactionID = transaction; 122 TransactionID = transaction;
123 m_storeLocal = storeLocal; 123 m_storeLocal = storeLocal;
@@ -138,12 +138,12 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
138 protected void RequestStartXfer() 138 protected void RequestStartXfer()
139 { 139 {
140 XferID = Util.GetNextXferID(); 140 XferID = Util.GetNextXferID();
141 ourClient.SendXferRequest(XferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, new byte[0]); 141 ourClient.SendXferRequest(XferID, m_asset.Type, m_asset.FullID, 0, new byte[0]);
142 } 142 }
143 143
144 protected void SendCompleteMessage() 144 protected void SendCompleteMessage()
145 { 145 {
146 ourClient.SendAssetUploadCompleteMessage(m_asset.Metadata.Type, true, m_asset.Metadata.FullID); 146 ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID);
147 147
148 m_finished = true; 148 m_finished = true;
149 if (m_createItem) 149 if (m_createItem)
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
162 DateTime now = DateTime.Now; 162 DateTime now = DateTime.Now;
163 string filename = 163 string filename =
164 String.Format("{6}_{7}_{0:d2}{1:d2}{2:d2}_{3:d2}{4:d2}{5:d2}.dat", now.Year, now.Month, now.Day, 164 String.Format("{6}_{7}_{0:d2}{1:d2}{2:d2}_{3:d2}{4:d2}{5:d2}.dat", now.Year, now.Month, now.Day,
165 now.Hour, now.Minute, now.Second, m_asset.Metadata.Name, m_asset.Metadata.Type); 165 now.Hour, now.Minute, now.Second, m_asset.Name, m_asset.Type);
166 SaveAssetToFile(filename, m_asset.Data); 166 SaveAssetToFile(filename, m_asset.Data);
167 } 167 }
168 } 168 }
@@ -194,9 +194,9 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
194 this.invType = invType; 194 this.invType = invType;
195 this.wearableType = wearableType; 195 this.wearableType = wearableType;
196 nextPerm = nextOwnerMask; 196 nextPerm = nextOwnerMask;
197 m_asset.Metadata.Name = name; 197 m_asset.Name = name;
198 m_asset.Metadata.Description = description; 198 m_asset.Description = description;
199 m_asset.Metadata.Type = type; 199 m_asset.Type = type;
200 200
201 if (m_finished) 201 if (m_finished)
202 { 202 {
@@ -223,7 +223,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
223 item.Owner = ourClient.AgentId; 223 item.Owner = ourClient.AgentId;
224 item.Creator = ourClient.AgentId; 224 item.Creator = ourClient.AgentId;
225 item.ID = UUID.Random(); 225 item.ID = UUID.Random();
226 item.AssetID = m_asset.Metadata.FullID; 226 item.AssetID = m_asset.FullID;
227 item.Description = m_description; 227 item.Description = m_description;
228 item.Name = m_name; 228 item.Name = m_name;
229 item.AssetType = type; 229 item.AssetType = type;
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
index dde8566..e02ea6d 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
54 /// </summary> 54 /// </summary>
55 private AssetBase m_asset; 55 private AssetBase m_asset;
56 56
57 //public UUID assetID { get { return m_asset.Metadata.FullID; } } 57 //public UUID assetID { get { return m_asset.FullID; } }
58 58
59 // private bool m_cancel = false; 59 // private bool m_cancel = false;
60 60
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
116 // See ITextureSender 116 // See ITextureSender
117 public bool SendTexturePacket() 117 public bool SendTexturePacket()
118 { 118 {
119 //m_log.DebugFormat("[TEXTURE SENDER]: Sending packet for {0}", m_asset.Metadata.FullID); 119 //m_log.DebugFormat("[TEXTURE SENDER]: Sending packet for {0}", m_asset.FullID);
120 120
121 SendPacket(); 121 SendPacket();
122 counter++; 122 counter++;
@@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
153 { 153 {
154 if (NumPackets == 0) 154 if (NumPackets == 0)
155 { 155 {
156 RequestUser.SendImageFirstPart(1, m_asset.Metadata.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); 156 RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
157 PacketCounter++; 157 PacketCounter++;
158 } 158 }
159 else 159 else
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
162 Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); 162 Array.Copy(m_asset.Data, 0, ImageData1, 0, 600);
163 163
164 RequestUser.SendImageFirstPart( 164 RequestUser.SendImageFirstPart(
165 (ushort)(NumPackets), m_asset.Metadata.FullID, (uint)m_asset.Data.Length, ImageData1, 2); 165 (ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2);
166 PacketCounter++; 166 PacketCounter++;
167 } 167 }
168 } 168 }
@@ -178,11 +178,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
178 catch (ArgumentOutOfRangeException) 178 catch (ArgumentOutOfRangeException)
179 { 179 {
180 m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" + 180 m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" +
181 m_asset.Metadata.ID); 181 m_asset.ID);
182 return; 182 return;
183 } 183 }
184 184
185 RequestUser.SendImageNextPart((ushort)PacketCounter, m_asset.Metadata.FullID, imageData); 185 RequestUser.SendImageNextPart((ushort)PacketCounter, m_asset.FullID, imageData);
186 PacketCounter++; 186 PacketCounter++;
187 } 187 }
188 } 188 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 7189e36..6b57ac5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
281 281
282 AssetBase asset = new AssetBase(new UUID(uuid), "RandomName"); 282 AssetBase asset = new AssetBase(new UUID(uuid), "RandomName");
283 283
284 asset.Metadata.Type = assetType; 284 asset.Type = assetType;
285 asset.Data = data; 285 asset.Data = data;
286 286
287 commsManager.AssetCache.AddAsset(asset); 287 commsManager.AssetCache.AddAsset(asset);
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index d6f0713..a8f841b 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -231,21 +231,21 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
231 231
232 // Create a new asset for user 232 // Create a new asset for user
233 AssetBase asset = new AssetBase(); 233 AssetBase asset = new AssetBase();
234 asset.Metadata.FullID = UUID.Random(); 234 asset.FullID = UUID.Random();
235 asset.Data = assetData; 235 asset.Data = assetData;
236 asset.Metadata.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000); 236 asset.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000);
237 asset.Metadata.Type = 0; 237 asset.Type = 0;
238 asset.Metadata.Description = "dynamic image"; 238 asset.Description = "dynamic image";
239 asset.Metadata.Local = false; 239 asset.Local = false;
240 asset.Metadata.Temporary = true; 240 asset.Temporary = true;
241 scene.CommsManager.AssetCache.AddAsset(asset); 241 scene.CommsManager.AssetCache.AddAsset(asset);
242 242
243 LastAssetID = asset.Metadata.FullID; 243 LastAssetID = asset.FullID;
244 244
245 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>(); 245 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
246 if (cacheLayerDecode != null) 246 if (cacheLayerDecode != null)
247 { 247 {
248 cacheLayerDecode.syncdecode(asset.Metadata.FullID, asset.Data); 248 cacheLayerDecode.syncdecode(asset.FullID, asset.Data);
249 } 249 }
250 cacheLayerDecode = null; 250 cacheLayerDecode = null;
251 251
@@ -256,7 +256,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
256 UUID oldID = tmptex.DefaultTexture.TextureID; 256 UUID oldID = tmptex.DefaultTexture.TextureID;
257 scene.CommsManager.AssetCache.ExpireAsset(oldID); 257 scene.CommsManager.AssetCache.ExpireAsset(oldID);
258 258
259 tmptex.DefaultTexture.TextureID = asset.Metadata.FullID; 259 tmptex.DefaultTexture.TextureID = asset.FullID;
260 // I'm pretty sure we always want to force this to true 260 // I'm pretty sure we always want to force this to true
261 tmptex.DefaultTexture.Fullbright = true; 261 tmptex.DefaultTexture.Fullbright = true;
262 262
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index 43eccf3..f788433 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -326,8 +326,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
326 326
327 UUID toID = new UUID(address.Substring(0, address.IndexOf("@"))); 327 UUID toID = new UUID(address.Substring(0, address.IndexOf("@")));
328 328
329 String unused;
330
331 if (IsLocal(toID)) // TODO FIX check to see if it is local 329 if (IsLocal(toID)) // TODO FIX check to see if it is local
332 { 330 {
333 // object in this region 331 // object in this region
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 66fc43b..d7ab5fd 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
294 //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); 294 //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
295 295
296 AssetBase asset = new AssetBase(new UUID(uuid), String.Empty); 296 AssetBase asset = new AssetBase(new UUID(uuid), String.Empty);
297 asset.Metadata.Type = assetType; 297 asset.Type = assetType;
298 asset.Data = data; 298 asset.Data = data;
299 299
300 m_scene.CommsManager.AssetCache.AddAsset(asset); 300 m_scene.CommsManager.AssetCache.AddAsset(asset);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index b3286f6..abd90de 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -86,16 +86,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
86 86
87 string extension = string.Empty; 87 string extension = string.Empty;
88 88
89 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Metadata.Type)) 89 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
90 { 90 {
91 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Metadata.Type]; 91 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
92 } 92 }
93 93
94 xtw.WriteElementString("filename", uuid.ToString() + extension); 94 xtw.WriteElementString("filename", uuid.ToString() + extension);
95 95
96 xtw.WriteElementString("name", asset.Metadata.Name); 96 xtw.WriteElementString("name", asset.Name);
97 xtw.WriteElementString("description", asset.Metadata.Description); 97 xtw.WriteElementString("description", asset.Description);
98 xtw.WriteElementString("asset-type", asset.Metadata.Type.ToString()); 98 xtw.WriteElementString("asset-type", asset.Type.ToString());
99 99
100 xtw.WriteEndElement(); 100 xtw.WriteEndElement();
101 } 101 }
@@ -123,15 +123,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
123 123
124 string extension = string.Empty; 124 string extension = string.Empty;
125 125
126 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Metadata.Type)) 126 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
127 { 127 {
128 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Metadata.Type]; 128 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
129 } 129 }
130 else 130 else
131 { 131 {
132 m_log.ErrorFormat( 132 m_log.ErrorFormat(
133 "[ARCHIVER]: Unrecognized asset type {0} with uuid {1}. This asset will be saved but not reloaded", 133 "[ARCHIVER]: Unrecognized asset type {0} with uuid {1}. This asset will be saved but not reloaded",
134 asset.Metadata.Type, asset.Metadata.ID); 134 asset.Type, asset.ID);
135 } 135 }
136 136
137 archive.AddFile( 137 archive.AddFile(
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 743f9a1..cb267d7 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -157,8 +157,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
157 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); 157 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename);
158 158
159 AssetBase asset = new AssetBase(new UUID(filename), metadata.Name); 159 AssetBase asset = new AssetBase(new UUID(filename), metadata.Name);
160 asset.Metadata.Description = metadata.Description; 160 asset.Description = metadata.Description;
161 asset.Metadata.Type = metadata.AssetType; 161 asset.Type = metadata.AssetType;
162 asset.Data = data; 162 asset.Data = data;
163 163
164 m_cache.AddAsset(asset); 164 m_cache.AddAsset(asset);
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
index 1f2d5db..93e79f0 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
@@ -54,13 +54,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
54 { 54 {
55 55
56 m_asset = new AssetBase(); 56 m_asset = new AssetBase();
57 m_asset.Metadata.FullID = UUID.Zero; 57 m_asset.FullID = UUID.Zero;
58 m_asset.Metadata.Type = type; 58 m_asset.Type = type;
59 m_asset.Data = new byte[0]; 59 m_asset.Data = new byte[0];
60 m_asset.Metadata.Name = pClientFilename; 60 m_asset.Name = pClientFilename;
61 m_asset.Metadata.Description = "empty"; 61 m_asset.Description = "empty";
62 m_asset.Metadata.Local = true; 62 m_asset.Local = true;
63 m_asset.Metadata.Temporary = true; 63 m_asset.Temporary = true;
64 64
65 } 65 }
66 66
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
72 public void RequestStartXfer(IClientAPI pRemoteClient) 72 public void RequestStartXfer(IClientAPI pRemoteClient)
73 { 73 {
74 mXferID = Util.GetNextXferID(); 74 mXferID = Util.GetNextXferID();
75 pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, Utils.StringToBytes(m_asset.Metadata.Name)); 75 pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name));
76 } 76 }
77 77
78 /// <summary> 78 /// <summary>
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
114 handlerTerrainUploadDone = TerrainUploadDone; 114 handlerTerrainUploadDone = TerrainUploadDone;
115 if (handlerTerrainUploadDone != null) 115 if (handlerTerrainUploadDone != null)
116 { 116 {
117 handlerTerrainUploadDone(m_asset.Metadata.Name, m_asset.Data, remoteClient); 117 handlerTerrainUploadDone(m_asset.Name, m_asset.Data, remoteClient);
118 } 118 }
119 } 119 }
120 } 120 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index e1c3d85..4f98e8b 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -985,14 +985,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
985 m_scene.RegionInfo.RegionSettings.TerrainImageID = TerrainImageUUID; 985 m_scene.RegionInfo.RegionSettings.TerrainImageID = TerrainImageUUID;
986 986
987 AssetBase asset = new AssetBase(); 987 AssetBase asset = new AssetBase();
988 asset.Metadata.FullID = m_scene.RegionInfo.RegionSettings.TerrainImageID; 988 asset.FullID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
989 asset.Data = data; 989 asset.Data = data;
990 asset.Metadata.Name 990 asset.Name
991 = "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(); 991 = "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString();
992 asset.Metadata.Description = m_scene.RegionInfo.RegionName; 992 asset.Description = m_scene.RegionInfo.RegionName;
993 993
994 asset.Metadata.Type = 0; 994 asset.Type = 0;
995 asset.Metadata.Temporary = temporary; 995 asset.Temporary = temporary;
996 m_scene.CommsManager.AssetCache.AddAsset(asset); 996 m_scene.CommsManager.AssetCache.AddAsset(asset);
997 } 997 }
998 998
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 1f01fa2..1a3c4c8 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -120,12 +120,12 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
120 120
121 if (m_scene.CommsManager.AssetCache.TryGetCachedAsset(assetID, out asset) && (asset != null)) 121 if (m_scene.CommsManager.AssetCache.TryGetCachedAsset(assetID, out asset) && (asset != null))
122 { 122 {
123 m_log.Debug("[HGScene]: Asset made it to asset cache. " + asset.Metadata.Name + " " + assetID); 123 m_log.Debug("[HGScene]: Asset made it to asset cache. " + asset.Name + " " + assetID);
124 // I think I need to store it in the asset DB too. 124 // I think I need to store it in the asset DB too.
125 // For now, let me just do it for textures and scripts 125 // For now, let me just do it for textures and scripts
126 if (((AssetType)asset.Metadata.Type == AssetType.Texture) || 126 if (((AssetType)asset.Type == AssetType.Texture) ||
127 ((AssetType)asset.Metadata.Type == AssetType.LSLBytecode) || 127 ((AssetType)asset.Type == AssetType.LSLBytecode) ||
128 ((AssetType)asset.Metadata.Type == AssetType.LSLText)) 128 ((AssetType)asset.Type == AssetType.LSLText))
129 { 129 {
130 AssetBase asset1 = new AssetBase(); 130 AssetBase asset1 = new AssetBase();
131 Copy(asset, asset1); 131 Copy(asset, asset1);
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
149 if (asset1 != null) 149 if (asset1 != null)
150 { 150 {
151 // See long comment in AssetCache.AddAsset 151 // See long comment in AssetCache.AddAsset
152 if (!asset1.Metadata.Temporary || asset1.Metadata.Local) 152 if (!asset1.Temporary || asset1.Local)
153 { 153 {
154 // The asset cache returns instances of subclasses of AssetBase: 154 // The asset cache returns instances of subclasses of AssetBase:
155 // TextureImage or AssetInfo. So in passing them to the remote 155 // TextureImage or AssetInfo. So in passing them to the remote
@@ -170,14 +170,14 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
170 170
171 private void Copy(AssetBase from, AssetBase to) 171 private void Copy(AssetBase from, AssetBase to)
172 { 172 {
173 to.Data = from.Data; 173 to.Data = from.Data;
174 to.Metadata.Description = from.Metadata.Description; 174 to.Description = from.Description;
175 to.Metadata.FullID = from.Metadata.FullID; 175 to.FullID = from.FullID;
176 to.Metadata.ID = from.Metadata.ID; 176 to.ID = from.ID;
177 to.Metadata.Local = from.Metadata.Local; 177 to.Local = from.Local;
178 to.Metadata.Name = from.Metadata.Name; 178 to.Name = from.Name;
179 to.Metadata.Temporary = from.Metadata.Temporary; 179 to.Temporary = from.Temporary;
180 to.Metadata.Type = from.Metadata.Type; 180 to.Type = from.Type;
181 181
182 } 182 }
183 183
@@ -235,7 +235,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
235 private Dictionary<UUID, bool> SniffUUIDs(AssetBase asset) 235 private Dictionary<UUID, bool> SniffUUIDs(AssetBase asset)
236 { 236 {
237 Dictionary<UUID, bool> uuids = new Dictionary<UUID, bool>(); 237 Dictionary<UUID, bool> uuids = new Dictionary<UUID, bool>();
238 if ((asset != null) && ((AssetType)asset.Metadata.Type == AssetType.Object)) 238 if ((asset != null) && ((AssetType)asset.Type == AssetType.Object))
239 { 239 {
240 string ass_str = Utils.BytesToString(asset.Data); 240 string ass_str = Utils.BytesToString(asset.Data);
241 SceneObjectGroup sog = new SceneObjectGroup(ass_str, true); 241 SceneObjectGroup sog = new SceneObjectGroup(ass_str, true);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index c98629b..2800e9e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -193,11 +193,11 @@ namespace OpenSim.Region.Framework.Scenes
193 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data); 193 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
194 CommsManager.AssetCache.AddAsset(asset); 194 CommsManager.AssetCache.AddAsset(asset);
195 195
196 item.AssetID = asset.Metadata.FullID; 196 item.AssetID = asset.FullID;
197 userInfo.UpdateItem(item); 197 userInfo.UpdateItem(item);
198 198
199 // remoteClient.SendInventoryItemCreateUpdate(item); 199 // remoteClient.SendInventoryItemCreateUpdate(item);
200 return (asset.Metadata.FullID); 200 return (asset.FullID);
201 } 201 }
202 } 202 }
203 } 203 }
@@ -285,7 +285,7 @@ namespace OpenSim.Region.Framework.Scenes
285 } 285 }
286 286
287 // Update item with new asset 287 // Update item with new asset
288 item.AssetID = asset.Metadata.FullID; 288 item.AssetID = asset.FullID;
289 group.UpdateInventoryItem(item); 289 group.UpdateInventoryItem(item);
290 part.GetProperties(remoteClient); 290 part.GetProperties(remoteClient);
291 291
@@ -688,7 +688,7 @@ namespace OpenSim.Region.Framework.Scenes
688 { 688 {
689 if (newName != String.Empty) 689 if (newName != String.Empty)
690 { 690 {
691 asset.Metadata.Name = newName; 691 asset.Name = newName;
692 } 692 }
693 else 693 else
694 { 694 {
@@ -728,10 +728,10 @@ namespace OpenSim.Region.Framework.Scenes
728 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data) 728 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data)
729 { 729 {
730 AssetBase asset = new AssetBase(); 730 AssetBase asset = new AssetBase();
731 asset.Metadata.Name = name; 731 asset.Name = name;
732 asset.Metadata.Description = description; 732 asset.Description = description;
733 asset.Metadata.Type = assetType; 733 asset.Type = assetType;
734 asset.Metadata.FullID = UUID.Random(); 734 asset.FullID = UUID.Random();
735 asset.Data = (data == null) ? new byte[1] : data; 735 asset.Data = (data == null) ? new byte[1] : data;
736 736
737 return asset; 737 return asset;
@@ -831,11 +831,11 @@ namespace OpenSim.Region.Framework.Scenes
831 item.Owner = remoteClient.AgentId; 831 item.Owner = remoteClient.AgentId;
832 item.Creator = remoteClient.AgentId; 832 item.Creator = remoteClient.AgentId;
833 item.ID = UUID.Random(); 833 item.ID = UUID.Random();
834 item.AssetID = asset.Metadata.FullID; 834 item.AssetID = asset.FullID;
835 item.Description = asset.Metadata.Description; 835 item.Description = asset.Description;
836 item.Name = name; 836 item.Name = name;
837 item.Flags = flags; 837 item.Flags = flags;
838 item.AssetType = asset.Metadata.Type; 838 item.AssetType = asset.Type;
839 item.InvType = invType; 839 item.InvType = invType;
840 item.Folder = folderID; 840 item.Folder = folderID;
841 item.CurrentPermissions = currentMask; 841 item.CurrentPermissions = currentMask;
@@ -905,7 +905,7 @@ namespace OpenSim.Region.Framework.Scenes
905 AssetBase asset = CreateAsset(name, description, assetType, data); 905 AssetBase asset = CreateAsset(name, description, assetType, data);
906 CommsManager.AssetCache.AddAsset(asset); 906 CommsManager.AssetCache.AddAsset(asset);
907 907
908 CreateNewInventoryItem(remoteClient, folderID, asset.Metadata.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate); 908 CreateNewInventoryItem(remoteClient, folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
909 } 909 }
910 else 910 else
911 { 911 {
@@ -1553,7 +1553,7 @@ namespace OpenSim.Region.Framework.Scenes
1553 taskItem.Flags = itemBase.Flags; 1553 taskItem.Flags = itemBase.Flags;
1554 taskItem.PermsGranter = UUID.Zero; 1554 taskItem.PermsGranter = UUID.Zero;
1555 taskItem.PermsMask = 0; 1555 taskItem.PermsMask = 0;
1556 taskItem.AssetID = asset.Metadata.FullID; 1556 taskItem.AssetID = asset.FullID;
1557 1557
1558 part.Inventory.AddInventoryItem(taskItem, false); 1558 part.Inventory.AddInventoryItem(taskItem, false);
1559 part.GetProperties(remoteClient); 1559 part.GetProperties(remoteClient);
@@ -1953,16 +1953,16 @@ namespace OpenSim.Region.Framework.Scenes
1953 (sbyte)AssetType.Object, 1953 (sbyte)AssetType.Object,
1954 Utils.StringToBytes(sceneObjectXml)); 1954 Utils.StringToBytes(sceneObjectXml));
1955 CommsManager.AssetCache.AddAsset(asset); 1955 CommsManager.AssetCache.AddAsset(asset);
1956 assetID = asset.Metadata.FullID; 1956 assetID = asset.FullID;
1957 1957
1958 if (DeRezAction.SaveToExistingUserInventoryItem == action) 1958 if (DeRezAction.SaveToExistingUserInventoryItem == action)
1959 { 1959 {
1960 item.AssetID = asset.Metadata.FullID; 1960 item.AssetID = asset.FullID;
1961 userInfo.UpdateItem(item); 1961 userInfo.UpdateItem(item);
1962 } 1962 }
1963 else 1963 else
1964 { 1964 {
1965 item.AssetID = asset.Metadata.FullID; 1965 item.AssetID = asset.FullID;
1966 1966
1967 if (remoteClient != null && (remoteClient.AgentId != objectGroup.RootPart.OwnerID) && Permissions.PropagatePermissions()) 1967 if (remoteClient != null && (remoteClient.AgentId != objectGroup.RootPart.OwnerID) && Permissions.PropagatePermissions())
1968 { 1968 {
@@ -1995,9 +1995,9 @@ namespace OpenSim.Region.Framework.Scenes
1995 1995
1996 // TODO: add the new fields (Flags, Sale info, etc) 1996 // TODO: add the new fields (Flags, Sale info, etc)
1997 item.CreationDate = Util.UnixTimeSinceEpoch(); 1997 item.CreationDate = Util.UnixTimeSinceEpoch();
1998 item.Description = asset.Metadata.Description; 1998 item.Description = asset.Description;
1999 item.Name = asset.Metadata.Name; 1999 item.Name = asset.Name;
2000 item.AssetType = asset.Metadata.Type; 2000 item.AssetType = asset.Type;
2001 2001
2002 userInfo.AddItem(item); 2002 userInfo.AddItem(item);
2003 2003
@@ -2080,10 +2080,10 @@ namespace OpenSim.Region.Framework.Scenes
2080 Utils.StringToBytes(sceneObjectXml)); 2080 Utils.StringToBytes(sceneObjectXml));
2081 CommsManager.AssetCache.AddAsset(asset); 2081 CommsManager.AssetCache.AddAsset(asset);
2082 2082
2083 item.AssetID = asset.Metadata.FullID; 2083 item.AssetID = asset.FullID;
2084 item.Description = asset.Metadata.Description; 2084 item.Description = asset.Description;
2085 item.Name = asset.Metadata.Name; 2085 item.Name = asset.Name;
2086 item.AssetType = asset.Metadata.Type; 2086 item.AssetType = asset.Type;
2087 item.InvType = (int)InventoryType.Object; 2087 item.InvType = (int)InventoryType.Object;
2088 item.Folder = foundFolder; 2088 item.Folder = foundFolder;
2089 2089
@@ -2121,10 +2121,10 @@ namespace OpenSim.Region.Framework.Scenes
2121 item.Creator = grp.RootPart.CreatorID; 2121 item.Creator = grp.RootPart.CreatorID;
2122 item.Owner = remoteClient.AgentId; 2122 item.Owner = remoteClient.AgentId;
2123 item.ID = UUID.Random(); 2123 item.ID = UUID.Random();
2124 item.AssetID = asset.Metadata.FullID; 2124 item.AssetID = asset.FullID;
2125 item.Description = asset.Metadata.Description; 2125 item.Description = asset.Description;
2126 item.Name = asset.Metadata.Name; 2126 item.Name = asset.Name;
2127 item.AssetType = asset.Metadata.Type; 2127 item.AssetType = asset.Type;
2128 item.InvType = (int)InventoryType.Object; 2128 item.InvType = (int)InventoryType.Object;
2129 2129
2130 item.Folder = UUID.Zero; // Objects folder! 2130 item.Folder = UUID.Zero; // Objects folder!
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5badd2d..1d2f37a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3555,10 +3555,10 @@ namespace OpenSim.Region.Framework.Scenes
3555 3555
3556 item.ID = UUID.Random(); 3556 item.ID = UUID.Random();
3557 item.Owner = remoteClient.AgentId; 3557 item.Owner = remoteClient.AgentId;
3558 item.AssetID = asset.Metadata.FullID; 3558 item.AssetID = asset.FullID;
3559 item.Description = asset.Metadata.Description; 3559 item.Description = asset.Description;
3560 item.Name = asset.Metadata.Name; 3560 item.Name = asset.Name;
3561 item.AssetType = asset.Metadata.Type; 3561 item.AssetType = asset.Type;
3562 item.InvType = (int)InventoryType.Object; 3562 item.InvType = (int)InventoryType.Object;
3563 item.Folder = categoryID; 3563 item.Folder = categoryID;
3564 3564
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e4ef236..eeef58b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1025,10 +1025,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1025 1025
1026 // Create new asset 1026 // Create new asset
1027 AssetBase asset = new AssetBase(); 1027 AssetBase asset = new AssetBase();
1028 asset.Metadata.Name = notecardName; 1028 asset.Name = notecardName;
1029 asset.Metadata.Description = "Script Generated Notecard"; 1029 asset.Description = "Script Generated Notecard";
1030 asset.Metadata.Type = 7; 1030 asset.Type = 7;
1031 asset.Metadata.FullID = UUID.Random(); 1031 asset.FullID = UUID.Random();
1032 string notecardData = ""; 1032 string notecardData = "";
1033 1033
1034 for (int i = 0; i < contents.Length; i++) { 1034 for (int i = 0; i < contents.Length; i++) {
@@ -1048,8 +1048,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1048 taskItem.ResetIDs(m_host.UUID); 1048 taskItem.ResetIDs(m_host.UUID);
1049 taskItem.ParentID = m_host.UUID; 1049 taskItem.ParentID = m_host.UUID;
1050 taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch(); 1050 taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch();
1051 taskItem.Name = asset.Metadata.Name; 1051 taskItem.Name = asset.Name;
1052 taskItem.Description = asset.Metadata.Description; 1052 taskItem.Description = asset.Description;
1053 taskItem.Type = 7; 1053 taskItem.Type = 7;
1054 taskItem.InvType = 7; 1054 taskItem.InvType = 7;
1055 taskItem.OwnerID = m_host.OwnerID; 1055 taskItem.OwnerID = m_host.OwnerID;
@@ -1063,7 +1063,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1063 taskItem.Flags = 0; 1063 taskItem.Flags = 0;
1064 taskItem.PermsGranter = UUID.Zero; 1064 taskItem.PermsGranter = UUID.Zero;
1065 taskItem.PermsMask = 0; 1065 taskItem.PermsMask = 0;
1066 taskItem.AssetID = asset.Metadata.FullID; 1066 taskItem.AssetID = asset.FullID;
1067 1067
1068 m_host.Inventory.AddInventoryItem(taskItem, false); 1068 m_host.Inventory.AddInventoryItem(taskItem, false);
1069 } 1069 }