aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs4
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
14 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
index 1e03c95..10e5a95 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
197 197
198 private void Initialise(UUID fileID, string fileName) 198 private void Initialise(UUID fileID, string fileName)
199 { 199 {
200 m_asset = new AssetBase(fileID, fileName, type, UUID.Zero); 200 m_asset = new AssetBase(fileID, fileName, type, UUID.Zero.ToString());
201 m_asset.Data = new byte[0]; 201 m_asset.Data = new byte[0];
202 m_asset.Description = "empty"; 202 m_asset.Description = "empty";
203 m_asset.Local = true; 203 m_asset.Local = true;
@@ -212,7 +212,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
212 212
213 public void RequestStartXfer(IClientAPI pRemoteClient) 213 public void RequestStartXfer(IClientAPI pRemoteClient)
214 { 214 {
215 m_asset.Metadata.CreatorID = pRemoteClient.AgentId; 215 m_asset.Metadata.CreatorID = pRemoteClient.AgentId.ToString();
216 216
217 if (!String.IsNullOrEmpty(m_asset.Name)) 217 if (!String.IsNullOrEmpty(m_asset.Name))
218 { 218 {
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 1320b33..c791cb4 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
112 bool storeLocal, bool tempFile) 112 bool storeLocal, bool tempFile)
113 { 113 {
114 ourClient = remoteClient; 114 ourClient = remoteClient;
115 m_asset = new AssetBase(assetID, "blank", type, remoteClient.AgentId); 115 m_asset = new AssetBase(assetID, "blank", type, remoteClient.AgentId.ToString());
116 m_asset.Data = data; 116 m_asset.Data = data;
117 m_asset.Description = "empty"; 117 m_asset.Description = "empty";
118 m_asset.Local = storeLocal; 118 m_asset.Local = storeLocal;
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index a23e8ce..50c83b5 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
240 { 240 {
241 string assetID = "j2kCache_" + AssetId.ToString(); 241 string assetID = "j2kCache_" + AssetId.ToString();
242 242
243 AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard, m_scene.RegionInfo.RegionID); 243 AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard, m_scene.RegionInfo.RegionID.ToString());
244 layerDecodeAsset.Local = true; 244 layerDecodeAsset.Local = true;
245 layerDecodeAsset.Temporary = true; 245 layerDecodeAsset.Temporary = true;
246 246
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 5756d35..dc7439c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -416,7 +416,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
416 416
417 //m_log.DebugFormat("[INVENTORY ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); 417 //m_log.DebugFormat("[INVENTORY ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
418 418
419 AssetBase asset = new AssetBase(new UUID(uuid), "RandomName", assetType, UUID.Zero); 419 AssetBase asset = new AssetBase(new UUID(uuid), "RandomName", assetType, UUID.Zero.ToString());
420 asset.Data = data; 420 asset.Data = data;
421 421
422 m_scene.AssetService.Store(asset); 422 m_scene.AssetService.Store(asset);
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index eec852e..37f1da9 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
161 } 161 }
162 162
163 AssetBase asset = 163 AssetBase asset =
164 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId); 164 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString());
165 item.AssetID = asset.FullID; 165 item.AssetID = asset.FullID;
166 m_Scene.AssetService.Store(asset); 166 m_Scene.AssetService.Store(asset);
167 167
@@ -340,7 +340,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
340 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId), 340 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId),
341 (sbyte)AssetType.Object, 341 (sbyte)AssetType.Object,
342 Utils.StringToBytes(sceneObjectXml), 342 Utils.StringToBytes(sceneObjectXml),
343 objectGroup.OwnerID); 343 objectGroup.OwnerID.ToString());
344 m_Scene.AssetService.Store(asset); 344 m_Scene.AssetService.Store(asset);
345 assetID = asset.FullID; 345 assetID = asset.FullID;
346 346
@@ -641,7 +641,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
641 /// <param name="assetType"></param> 641 /// <param name="assetType"></param>
642 /// <param name="data"></param> 642 /// <param name="data"></param>
643 /// <returns></returns> 643 /// <returns></returns>
644 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID) 644 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, string creatorID)
645 { 645 {
646 AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID); 646 AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID);
647 asset.Description = description; 647 asset.Description = description;
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 367068e..643764f 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
310 310
311 // Create a new asset for user 311 // Create a new asset for user
312 AssetBase asset = new AssetBase(UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture, 312 AssetBase asset = new AssetBase(UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture,
313 scene.RegionInfo.RegionID); 313 scene.RegionInfo.RegionID.ToString());
314 asset.Data = assetData; 314 asset.Data = assetData;
315 asset.Description = String.Format("URL image : {0}", Url); 315 asset.Description = String.Format("URL image : {0}", Url);
316 asset.Local = false; 316 asset.Local = false;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index f5eda3a..40d6b23 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -347,7 +347,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
347 347
348 //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); 348 //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
349 349
350 AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero); 350 AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero.ToString());
351 asset.Data = data; 351 asset.Data = data;
352 352
353 // We're relying on the asset service to do the sensible thing and not store the asset if it already 353 // We're relying on the asset service to do the sensible thing and not store the asset if it already
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 8601cae..2c04008 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
158 158
159 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); 159 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename);
160 160
161 AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType, UUID.Zero); 161 AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType, UUID.Zero.ToString());
162 asset.Description = metadata.Description; 162 asset.Description = metadata.Description;
163 asset.Data = data; 163 asset.Data = data;
164 164
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
index d10d4d6..b8d8b10 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
52 52
53 public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) 53 public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename)
54 { 54 {
55 m_asset = new AssetBase(UUID.Zero, pClientFilename, type, pRemoteClient.AgentId); 55 m_asset = new AssetBase(UUID.Zero, pClientFilename, type, pRemoteClient.AgentId.ToString());
56 m_asset.Data = new byte[0]; 56 m_asset.Data = new byte[0];
57 m_asset.Description = "empty"; 57 m_asset.Description = "empty";
58 m_asset.Local = true; 58 m_asset.Local = true;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 6ae75a8..b63d014 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1081,7 +1081,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1081 m_scene.RegionInfo.RegionSettings.TerrainImageID, 1081 m_scene.RegionInfo.RegionSettings.TerrainImageID,
1082 "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(), 1082 "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(),
1083 (sbyte)AssetType.Texture, 1083 (sbyte)AssetType.Texture,
1084 m_scene.RegionInfo.RegionID); 1084 m_scene.RegionInfo.RegionID.ToString());
1085 asset.Data = data; 1085 asset.Data = data;
1086 asset.Description = m_scene.RegionInfo.RegionName; 1086 asset.Description = m_scene.RegionInfo.RegionName;
1087 asset.Temporary = temporary; 1087 asset.Temporary = temporary;
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 1eef8d0..7307662 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
384 } 384 }
385 } 385 }
386 386
387 AssetBase Animasset = new AssetBase(UUID.Random(), "Random Animation", (sbyte)AssetType.Animation, m_scenePresence.UUID); 387 AssetBase Animasset = new AssetBase(UUID.Random(), "Random Animation", (sbyte)AssetType.Animation, m_scenePresence.UUID.ToString());
388 Animasset.Data = anim.ToBytes(); 388 Animasset.Data = anim.ToBytes();
389 Animasset.Temporary = true; 389 Animasset.Temporary = true;
390 Animasset.Local = true; 390 Animasset.Local = true;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 7928811..6df25d6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -572,7 +572,7 @@ namespace OpenSim.Region.Framework.Scenes
572 /// </summary> 572 /// </summary>
573 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID) 573 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID)
574 { 574 {
575 AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID); 575 AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID.ToString());
576 asset.Description = description; 576 asset.Description = description;
577 asset.Data = (data == null) ? new byte[1] : data; 577 asset.Data = (data == null) ? new byte[1] : data;
578 578
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs
index 4a5248b..a0dc38b 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
49 49
50 public UUID SaveBitmap(Bitmap data, bool lossless, bool temporary) 50 public UUID SaveBitmap(Bitmap data, bool lossless, bool temporary)
51 { 51 {
52 AssetBase asset = new AssetBase(UUID.Random(), "MRMDynamicImage", (sbyte)AssetType.Texture, m_scene.RegionInfo.RegionID); 52 AssetBase asset = new AssetBase(UUID.Random(), "MRMDynamicImage", (sbyte)AssetType.Texture, m_scene.RegionInfo.RegionID.ToString());
53 asset.Data = OpenJPEG.EncodeFromImage(data, lossless); 53 asset.Data = OpenJPEG.EncodeFromImage(data, lossless);
54 asset.Description = "MRM Image"; 54 asset.Description = "MRM Image";
55 asset.Local = false; 55 asset.Local = false;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 68764e1..85ee29d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1474,7 +1474,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1474 m_host.AddScriptLPS(1); 1474 m_host.AddScriptLPS(1);
1475 1475
1476 // Create new asset 1476 // Create new asset
1477 AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard, m_host.OwnerID); 1477 AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard, m_host.OwnerID.ToString());
1478 asset.Description = "Script Generated Notecard"; 1478 asset.Description = "Script Generated Notecard";
1479 string notecardData = String.Empty; 1479 string notecardData = String.Empty;
1480 1480