- 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

2 files changed, 9 insertions, 11 deletions

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
 
                 // Create a new asset for user
                 AssetBase asset = new AssetBase();
-                asset.Metadata.FullID = UUID.Random();
+                asset.FullID = UUID.Random();
                 asset.Data = assetData;
-                asset.Metadata.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000);
-                asset.Metadata.Type = 0;
-                asset.Metadata.Description = "dynamic image";
-                asset.Metadata.Local = false;
-                asset.Metadata.Temporary = true;
+                asset.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000);
+                asset.Type = 0;
+                asset.Description = "dynamic image";
+                asset.Local = false;
+                asset.Temporary = true;
                 scene.CommsManager.AssetCache.AddAsset(asset);
 
-                LastAssetID = asset.Metadata.FullID;
+                LastAssetID = asset.FullID;
 
                 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
                 if (cacheLayerDecode != null)
                 {
-                    cacheLayerDecode.syncdecode(asset.Metadata.FullID, asset.Data);
+                    cacheLayerDecode.syncdecode(asset.FullID, asset.Data);
                 }
                 cacheLayerDecode = null;
 
@@ -256,7 +256,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 UUID oldID = tmptex.DefaultTexture.TextureID;
                 scene.CommsManager.AssetCache.ExpireAsset(oldID);
 
-                tmptex.DefaultTexture.TextureID = asset.Metadata.FullID;
+                tmptex.DefaultTexture.TextureID = asset.FullID;
                 // I'm pretty sure we always want to force this to true
                 tmptex.DefaultTexture.Fullbright = true;
 
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
 
                 UUID toID = new UUID(address.Substring(0, address.IndexOf("@")));
 
-                String unused;
-
                 if (IsLocal(toID)) // TODO FIX check to see if it is local
                 {
                     // object in this region