* Updating the version of the ODE library. (big update). The Mac library needs to be updated still.

* Adding some XMPP stuff that's incomplete. 

3 files changed, 11 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs
index a572eb5..7560c90 100644
--- a/OpenSim/Region/Environment/Modules/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
+using System;
 using System.Collections.Generic;
 using libsecondlife;
 using Nini.Config;
@@ -107,6 +107,12 @@ namespace OpenSim.Region.Environment.Modules
                     {
                         m_rootAgents[avatar.UUID] = avatar.RegionHandle;
                         m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + ".");
+                        if (avatar.JID.Length > 0)
+                        {
+                            JId avatarID = new JId(avatar.JID);
+                            // REST Post XMPP Stanzas!
+
+                        }
                         // Claim User! my user!  Mine mine mine!
                     }
                 }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 774e3b4..365c884 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -77,6 +77,8 @@ namespace OpenSim.Region.Environment.Scenes
 
         public bool IsRestrictedToRegion = false;
 
+        public string JID = string.Empty;
+
         // Agent moves with a PID controller causing a force to be exerted.
         private bool m_newForce = false;
         private bool m_newCoarseLocations = true;
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 8529234..673818a 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -290,8 +290,8 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         internal void waitForSpaceUnlock(IntPtr space)
         {
-            if (space != (IntPtr)0)
-                while (d.SpaceLockQuery(space)){  } // Wait and do nothing
+            //if (space != (IntPtr)0)
+                //while (d.SpaceLockQuery(space)){  } // Wait and do nothing
         }
 
         /// <summary>