From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * This is the fabled LibOMV update with all of the libOMV types from
 JHurliman * This is a HUGE OMG update and will definitely have unknown side
 effects.. so this is really only for the strong hearted at this point. 
 Regular people should let the dust settle. * This has been tested to work
 with most basic functions. However..   make sure you back up 'everything'
 before using this.  It's that big! * Essentially we're back at square 1 in
 the testing phase..  so lets identify things that broke.

---
 .../Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework/AssetLoader/Filesystem')

diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 7f0e2d6..73489ec 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Xml;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using Nini.Config;
 
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
         protected static AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage)
         {
             AssetBase asset = new AssetBase(
-                new LLUUID(assetIdStr),
+                new UUID(assetIdStr),
                 name
                 );
 
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
 
         public void ForEachDefaultXmlAsset(Action<AssetBase> action)
         {
-            string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.xml");
+            string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.Xml");
 
             ForEachDefaultXmlAsset(assetSetFilename, action);
         }
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
             }
             else
             {
-                m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.xml does not exist!  No assets loaded.");
+                m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.Xml does not exist!  No assets loaded.");
             }
 
             assets.ForEach(action);
@@ -142,7 +142,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
 
                     for (int i = 0; i < source.Configs.Count; i++)
                     {
-                        string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
+                        string assetIdStr = source.Configs[i].GetString("assetID", UUID.Random().ToString());
                         string name = source.Configs[i].GetString("name", String.Empty);
                         sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
                         string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty));
-- 
cgit v1.1