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.

---
 .../Region/Modules/AvatarFactory/AvatarFactoryModule.cs    | 14 +++++++-------
 OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs    |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Modules')

diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index 671b854..ab86d10 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Reflection;
 
 using System.Threading;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Data.Base;
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
         private Scene m_scene = null;
         private static readonly AvatarAppearance def = new AvatarAppearance();
 
-        public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance)
+        public bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance)
         {
             CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId);
             //if ((profile != null) && (profile.RootFolder != null))
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
 
         }
 
-        private AvatarAppearance CreateDefault(LLUUID avatarId)
+        private AvatarAppearance CreateDefault(UUID avatarId)
         {
             AvatarAppearance appearance = null;
             AvatarWearable[] wearables;
@@ -127,13 +127,13 @@ namespace OpenSim.Region.Modules.AvatarFactory
             {
                 for (int i = 0; i < 13; i++)
                 {
-                    if (appearance.Wearables[i].ItemID == LLUUID.Zero)
+                    if (appearance.Wearables[i].ItemID == UUID.Zero)
                     {
-                        appearance.Wearables[i].AssetID = LLUUID.Zero;
+                        appearance.Wearables[i].AssetID = UUID.Zero;
                     }
                     else
                     {
-                        // LLUUID assetId;
+                        // UUID assetId;
 
                         InventoryItemBase baseItem = profile.RootFolder.FindItem(appearance.Wearables[i].ItemID);
 
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
             wearables = AvatarWearable.DefaultWearables;
         }
 
-        public void UpdateDatabase(LLUUID user, AvatarAppearance appearance)
+        public void UpdateDatabase(UUID user, AvatarAppearance appearance)
         {
             m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance);
         }
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index a1c1b88..4bab7c9 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
         private string m_svnpass = "password";
 
         private TimeSpan m_svnperiod = new TimeSpan(0, 0, 15, 0, 0);
-        private string m_svnurl = "svn://insert.your.svn/here/";
+        private string m_svnurl = "svn://insert.Your.svn/here/";
         private string m_svnuser = "username";
 
         #region SvnModule Core
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
         public void LoadRegion(Scene scene)
         {
             scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
-                                    Slash.DirectorySeparatorChar + "objects.xml");
+                                    Slash.DirectorySeparatorChar + "objects.Xml");
             scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
                                                                         Slash.DirectorySeparatorChar + "heightmap.r32");
             m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ").");
-- 
cgit v1.1