* 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.

1 files changed, 10 insertions, 11 deletions

diff --git a/OpenSim/Region/Environment/Scenes/EntityList.cs b/OpenSim/Region/Environment/Scenes/EntityList.cs
index ff8def2..09eb84f 100644
--- a/OpenSim/Region/Environment/Scenes/EntityList.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityList.cs
@@ -29,9 +29,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using Axiom.Math;
-using libsecondlife;
-using libsecondlife.Packets;
+using OpenMetaverse;
+using OpenMetaverse.Packets;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Types;
@@ -69,9 +68,9 @@ namespace OpenSim.Region.Environment.Scenes
         // ListObjects()
         // ListPresenes()
         // RemoveAll()
-        // FindObject(LLUUID)
+        // FindObject(UUID)
         // FindObject(int)
-        // FindPresence(LLUUID)
+        // FindPresence(UUID)
         
         public void Add(SceneObjectGroup obj)
         {
@@ -84,7 +83,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_pres_by_uuid[pres.UUID] = pres;
         }
 
-        public SceneObjectGroup RemoveObject(LLUUID uuid)
+        public SceneObjectGroup RemoveObject(UUID uuid)
         {
             SceneObjectGroup sog = null;
             try 
@@ -101,7 +100,7 @@ namespace OpenSim.Region.Environment.Scenes
             return sog;
         }
         
-        public ScenePresence RemovePresence(LLUUID uuid)
+        public ScenePresence RemovePresence(UUID uuid)
         {
             ScenePresence sp = null;
             try 
@@ -117,7 +116,7 @@ namespace OpenSim.Region.Environment.Scenes
             return sp;   
         }
 
-        public SceneObjectGroup FindObject(LLUUID uuid)
+        public SceneObjectGroup FindObject(UUID uuid)
         {
             try
             {
@@ -135,7 +134,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             try 
             {
-                LLUUID uuid = (LLUUID)m_obj_by_local[local];
+                UUID uuid = (UUID)m_obj_by_local[local];
                 SceneObjectGroup sog = (SceneObjectGroup)m_obj_by_uuid[uuid];
                 return sog;
             }
@@ -146,7 +145,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public ScenePresence FindPresense(LLUUID uuid)
+        public ScenePresence FindPresense(UUID uuid)
         {
             try
             {
@@ -159,4 +158,4 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
     }
-}
\ No newline at end of file
+}