356 files changed, 8373 insertions, 5947 deletions

diff --git a/.nant/local.include b/.nant/local.include
index 8c72c80..f78c6a6 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -53,6 +53,11 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 
 
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.serialization.tests">
+    <arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" />
+  </exec>
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.serialization.tests)==0}" /> 
+
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
     <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
   </exec>
@@ -223,6 +228,11 @@
     <arg value="-xml=test-results/OpenSim.Framework.Communications.Tests.dll-Results.xml" />
   </exec>
 
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.serialization.tests">
+    <arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" />
+    <arg value="-xml=test-results/OpenSim.Framework.Serialization.Tests.dll-Results.xml" />
+  </exec>
+
  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.servers.tests">
     <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Framework.Servers.Tests.dll-Results.xml" />
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 6a66116..0f827b0 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -69,7 +69,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
         protected CommunicationsManager m_commsManager;
         protected GridInfoService m_gridInfoService;
-        protected IHyperlink HGServices = null;
 
         protected IRegionCreator m_regionCreator;
 
@@ -144,7 +143,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
                 // We are in grid mode
                 InitialiseHGGridServices(libraryRootFolder);
             }
-            HGCommands.HGServices = HGServices;
         }
 
         protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder)
@@ -187,19 +185,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         }
 
         protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
-        {    
-            HGGridServicesStandalone gridService 
-                = new HGGridServicesStandalone(
-                    m_openSim.NetServersInfo, m_httpServer, m_openSim.SceneManager);                         
-
+        {
             m_commsManager 
                 = new HGCommunicationsStandalone(
                     m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, 
-                    gridService, 
-                    libraryRootFolder, false);                        
+                    libraryRootFolder, false);
             
-            HGServices = gridService;
-
             CreateGridInfoService();
         }
 
@@ -210,8 +201,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
                     m_openSim.NetServersInfo,
                     m_openSim.SceneManager, libraryRootFolder);
 
-            HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices;
-
             m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
             m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
             if (m_openSim.userStatsURI != String.Empty)
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 7e0a4ba..ef45f73 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -69,7 +69,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         private string m_name = "RemoteAdminPlugin";
         private string m_version = "0.0";
 
-        //AnakinLohner 0.6.5-post-fixes
         //guard for XmlRpc-related methods
         private void FailIfRemoteAdminDisabled(string requestName)
         {
@@ -142,7 +141,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_acl_remove"] = XmlRpcAccessListRemove;
                     availableMethods["admin_acl_list"] = XmlRpcAccessListList;
 
-                    // Either enable full remote functionality or just selected features                    
+                    // Either enable full remote functionality or just selected features
                     string enabledMethods = m_config.GetString("enabled_methods", "all");
 
                     // To get this, you must explicitly specify "all" or
@@ -469,7 +468,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         {
             m_log.Info("[RADMIN]: CreateRegion: new request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("CreateRegion");
 
             XmlRpcResponse response = new XmlRpcResponse();
@@ -477,7 +475,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             lock (rslock)
             {
-
                 int  m_regionLimit = m_config.GetInt("region_limit", 0);
                 bool m_enableVoiceForNewRegions = m_config.GetBoolean("create_region_enable_voice", false);
                 bool m_publicAccess = m_config.GetBoolean("create_region_public", true);
@@ -502,7 +499,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     // check whether we still have space left (iff we are using limits)
                     if (m_regionLimit != 0 && m_app.SceneManager.Scenes.Count >= m_regionLimit)
-                        throw new Exception(String.Format("cannot instantiate new region, server capacity {0} already reached; delete regions first", 
+                        throw new Exception(String.Format("cannot instantiate new region, server capacity {0} already reached; delete regions first",
                                                           m_regionLimit));
                     // extract or generate region ID now
                     Scene scene = null;
@@ -561,7 +558,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
                                 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY));
 
-
                     region.ExternalHostName = (string) requestData["external_address"];
 
                     string masterFirst = (string) requestData["region_master_first"];
@@ -580,10 +576,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         if (masterFirst != String.Empty && masterLast != String.Empty) // User requests a master avatar
                         {
                             // no client supplied UUID: look it up...
-                            CachedUserInfo userInfo 
+                            CachedUserInfo userInfo
                                 = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(
                                     masterFirst, masterLast);
-                                
+
                             if (null == userInfo)
                             {
                                 m_log.InfoFormat("master avatar does not exist, creating it");
@@ -636,7 +632,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}",
                                           region.RegionID, regionXmlPath);
                         region.SaveRegionToFile("dynamic region", regionXmlPath);
-                    } 
+                    }
                     else
                     {
                         region.Persistent = false;
@@ -664,7 +660,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         {
                             parcel.landData.Flags |= (uint) ParcelFlags.AllowVoiceChat;
                             parcel.landData.Flags |= (uint) ParcelFlags.UseEstateVoiceChan;
-                            ((Scene)newscene).LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData);                    
+                            ((Scene)newscene).LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData);
                         }
                     }
 
@@ -684,7 +680,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     response.Value = responseData;
                 }
-                    
+
                 m_log.Info("[RADMIN]: CreateRegion: request complete");
                 return response;
             }
@@ -756,7 +752,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 return response;
             }
         }
-                    
+
         /// <summary>
         /// Close a region.
         /// <summary>
@@ -798,7 +794,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
                     checkStringParameters(request, new string[] {"password"});
-                    
+
                     if (requestData.ContainsKey("region_id") &&
                         !String.IsNullOrEmpty((string) requestData["region_id"]))
                     {
@@ -899,8 +895,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     if (!m_app.SceneManager.TryGetScene(regionName, out scene))
                         throw new Exception(String.Format("region \"{0}\" does not exist", regionName));
 
-                    // Modify access 
-                    scene.RegionInfo.EstateSettings.PublicAccess = 
+                    // Modify access
+                    scene.RegionInfo.EstateSettings.PublicAccess =
                         getBoolean(requestData,"public", scene.RegionInfo.EstateSettings.PublicAccess);
                     if (scene.RegionInfo.Persistent)
                         scene.RegionInfo.EstateSettings.Save();
@@ -988,8 +984,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         public XmlRpcResponse XmlRpcCreateUserMethod(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             m_log.Info("[RADMIN]: CreateUser: new request");
-            
-            //AnakinLohner 0.6.5-post-fixes
+
             FailIfRemoteAdminDisabled("CreateUser");
 
             XmlRpcResponse response = new XmlRpcResponse();
@@ -1024,13 +1019,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     if (requestData.Contains("user_email"))
                         email = (string)requestData["user_email"];
 
-                    CachedUserInfo userInfo =  
+                    CachedUserInfo userInfo =
                         m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(firstname, lastname);
-                                
+
                     if (null != userInfo)
                         throw new Exception(String.Format("Avatar {0} {1} already exists", firstname, lastname));
 
-                    UUID userID = 
+                    UUID userID =
                         m_app.CommunicationsManager.UserAdminService.AddUser(firstname, lastname,
                                                                              passwd, email, regX, regY);
 
@@ -1101,7 +1096,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         {
             m_log.Info("[RADMIN]: UserExists: new request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("UserExists");
 
             XmlRpcResponse response = new XmlRpcResponse();
@@ -1117,8 +1111,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 string firstname = (string) requestData["user_firstname"];
                 string lastname = (string) requestData["user_lastname"];
 
-                CachedUserInfo userInfo 
-                    = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(firstname, lastname);                 
+                CachedUserInfo userInfo
+                    = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(firstname, lastname);
 
                 responseData["user_firstname"] = firstname;
                 responseData["user_lastname"] = lastname;
@@ -1131,10 +1125,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 else
                 {
                     responseData["success"] = true;
-                    responseData["lastlogin"] = userInfo.UserProfile.LastLogin;                
+                    responseData["lastlogin"] = userInfo.UserProfile.LastLogin;
                 }
 
-
                 response.Value = responseData;
             }
             catch (Exception e)
@@ -1252,7 +1245,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     if (requestData.ContainsKey("about_virtual_world"))
                         aboutAvatar = (string)requestData["about_virtual_world"];
 
-                    UserProfileData userProfile 
+                    UserProfileData userProfile
                         = m_app.CommunicationsManager.UserService.GetUserProfile(firstname, lastname);
 
                     if (null == userProfile)
@@ -1308,20 +1301,18 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             m_log.Info("[RADMIN]: UpdateUserAccount: request complete");
             return response;
-
         }
 
         /// <summary>
         /// This method is called by the user-create and user-modify methods to establish
         /// or change, the user's appearance. Default avatar names can be specified via
-        /// the config file, but must correspond to avatars in the default appearance 
+        /// the config file, but must correspond to avatars in the default appearance
         /// file, or pre-existing in the user database.
         /// This should probably get moved into somewhere more core eventually.
         /// </summary>
 
         private void updateUserAppearance(Hashtable responseData, Hashtable requestData, UUID userid)
         {
-
             m_log.DebugFormat("[RADMIN] updateUserAppearance");
 
             string dmale   = m_config.GetString("default_male", "Default Male");
@@ -1347,7 +1338,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         break;
                 }
             }
-            
+
             // Has an explicit model been specified?
 
             if (requestData.Contains("model"))
@@ -1384,7 +1375,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 return;
             }
 
-            // Set current user's appearance. This bit is easy. The appearance structure is populated with 
+            // Set current user's appearance. This bit is easy. The appearance structure is populated with
             // actual asset ids, however to complete the magic we need to populate the inventory with the
             // assets in question.
 
@@ -1393,7 +1384,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             m_log.DebugFormat("[RADMIN] Finished setting appearance for avatar {0}, using model {1}",
                               userid, model);
         }
-        
+
         /// <summary>
         /// This method is called by updateAvatarAppearance once any specified model has been
         /// ratified, or an appropriate default value has been adopted. The intended prototype
@@ -1402,19 +1393,18 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private void establishAppearance(UUID dest, UUID srca)
         {
-
             m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", dest, srca);
 
             AvatarAppearance ava = m_app.CommunicationsManager.AvatarService.GetUserAppearance(srca);
 
             // If the model has no associated appearance we're done.
 
-            // if (ava == null) 
+            // if (ava == null)
             // {
             //     return new AvatarAppearance();
             // }
 
-            if (ava == null) 
+            if (ava == null)
                 return;
 
             UICallback sic  = new UICallback();
@@ -1423,7 +1413,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             try
             {
-
                 Dictionary<UUID,UUID> imap = new Dictionary<UUID,UUID>();
 
                 iserv.GetUserInventory(dest, dic.callback);
@@ -1434,7 +1423,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 if (sic.OK && dic.OK)
                 {
-
                     InventoryFolderImpl efolder;
                     InventoryFolderImpl srcf = sic.root.FindFolderForType(5);
                     InventoryFolderImpl dstf = dic.root.FindFolderForType(5);
@@ -1460,7 +1448,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                if (item.Folder == folder.ID)
                                 {
                                     InventoryItemBase dsti = new InventoryItemBase();
-                                    dsti.ID = UUID.Random(); 
+                                    dsti.ID = UUID.Random();
                                     dsti.Name = item.Name;
                                     dsti.Description = item.Description;
                                     dsti.InvType = item.InvType;
@@ -1494,7 +1482,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             ava.SetWearable(i, dw);
                         }
                     }
-
                 }
                 else
                 {
@@ -1502,7 +1489,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
 
                 m_app.CommunicationsManager.AvatarService.UpdateUserAppearance(dest, ava);
-
             }
             catch (Exception e)
             {
@@ -1510,16 +1496,15 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                  dest, e.Message);
                 return;
             }
-            
-            return;
 
+            return;
         }
 
         ///<summary>
         /// This method is called if a given model avatar name can not be found. If the external
-        /// file has already been loaded once, then control returns immediately. If not, then it 
+        /// file has already been loaded once, then control returns immediately. If not, then it
         /// looks for a default appearance file. This file contains XML definitions of zero or more named
-        /// avatars, each avatar can specify zero or more "outfits". Each outfit is a collection 
+        /// avatars, each avatar can specify zero or more "outfits". Each outfit is a collection
         /// of items that together, define a particular ensemble for the avatar. Each avatar should
         /// indicate which outfit is the default, and this outfit will be automatically worn. The
         /// other outfits are provided to allow "real" avatars a way to easily change their outfits.
@@ -1527,7 +1512,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private bool createDefaultAvatars()
         {
-
             // Only load once
 
             if (daload)
@@ -1543,10 +1527,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             try
             {
-
                 string dafn = null;
- 
-                //AnakinLohner 0.6.5-post-fixes
+
                 //m_config may be null if RemoteAdmin configuration secition is missing or disabled in OpenSim.ini
                 if (m_config != null)
                 {
@@ -1555,7 +1537,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 if (File.Exists(dafn))
                 {
-
                     XmlDocument doc = new XmlDocument();
                     string name     = "*unknown*";
                     string email    = "anon@anon";
@@ -1630,12 +1611,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             }
 
                             m_log.DebugFormat("[RADMIN] User {0}[{1}] created or retrieved", name, ID);
-                            include = true; 
+                            include = true;
                         }
                         catch (Exception e)
                         {
                             m_log.DebugFormat("[RADMIN] Error creating user {0} : {1}", name, e.Message);
-                            include = false; 
+                            include = false;
                         }
 
                         // OK, User has been created OK, now we can install the inventory.
@@ -1654,7 +1635,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             {
                                 mava = new AvatarAppearance();
                             }
-                            
+
                             {
                                 AvatarWearable[] wearables = mava.Wearables;
                                 for (int i=0; i<wearables.Length; i++)
@@ -1670,8 +1651,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             if (uic.OK)
                             try
                             {
-
-                                m_log.DebugFormat("[RADMIN] {0} folders, {1} items in inventory", 
+                                m_log.DebugFormat("[RADMIN] {0} folders, {1} items in inventory",
                                    uic.folders.Count, uic.items.Count);
 
                                 InventoryFolderImpl cfolder = uic.root.FindFolderForType(5);
@@ -1699,7 +1679,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                                 foreach (XmlElement outfit in outfits)
                                 {
-
                                     m_log.DebugFormat("[RADMIN] Loading outfit {0} for {1}",
                                         GetStringAttribute(outfit,"name","?"), GetStringAttribute(avatar,"name","?"));
 
@@ -1707,7 +1686,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                     select  = (GetStringAttribute(outfit,"default","no") == "yes");
                                     efolder = null;
 
-                                    // If the folder already exists, re-use it. The defaults may 
+                                    // If the folder already exists, re-use it. The defaults may
                                     // change over time. Augment only.
                                     foreach (InventoryFolderImpl folder in uic.folders)
                                     {
@@ -1756,10 +1735,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                                         InventoryItemBase iitem = null;
 
-                                        if ((iitem = efolder.FindAsset(assetid)) == null)   
+                                        if ((iitem = efolder.FindAsset(assetid)) == null)
                                         {
                                             iitem = new InventoryItemBase();
-                                            iitem.ID = UUID.Random(); 
+                                            iitem.ID = UUID.Random();
                                             iitem.Name = GetStringAttribute(item,"name","");
                                             iitem.Description = GetStringAttribute(item,"desc","");
                                             iitem.InvType = GetIntegerAttribute(item,"invtype",-1);
@@ -1820,9 +1799,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
 
             return true;
-
         }
-    
+
         /// <summary>
         /// Load an OAR file into a region..
         /// <summary>
@@ -1859,9 +1837,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         {
             m_log.Info("[RADMIN]: Received Load OAR Administrator Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Load OAR");
-            
+
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
@@ -1962,9 +1939,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         {
             m_log.Info("[RADMIN]: Received Save OAR Administrator Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Save OAR");
-            
+
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
@@ -2003,7 +1979,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
 
-
                 if (archiver != null)
                 {
                     scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted;
@@ -2014,11 +1989,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 else
                     throw new Exception("Archiver module not present for scene");
 
-
                 responseData["saved"] = true;
 
                 response.Value = responseData;
-
             }
             catch (Exception e)
             {
@@ -2045,7 +2018,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         {
             m_log.Info("[RADMIN]: Received Load XML Administrator Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Load XML");
 
             XmlRpcResponse response = new XmlRpcResponse();
@@ -2129,12 +2101,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
         }
 
-
         public XmlRpcResponse XmlRpcSaveXMLMethod(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             m_log.Info("[RADMIN]: Received Save XML Administrator Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Save XML");
 
             XmlRpcResponse response = new XmlRpcResponse();
@@ -2220,7 +2190,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         {
             m_log.Info("[RADMIN]: Received Query XML Administrator Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Query XML");
 
             XmlRpcResponse response = new XmlRpcResponse();
@@ -2255,9 +2224,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 else throw new Exception("neither region_name nor region_uuid given");
 
                 Scene s = m_app.SceneManager.CurrentScene;
-
                 int health = s.GetHealth();
-
                 responseData["health"] = health;
 
                 response.Value = responseData;
@@ -2280,7 +2247,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         {
             m_log.Info("[RADMIN]: Received Command XML Administrator Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Command XML");
 
             XmlRpcResponse response = new XmlRpcResponse();
@@ -2320,12 +2286,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         public XmlRpcResponse XmlRpcAccessListClear(XmlRpcRequest request, IPEndPoint remoteClient)
         {
-
             m_log.Info("[RADMIN]: Received Access List Clear Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Access List Clear");
-            
+
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
@@ -2360,7 +2324,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 s.RegionInfo.EstateSettings.EstateAccess = new UUID[]{};
                 if (s.RegionInfo.Persistent)
                     s.RegionInfo.EstateSettings.Save();
-
             }
             catch (Exception e)
             {
@@ -2368,7 +2331,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
-
             }
             finally
             {
@@ -2381,12 +2343,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         public XmlRpcResponse XmlRpcAccessListAdd(XmlRpcRequest request, IPEndPoint remoteClient)
         {
-
             m_log.Info("[RADMIN]: Received Access List Add Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Access List Add");
-            
+
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
@@ -2419,7 +2379,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 int addk = 0;
 
-               if (requestData.Contains("users"))
+                if (requestData.Contains("users"))
                 {
                     UserProfileCacheService ups = m_app.CommunicationsManager.UserProfileCacheService;
                     Scene s = m_app.SceneManager.CurrentScene;
@@ -2450,7 +2410,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
 
                 responseData["added"] = addk;
-
             }
             catch (Exception e)
             {
@@ -2458,7 +2417,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
-
             }
             finally
             {
@@ -2471,12 +2429,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         public XmlRpcResponse XmlRpcAccessListRemove(XmlRpcRequest request, IPEndPoint remoteClient)
         {
-
             m_log.Info("[RADMIN]: Received Access List Remove Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Access List Remove");
-            
+
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
@@ -2509,7 +2465,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 int remk = 0;
 
-               if (requestData.Contains("users"))
+                if (requestData.Contains("users"))
                 {
                     UserProfileCacheService ups = m_app.CommunicationsManager.UserProfileCacheService;
                     Scene s = m_app.SceneManager.CurrentScene;
@@ -2539,7 +2495,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
 
                 responseData["removed"] = remk;
-
             }
             catch (Exception e)
             {
@@ -2547,7 +2502,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
-
             }
             finally
             {
@@ -2560,12 +2514,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         public XmlRpcResponse XmlRpcAccessListList(XmlRpcRequest request, IPEndPoint remoteClient)
         {
-
             m_log.Info("[RADMIN]: Received Access List List Request");
 
-            //AnakinLohner 0.6.5-post-fixes
             FailIfRemoteAdminDisabled("Access List List");
-            
+
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
@@ -2608,9 +2560,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         users[user.ToString()] = udata.UserProfile.Name;
                     }
                 }
-                
-                responseData["users"] = users;
 
+                responseData["users"] = users;
             }
             catch (Exception e)
             {
@@ -2618,7 +2569,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
-
             }
             finally
             {
@@ -2695,12 +2645,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         public void Dispose()
         {
         }
-
     }
 
     class UICallback
     {
-
         private  Object uilock = new Object();
         internal InventoryFolderImpl root = null;
         internal List<InventoryFolderImpl> folders;
@@ -2720,7 +2668,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         public void GetInventory()
         {
-
             Dictionary<UUID, InventoryFolderImpl> fmap = new Dictionary<UUID, InventoryFolderImpl>();
 
             if (OK == false)
@@ -2729,7 +2676,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 {
                     if (OK == false)
                         System.Threading.Monitor.Wait(uilock);
-                }  
+                }
             }
 
             // Got the inventory OK. So now merge the content of the default appearance
@@ -2774,8 +2721,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                  fmap[item.Folder].Items.Add(item.ID, item);
             }
-
         }
     }
-
 }
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index 13f6426..db62d52 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -207,7 +207,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 // This plugin will only be enabled if the broader
                 // REST plugin mechanism is enabled.
 
-                Rest.Log.InfoFormat("{0}  Plugin is initializing", MsgId);
+                //Rest.Log.InfoFormat("{0}  Plugin is initializing", MsgId);
 
                 base.Initialise(openSim);
 
@@ -216,7 +216,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
                 if (!IsEnabled)
                 {
-                    Rest.Log.WarnFormat("{0} Plugins are disabled", MsgId);
+                    //Rest.Log.WarnFormat("{0} Plugins are disabled", MsgId);
                     return;
                 }
 
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index a407b9e..9c90a7e 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -218,7 +218,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
             httpResponse.ContentType = "text/xml";
             
             IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)              
+            if (serialiser != null)
                 serialiser.SavePrimsToXml2(scene, new StreamWriter(httpResponse.OutputStream), min, max);
             
             return "";
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index f790c5e..02ef588 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -68,9 +68,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
                 base.Initialise(openSim);
                 if (!IsEnabled)
                 {
-                    m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID);
+                    //m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID);
                     return;
                 }
+                
                 m_log.InfoFormat("{0} REST region plugin enabled", MsgID);
 
                 // add REST method handlers
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index fd23384..ff1502a 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -216,7 +216,7 @@ namespace OpenSim.ApplicationPlugins.Rest
 
                 if (!_config.GetBoolean("enabled", false))
                 {
-                    m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID);
+                    //m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID);
                     return;
                 }
 
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index f55d9fc..ccd38d4 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Client.Linden
             {
                 if (m_firstScene != null)
                 {
-                    return m_firstScene.CommsManager.GridService.RegionLoginsEnabled;
+                    return m_firstScene.SceneGridService.RegionLoginsEnabled;
                 }
                 else
                 {
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index 4a31e95..fb0aaa5 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Client.Linden
             {
                 if (m_firstScene != null)
                 {
-                    return m_firstScene.CommsManager.GridService.RegionLoginsEnabled;
+                    return m_firstScene.SceneGridService.RegionLoginsEnabled;
                 }
                 else
                 {
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 180f5e0..e901ff6 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Client.MXP.ClientStack
             String typeName = ToOmType(primShape.PCode);
             m_log.Info("[MXP ClientStack] Transmitting Primitive" + typeName);
 
-            PerceptionEventMessage pe = new PerceptionEventMessage();           
+            PerceptionEventMessage pe = new PerceptionEventMessage();
             pe.ObjectFragment.ObjectId = objectID.Guid;
 
             pe.ObjectFragment.ParentObjectId = Guid.Empty;
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 71dd525..7a607ab 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -39,13 +39,15 @@ namespace OpenSim.Data
         public string RegionName;
         public int posX;
         public int posY;
+        public int sizeX;
+        public int sizeY;
         public Dictionary<string, object> Data;
     }
 
     /// <summary>
     /// An interface for connecting to the authentication datastore
     /// </summary>
-    public interface IRegionData
+    public interface IRegionData 
     {
         RegionData Get(UUID regionID, UUID ScopeID);
         List<RegionData> Get(string regionName, UUID ScopeID);
@@ -57,5 +59,6 @@ namespace OpenSim.Data
         bool SetDataItem(UUID principalID, string item, string value);
 
         bool Delete(UUID regionID);
+
     }
 }
diff --git a/OpenSim/Data/IUserData.cs b/OpenSim/Data/IUserData.cs
index ee69366..e9a1e81 100644
--- a/OpenSim/Data/IUserData.cs
+++ b/OpenSim/Data/IUserData.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Data
         
         /// <summary>
         /// Get a user from a given uri.
-        /// </summary>  
+        /// </summary>
         /// <param name="uri"></param>
         /// <returns>The user data profile.  Null if no user is found.</returns>
         UserProfileData GetUserByUri(Uri uri);
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index d193cf5..25f7cf0 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Data.MSSQL
                             (@id, @name, @description, @assetType, @local, 
                              @temporary, @create_time, @access_time, @data)";
             
-            string assetName = asset.Name;            
+            string assetName = asset.Name;
             if (asset.Name.Length > 64)
             {
                 assetName = asset.Name.Substring(0, 64);
@@ -223,7 +223,7 @@ namespace OpenSim.Data.MSSQL
                             local = @local, temporary = @temporary, data = @data
                            WHERE id = @keyId;";
 
-            string assetName = asset.Name;            
+            string assetName = asset.Name;
             if (asset.Name.Length > 64)
             {
                 assetName = asset.Name.Substring(0, 64);
diff --git a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
index 78fc22c..099faea 100644
--- a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Data.MSSQL
 
                     insertBuilder.AppendFormat("insert into '{0}' ('UUID', '", m_Realm);
                     insertBuilder.Append(String.Join("', '", fields));
-                    insertBuilder.Append("') values ( @principalID, @");
+                    insertBuilder.Append("') values (@principalID, @");
                     insertBuilder.Append(String.Join(", @", fields));
                     insertBuilder.Append(")");
 
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 27a4e70..1482184 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -428,7 +428,7 @@ namespace OpenSim.Data.MSSQL
                              @inventoryBasePermissions, @inventoryEveryOnePermissions, @inventoryGroupPermissions, @salePrice, @saleType,
                              @creationDate, @groupID, @groupOwned, @flags)";
             
-            string itemName = item.Name;            
+            string itemName = item.Name;
             if (item.Name.Length > 64)
             {
                 itemName = item.Name.Substring(0, 64);
@@ -529,7 +529,7 @@ namespace OpenSim.Data.MSSQL
             {
                 itemDesc = item.Description.Substring(0, 128);
                 m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update");
-            }            
+            }
             
             using (AutoClosingSqlCommand command = database.Query(sql))
             {
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index adedcce..e26a830 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Data.MSSQL
                                     sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID);
 
                                 sceneObjectPart.UUID = groupID;
-                            }                               
+                            }
 
                             grp = new SceneObjectGroup(sceneObjectPart);
                         }
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 1520888..38be9f4 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Data.MSSQL
                 conn.Open();
                 Migration m = new Migration(conn, GetType().Assembly, "UserStore");
                 m.Update();
-            }            
+            }
         }
 
         public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
@@ -152,7 +152,7 @@ namespace OpenSim.Data.MSSQL
                     StringBuilder insertBuilder = new StringBuilder();
                     insertBuilder.AppendFormat("insert into '{0}' ('UUID', 'ScopeID', '", m_Realm);
                     insertBuilder.Append(String.Join("', '", fields));
-                    insertBuilder.Append("') values ( @principalID, @scopeID, @");
+                    insertBuilder.Append("') values (@principalID, @scopeID, @");
                     insertBuilder.Append(String.Join(", @", fields));
                     insertBuilder.Append(")");
 
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 6efb89d..3ef1053 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -1146,7 +1146,7 @@ ELSE
                 if (reader.IsDBNull(reader.GetOrdinal("homeRegionID")))
                     retval.HomeRegionID = UUID.Zero;
                 else
-                    retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]);       
+                    retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]);
 
                 retval.Created = Convert.ToInt32(reader["created"].ToString());
                 retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
@@ -1200,7 +1200,7 @@ ELSE
                 if (reader.IsDBNull(reader.GetOrdinal("partner")))
                     retval.Partner = UUID.Zero;
                 else
-                    retval.Partner = new UUID((Guid)reader["partner"]);    
+                    retval.Partner = new UUID((Guid)reader["partner"]);
             }
             else
             {
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 66c34fe..0502b2b 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -204,7 +204,7 @@ namespace OpenSim.Data.MySQL
                         "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?data)",
                         _dbConnection.Connection);
 
-                string assetName = asset.Name;            
+                string assetName = asset.Name;
                 if (asset.Name.Length > 64)
                 {
                     assetName = asset.Name.Substring(0, 64);
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index afd59bd..e508b52 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Data.MySQL
             {
                 string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
                         String.Join("`, `", fields) +
-                        "`) values ( ?principalID, ?" + String.Join(", ?", fields) + ")";
+                        "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
 
                 cmd.CommandText = insert;
 
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 4521a0f..0eecf06 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -325,10 +325,10 @@ namespace OpenSim.Data.MySQL
                 UUID GroupID = UUID.Zero;
                 UUID.TryParse((string)reader["avatarID"], out Owner);
                 UUID.TryParse((string)reader["groupID"], out GroupID);
-                item.Owner = Owner;                
+                item.Owner = Owner;
                 item.GroupID = GroupID;
 
-                // Rest of the parsing.  If these UUID's fail, we're dead anyway                
+                // Rest of the parsing.  If these UUID's fail, we're dead anyway
                 item.ID = new UUID((string) reader["inventoryID"]);
                 item.AssetID = new UUID((string) reader["assetID"]);
                 item.AssetType = (int) reader["assetType"];
@@ -472,7 +472,7 @@ namespace OpenSim.Data.MySQL
                     + ", ?inventoryBasePermissions, ?inventoryEveryOnePermissions, ?inventoryGroupPermissions, ?salePrice, ?saleType, ?creationDate"
                     + ", ?groupID, ?groupOwned, ?flags)";
 
-            string itemName = item.Name;            
+            string itemName = item.Name;
             if (item.Name.Length > 64)
             {
                 itemName = item.Name.Substring(0, 64);
@@ -484,7 +484,7 @@ namespace OpenSim.Data.MySQL
             {
                 itemDesc = item.Description.Substring(0, 128);
                 m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length + " to " + itemDesc.Length + " characters on add item");
-            }            
+            }
 
             try
             {
@@ -590,12 +590,12 @@ namespace OpenSim.Data.MySQL
                 "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName, type, version) VALUES ";
             sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?type, ?version)";
 
-            string folderName = folder.Name;            
+            string folderName = folder.Name;
             if (folderName.Length > 64)
             {
                 folderName = folderName.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length + " to " + folderName.Length + " characters on add folder");
-            }         
+            }
 
             database.CheckConnection();
 
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index 4a16a70..c2dd788 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -464,7 +464,7 @@ namespace OpenSim.Data.MySQL
                                     prim.Name, prim.UUID, prim.GroupPosition, groupID);
                                 
                                 prim.UUID = groupID;
-                            }                            
+                            }
 
                             grp = new SceneObjectGroup(prim);
                         }
@@ -533,7 +533,7 @@ namespace OpenSim.Data.MySQL
         /// <summary>
         /// Load in a prim's persisted inventory.
         /// </summary>
-        /// <param name="prim">The prim</param>        
+        /// <param name="prim">The prim</param>
         private void LoadItems(SceneObjectPart prim)
         {
             lock (m_Connection)
@@ -773,7 +773,7 @@ namespace OpenSim.Data.MySQL
                         "use_estate_sun, fixed_sun, sun_position, " +
                         "covenant, Sandbox, sunvectorx, sunvectory, " +
                         "sunvectorz, loaded_creation_datetime, " +
-                        "loaded_creation_id) values ( ?RegionUUID, ?BlockTerraform, " +
+                        "loaded_creation_id) values (?RegionUUID, ?BlockTerraform, " +
                         "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
                         "?AllowLandResell, ?AllowLandJoinDivide, " +
                         "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index ced26a4..06ef624 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data.MySQL
     {
         private string m_Realm;
         private List<string> m_ColumnNames = null;
-        private int m_LastExpire = 0;
+//        private int m_LastExpire = 0;
 
         public MySqlRegionData(string connectionString, string realm)
                 : base(connectionString)
@@ -77,7 +77,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
             List<RegionData> ret = RunCommand(cmd);
-            if (ret == null)
+            if (ret.Count == 0)
                 return null;
 
             return ret[0];
@@ -95,7 +95,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
             List<RegionData> ret = RunCommand(cmd);
-            if (ret == null)
+            if (ret.Count == 0)
                 return null;
 
             return ret[0];
@@ -138,6 +138,8 @@ namespace OpenSim.Data.MySQL
                 ret.RegionName = result["regionName"].ToString();
                 ret.posX = Convert.ToInt32(result["locX"]);
                 ret.posY = Convert.ToInt32(result["locY"]);
+                ret.sizeX = Convert.ToInt32(result["sizeX"]);
+                ret.sizeY = Convert.ToInt32(result["sizeY"]);
 
                 if (m_ColumnNames == null)
                 {
@@ -170,10 +172,7 @@ namespace OpenSim.Data.MySQL
             result.Close();
             CloseReaderCommand(cmd);
 
-            if (retList.Count > 0)
-                return retList;
-
-            return null;
+            return retList;
         }
 
         public bool Store(RegionData data)
@@ -188,21 +187,25 @@ namespace OpenSim.Data.MySQL
                 data.Data.Remove("posX");
             if (data.Data.ContainsKey("posY"))
                 data.Data.Remove("posY");
+            if (data.Data.ContainsKey("sizeX"))
+                data.Data.Remove("sizeX");
+            if (data.Data.ContainsKey("sizeY"))
+                data.Data.Remove("sizeY");
+            if (data.Data.ContainsKey("locX"))
+                data.Data.Remove("locX");
+            if (data.Data.ContainsKey("locY"))
+                data.Data.Remove("locY");
 
             string[] fields = new List<string>(data.Data.Keys).ToArray();
 
             MySqlCommand cmd = new MySqlCommand();
 
-            string update = "update `"+m_Realm+"` set ";
-            bool first = true;
+            string update = "update `"+m_Realm+"` set locX=?posX, locY=?posY, sizeX=?sizeX, sizeY=?sizeY";
             foreach (string field in fields)
             {
-                if (!first)
-                    update += ", ";
+                update += ", ";
                 update += "`" + field + "` = ?"+field;
 
-                first = false;
-
                 cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
             }
 
@@ -213,13 +216,18 @@ namespace OpenSim.Data.MySQL
 
             cmd.CommandText = update;
             cmd.Parameters.AddWithValue("?regionID", data.RegionID.ToString());
+            cmd.Parameters.AddWithValue("?regionName", data.RegionName);
             cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString());
+            cmd.Parameters.AddWithValue("?posX", data.posX.ToString());
+            cmd.Parameters.AddWithValue("?posY", data.posY.ToString());
+            cmd.Parameters.AddWithValue("?sizeX", data.sizeX.ToString());
+            cmd.Parameters.AddWithValue("?sizeY", data.sizeY.ToString());
 
             if (ExecuteNonQuery(cmd) < 1)
             {
-                string insert = "insert into `" + m_Realm + "` (`uuid`, `ScopeID`, `" +
+                string insert = "insert into `" + m_Realm + "` (`uuid`, `ScopeID`, `locX`, `locY`, `sizeX`, `sizeY`, `regionName`, `" +
                         String.Join("`, `", fields) +
-                        "`) values ( ?regionID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
+                        "`) values ( ?regionID, ?scopeID, ?posX, ?posY, ?sizeX, ?sizeY, ?regionName, ?" + String.Join(", ?", fields) + ")";
 
                 cmd.CommandText = insert;
 
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index 39d60ca..d48144d 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data.MySQL
     {
         private string m_Realm;
         private List<string> m_ColumnNames = null;
-        private int m_LastExpire = 0;
+//        private int m_LastExpire = 0;
 
         public MySqlUserAccountData(string connectionString, string realm)
                 : base(connectionString)
@@ -146,7 +146,7 @@ namespace OpenSim.Data.MySQL
             {
                 string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" +
                         String.Join("`, `", fields) +
-                        "`) values ( ?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
+                        "`) values (?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
 
                 cmd.CommandText = insert;
 
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 537ef6c..04f872f 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -632,7 +632,7 @@ namespace OpenSim.Data.MySQL
             UUID zero = UUID.Zero;
             if (user.ID == zero)
             {
-                return;   
+                return;
             }
             MySQLSuperManager dbm = GetLockedConnection("AddNewUserProfile");
 
@@ -666,7 +666,7 @@ namespace OpenSim.Data.MySQL
         {
             UUID zero = UUID.Zero;
             if (agent.ProfileID == zero || agent.SessionID == zero)
-                return;   
+                return;
 
             MySQLSuperManager dbm = GetLockedConnection("AddNewUserAgent");
             try
diff --git a/OpenSim/Data/MySQL/Resources/004_GridStore.sql b/OpenSim/Data/MySQL/Resources/004_GridStore.sql
new file mode 100644
index 0000000..2238a88
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/004_GridStore.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE regions add column sizeX integer not null default 0;
+ALTER TABLE regions add column sizeY integer not null default 0;
+
+COMMIT;
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
index 7c5cf33..2e7081e 100644
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Data.NHibernate
                     m_log.ErrorFormat("[NHIBERNATE] {0} of id {1} loading threw exception: " + e.ToString(), type.Name, id);
                 }
                 return obj;
-            }            
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 73b630f..1b0c4c9 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Data.NHibernate
             m_log.InfoFormat("[NHIBERNATE] GetUserByUUID: {0} ", uuid);
             
             user = (UserProfileData)manager.Get(typeof(UserProfileData), uuid);
-            if (user != null)    
+            if (user != null)
             {
                 UserAgentData agent = GetAgentByUUID(uuid);
                 if (agent != null)
@@ -245,7 +245,7 @@ namespace OpenSim.Data.NHibernate
             UserProfileData user=GetUserByUUID(agentID);
             user.WebLoginKey = webLoginKey;
             UpdateUserProfile(user);
-            return;         
+            return;
         }
 
         public override void AddNewUserFriend(UUID ownerId, UUID friendId, uint perms) 
@@ -258,7 +258,7 @@ namespace OpenSim.Data.NHibernate
             {
                 manager.Insert(new UserFriend(UUID.Random(), friendId, ownerId, perms));
             }
-            return;         
+            return;
         }
 
         private bool FriendRelationExists(UUID ownerId, UUID friendId)
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index 588b8ac..e8263ea 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -40,13 +40,14 @@ namespace OpenSim.Data.Null
 
         public NullRegionData(string connectionString, string realm)
         {
+            //Console.WriteLine("[XXX] NullRegionData constructor");
         }
 
         public List<RegionData> Get(string regionName, UUID scopeID)
         {
             List<RegionData> ret = new List<RegionData>();
 
-            foreach(RegionData r in m_regionData.Values)
+            foreach (RegionData r in m_regionData.Values)
             {
                 if (regionName.Contains("%"))
                 {
@@ -70,7 +71,7 @@ namespace OpenSim.Data.Null
         {
             List<RegionData> ret = new List<RegionData>();
 
-            foreach(RegionData r in m_regionData.Values)
+            foreach (RegionData r in m_regionData.Values)
             {
                 if (r.posX == posX && r.posY == posY)
                     ret.Add(r);
@@ -94,16 +95,13 @@ namespace OpenSim.Data.Null
         {
             List<RegionData> ret = new List<RegionData>();
 
-            foreach(RegionData r in m_regionData.Values)
+            foreach (RegionData r in m_regionData.Values)
             {
                 if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY)
                     ret.Add(r);
             }
 
-            if (ret.Count > 0)
-                return ret;
-
-            return null;
+            return ret;
         }
 
         public bool Store(RegionData data)
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 1d96631..86d7f6b 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Data
         public uint maturity;
 
 
-        //Data Wrappers        
+        //Data Wrappers
         public string RegionName
         {
             get { return regionName; }
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 3831467..49275cb 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite
             //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
             if (ExistsAsset(asset.FullID))
             {
-                LogAssetLoad(asset);
+                //LogAssetLoad(asset);
 
                 lock (this)
                 {
@@ -173,7 +173,7 @@ namespace OpenSim.Data.SQLite
 
             int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
 
-            m_log.Info("[ASSET DB]: " +
+            m_log.Debug("[ASSET DB]: " +
                                      string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)",
                                                    asset.FullID, asset.Name, asset.Description, asset.Type,
                                                    temporary, local, assetLength));
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index ea076fe..d22a3ec 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -496,7 +496,7 @@ namespace OpenSim.Data.SQLite
         {
             //m_log.DebugFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID);
     
-            DataTable dbItems = ds.Tables["primitems"];          
+            DataTable dbItems = ds.Tables["primitems"];
             String sql = String.Format("primID = '{0}'", prim.UUID.ToString());
             DataRow[] dbItemRows = dbItems.Select(sql);
             IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index c66ab7c..97990e1 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Data.Tests
         public UUID item2;
         public UUID item3;
 
-        public static Random random;        
+        public static Random random;
         
         public string itemname1 = "item1";
 
@@ -173,7 +173,7 @@ namespace OpenSim.Data.Tests
             UUID tmp0 = UUID.Random();
             UUID tmp1 = UUID.Random();
             UUID tmp2 = UUID.Random();
-            UUID tmp3 = UUID.Random();            
+            UUID tmp3 = UUID.Random();
             UUID newregion = UUID.Random();
             SceneObjectPart p1 = NewSOP("SoP 1",tmp1);
             SceneObjectPart p2 = NewSOP("SoP 2",tmp2);
@@ -224,7 +224,7 @@ namespace OpenSim.Data.Tests
             random.NextBytes(partsys);
             DateTime expires = new DateTime(2008, 12, 20);
             DateTime rezzed = new DateTime(2009, 07, 15);
-            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());             
+            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());
             Vector3 offset = new Vector3(random.Next(),random.Next(),random.Next());
             Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
             Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
@@ -261,7 +261,7 @@ namespace OpenSim.Data.Tests
             sop.Shape = pbshap;
             sop.GroupPosition = groupos;
             sop.RotationOffset = rotoff;
-            sop.CreatorID = creator;            
+            sop.CreatorID = creator;
             sop.InventorySerial = iserial;
             sop.TaskInventory = dic;
             sop.ObjectFlags = objf;
@@ -306,7 +306,7 @@ namespace OpenSim.Data.Tests
             Assert.That(expires,Is.EqualTo(sop.Expires), "Assert.That(expires,Is.EqualTo(sop.Expires))");
             Assert.That(rezzed,Is.EqualTo(sop.Rezzed), "Assert.That(rezzed,Is.EqualTo(sop.Rezzed))");
             Assert.That(offset,Is.EqualTo(sop.OffsetPosition), "Assert.That(offset,Is.EqualTo(sop.OffsetPosition))");
-            Assert.That(velocity,Is.EqualTo(sop.Velocity), "Assert.That(velocity,Is.EqualTo(sop.Velocity))");                       
+            Assert.That(velocity,Is.EqualTo(sop.Velocity), "Assert.That(velocity,Is.EqualTo(sop.Velocity))");
             Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity), "Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity))");
             Assert.That(accel,Is.EqualTo(sop.Acceleration), "Assert.That(accel,Is.EqualTo(sop.Acceleration))");
             Assert.That(description,Is.EqualTo(sop.Description), "Assert.That(description,Is.EqualTo(sop.Description))");
@@ -319,7 +319,7 @@ namespace OpenSim.Data.Tests
             Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))");
             Assert.That(updatef,Is.EqualTo(sop.UpdateFlag), "Assert.That(updatef,Is.EqualTo(sop.UpdateFlag))");
             
-            // This is necessary or object will not be inserted in DB            
+            // This is necessary or object will not be inserted in DB
             sop.ObjectFlags = 0;
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
@@ -332,11 +332,11 @@ namespace OpenSim.Data.Tests
             // Makes sure there are no double insertions:
             db.StoreObject(sog,region3);
             sogs = db.LoadObjects(region3);
-            Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");            
+            Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
                 
 
             // Tests if the parameters were inserted correctly
-            SceneObjectPart p = sogs[0].RootPart;               
+            SceneObjectPart p = sogs[0].RootPart;
             Assert.That(regionh,Is.EqualTo(p.RegionHandle), "Assert.That(regionh,Is.EqualTo(p.RegionHandle))");
             //Assert.That(localid,Is.EqualTo(p.LocalId), "Assert.That(localid,Is.EqualTo(p.LocalId))");
             Assert.That(groupos,Is.EqualTo(p.GroupPosition), "Assert.That(groupos,Is.EqualTo(p.GroupPosition))");
@@ -402,7 +402,7 @@ namespace OpenSim.Data.Tests
             random.NextBytes(partsys);
             DateTime expires = new DateTime(2010, 12, 20);
             DateTime rezzed = new DateTime(2005, 07, 15);
-            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());             
+            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());
             Vector3 offset = new Vector3(random.Next(),random.Next(),random.Next());
             Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
             Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
@@ -418,7 +418,7 @@ namespace OpenSim.Data.Tests
             PrimitiveBaseShape pbshap = new PrimitiveBaseShape();
             pbshap = PrimitiveBaseShape.Default;
             Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next());
-            byte updatef = (byte) random.Next(127);            
+            byte updatef = (byte) random.Next(127);
             
             // Updates the region with new values
             SceneObjectGroup sog2 = FindSOG("Adam  West", region3);
@@ -427,7 +427,7 @@ namespace OpenSim.Data.Tests
             sog2.RootPart.Shape = pbshap;
             sog2.RootPart.GroupPosition = groupos;
             sog2.RootPart.RotationOffset = rotoff;
-            sog2.RootPart.CreatorID = creator;            
+            sog2.RootPart.CreatorID = creator;
             sog2.RootPart.TaskInventory = dic;
             sog2.RootPart.Name = name;
             sog2.RootPart.Material = material;
@@ -492,12 +492,12 @@ namespace OpenSim.Data.Tests
             {
                 UUID tmp = UUID.Random();
                 SceneObjectPart sop = NewSOP(("Test SOP " + i.ToString()),tmp);
-                Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());             
+                Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());
                 Vector3 offset = new Vector3(random.Next(),random.Next(),random.Next());
                 Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
                 Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
                 Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
-                Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());  
+                Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
                 
                 sop.GroupPosition = groupos;
                 sop.RotationOffset = rotoff;
@@ -648,7 +648,7 @@ namespace OpenSim.Data.Tests
         {
             InventoryItemBase i = new InventoryItemBase();
             UUID id = UUID.Random();
-            i.ID = id;            
+            i.ID = id;
             UUID folder = UUID.Random();
             i.Folder = folder;
             UUID owner = UUID.Random();
@@ -666,13 +666,13 @@ namespace OpenSim.Data.Tests
             i.NextPermissions = nextperm;
             uint curperm = (uint) random.Next();
             i.CurrentPermissions = curperm;
-            uint baseperm = (uint) random.Next();            
+            uint baseperm = (uint) random.Next();
             i.BasePermissions = baseperm;
             uint eoperm = (uint) random.Next();
             i.EveryOnePermissions = eoperm;
             int assettype = random.Next();
             i.AssetType = assettype;
-            UUID groupid = UUID.Random();            
+            UUID groupid = UUID.Random();
             i.GroupID = groupid;
             bool groupown = true;
             i.GroupOwned = groupown;
@@ -1010,7 +1010,7 @@ namespace OpenSim.Data.Tests
         
         private SceneObjectPart NewSOP(string name, UUID uuid)
         {
-            SceneObjectPart sop = new SceneObjectPart();           
+            SceneObjectPart sop = new SceneObjectPart();
             sop.Name = name;
             sop.Description = name;
             sop.Text = RandomName();
@@ -1042,12 +1042,12 @@ namespace OpenSim.Data.Tests
             int size = random.Next(5,12); 
             char ch ;
             for (int i=0; i<size; i++)
-            {       
+            {
                 ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
                 name.Append(ch);
             }
             return name.ToString();
-        }      
+        }
 //        private InventoryFolderBase NewFolder(UUID id, UUID parent, UUID owner, string name)
 //        {
 //            InventoryFolderBase f = new InventoryFolderBase();
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index f9feb9b..1f472a5 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Data.Tests
             u1.FirstName = "Ugly";
             
             db.UpdateUserProfile(u1);
-            Assert.That("Ugly",Is.EqualTo(u1.FirstName), "Assert.That(\"Ugly\",Is.EqualTo(u1.FirstName))");                   
+            Assert.That("Ugly",Is.EqualTo(u1.FirstName), "Assert.That(\"Ugly\",Is.EqualTo(u1.FirstName))");
         }
 
         [Test]
@@ -174,7 +174,7 @@ namespace OpenSim.Data.Tests
             db.AddNewUserProfile(u4);
             Assert.That(db.GetUserByUUID(zero),Is.Null);
             Assert.That(db.GetUserByUUID(user4),Is.Null);
-        }        
+        }
         
         [Test]
         public void T015_UserPersistency()
@@ -218,7 +218,7 @@ namespace OpenSim.Data.Tests
             
             //HomeRegionX and HomeRegionY must only use 24 bits
             homeregx = ((homeregx << 8) >> 8);
-            homeregy = ((homeregy << 8) >> 8);            
+            homeregy = ((homeregy << 8) >> 8);
 
             u.ID = id;
             u.WebLoginKey = webloginkey;
@@ -299,7 +299,7 @@ namespace OpenSim.Data.Tests
             uint homeregx = (uint) random.Next();
             uint homeregy = (uint) random.Next();
             Vector3 homeloc = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));
-            Vector3 homelookat = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));            
+            Vector3 homelookat = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));
             int created = random.Next();
             int lastlogin = random.Next();
             string userinvuri = RandomName();
@@ -359,7 +359,7 @@ namespace OpenSim.Data.Tests
             Assert.That(email,Is.EqualTo(u1a.Email), "Assert.That(email,Is.EqualTo(u1a.Email))");
             Assert.That(passhash,Is.EqualTo(u1a.PasswordHash), "Assert.That(passhash,Is.EqualTo(u1a.PasswordHash))");
             Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt), "Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt))");
-            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");            
+            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
             Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX), "Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX))");
             Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY), "Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY))");
             Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
@@ -426,7 +426,7 @@ namespace OpenSim.Data.Tests
             UserAgentData a2 = db.GetAgentByName(fname2,lname2);
             UserAgentData a3 = db.GetAgentByName(name3);
             Assert.That(user2,Is.EqualTo(a2.ProfileID), "Assert.That(user2,Is.EqualTo(a2.ProfileID))");
-            Assert.That(user3,Is.EqualTo(a3.ProfileID), "Assert.That(user3,Is.EqualTo(a3.ProfileID))");                    
+            Assert.That(user3,Is.EqualTo(a3.ProfileID), "Assert.That(user3,Is.EqualTo(a3.ProfileID))");
         }
         
         [Test]
@@ -501,11 +501,11 @@ namespace OpenSim.Data.Tests
             db.AddNewUserFriend(user1,user3, 2);
             db.AddNewUserFriend(user1,user2, 4); 
             List<FriendListItem> fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");                   
+            Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");
             perms.Add(user2,1);
             perms.Add(user3,2);
             for (int i = 0; i < fl1.Count; i++)
-            {   
+            {
                 Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner), "Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner))");
                 friends.Add(fl1[i].Friend,1);
                 temp = perms[fl1[i].Friend];
@@ -544,7 +544,7 @@ namespace OpenSim.Data.Tests
             db.UpdateUserFriendPerms(user1, user3, 4);
             
             fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1[0].FriendPerms,Is.EqualTo(4), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(4))");                  
+            Assert.That(fl1[0].FriendPerms,Is.EqualTo(4), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(4))");
         }
         
         [Test]
@@ -560,7 +560,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T041_UserAppearancePersistency()
         {
-            AvatarAppearance appear = new AvatarAppearance();            
+            AvatarAppearance appear = new AvatarAppearance();
             UUID owner = UUID.Random();
             int serial = random.Next();
             byte[] visualp = new byte[218];
@@ -698,7 +698,7 @@ namespace OpenSim.Data.Tests
             int size = random.Next(5,12); 
             char ch ;
             for (int i=0; i<size; i++)
-            {       
+            {
                 ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
                 name.Append(ch);
             }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 84926f2..3d370da 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data
         public abstract UserAgentData GetAgentByUUID(UUID user);
         public abstract UserAgentData GetAgentByName(string name);
         public abstract UserAgentData GetAgentByName(string fname, string lname);
-        public UserProfileData GetUserByUri(Uri uri) { return null; }        
+        public UserProfileData GetUserByUri(Uri uri) { return null; }
         public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
         public abstract void AddNewUserProfile(UserProfileData user);
         
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 5071594..4a5253c 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
                 
                 // Body
                 defaultWearables[0].ItemID  = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
-                defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");                
+                defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
 
                 // Skin
                 defaultWearables[1].ItemID  = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs
index 46dbd3d..0334e4b 100644
--- a/OpenSim/Framework/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Capabilities/CapsUtil.cs
@@ -28,7 +28,7 @@
 using OpenMetaverse;
 
 namespace OpenSim.Framework.Capabilities
-{    
+{
     /// <summary>
     /// Capabilities utility methods
     /// </summary>
diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs
index 81b1d9e..3df86d0 100644
--- a/OpenSim/Framework/Client/IClientIM.cs
+++ b/OpenSim/Framework/Client/IClientIM.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Client
     // Porting Guide from old IM
     // SendIM(...)
     //      Loses FromAgentSession - this should be added by implementers manually.
-    //      
+    //
 
     public interface IClientIM
     {
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index db532e0..094a3ff 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -177,9 +177,9 @@ namespace OpenSim.Framework
         }
 
         public void ViewerEffectHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args)
-        {            
+        {
             // TODO: don't create new blocks if recycling an old packet
-            List<ViewerEffectPacket.EffectBlock> effectBlock = new List<ViewerEffectPacket.EffectBlock>();                        
+            List<ViewerEffectPacket.EffectBlock> effectBlock = new List<ViewerEffectPacket.EffectBlock>();
             for (int i = 0; i < args.Count; i++)
             {
                 ViewerEffectPacket.EffectBlock effect = new ViewerEffectPacket.EffectBlock();
diff --git a/OpenSim/Framework/CnmMemoryCache.cs b/OpenSim/Framework/CnmMemoryCache.cs
index db91801..92af331 100644
--- a/OpenSim/Framework/CnmMemoryCache.cs
+++ b/OpenSim/Framework/CnmMemoryCache.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// How many operations between time checks.
-        /// </summary>        
+        /// </summary>
         private const int DefaultOperationsBetweenTimeChecks = 40;
 
         /// <summary>
@@ -168,7 +168,7 @@ namespace OpenSim.Framework
         private int m_version;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.         
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
         /// </summary>
         public CnmMemoryCache()
             : this(DefaultMaxSize)
@@ -277,7 +277,7 @@ namespace OpenSim.Framework
         /// </param>
         protected virtual void AddToNewGeneration(int bucketIndex, TKey key, TValue value, long size)
         {
-            // Add to newest generation    
+            // Add to newest generation
             if (!m_newGeneration.Set(bucketIndex, key, value, size))
             {
                 // Failed to add new generation
@@ -311,7 +311,7 @@ namespace OpenSim.Framework
         /// Bucket index is remainder when element key's hash value is divided by bucket count.
         /// </para>
         /// <para>
-        /// For example: key's hash is 72, bucket count is 5, element's bucket index is 72 % 5 = 2.        
+        /// For example: key's hash is 72, bucket count is 5, element's bucket index is 72 % 5 = 2.
         /// </para>
         /// </remarks>
         protected virtual int GetBucketIndex(TKey key)
@@ -367,7 +367,7 @@ namespace OpenSim.Framework
         /// </summary>
         private void RecycleGenerations()
         {
-            // Rotate old generation to new generation, new generation to old generation            
+            // Rotate old generation to new generation, new generation to old generation
             IGeneration temp = m_newGeneration;
             m_newGeneration = m_oldGeneration;
             m_newGeneration.Clear();
@@ -522,7 +522,7 @@ namespace OpenSim.Framework
             /// <summary>
             /// Index of first element's in element chain.
             /// </summary>
-            /// <value>                        
+            /// <value>
             /// -1 if there is no element in bucket; otherwise first element's index in the element chain.
             /// </value>
             /// <remarks>
@@ -692,7 +692,7 @@ namespace OpenSim.Framework
                 /// </summary>
                 /// <value>
                 /// 0 if element is free; otherwise larger than 0.
-                /// </value>              
+                /// </value>
                 public long Size;
 
                 /// <summary>
@@ -771,7 +771,7 @@ namespace OpenSim.Framework
                 /// </returns>
                 /// <exception cref="InvalidOperationException">
                 /// The enumerator has reach end of collection or <see cref="MoveNext"/> is not called.
-                /// </exception>              
+                /// </exception>
                 public KeyValuePair<TKey, TValue> Current
                 {
                     get
@@ -1405,10 +1405,10 @@ namespace OpenSim.Framework
         /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
         /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
         /// </para>
-        /// </remarks>        
+        /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
         public bool IsSizeLimited
@@ -1438,7 +1438,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
         /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
@@ -1449,7 +1449,7 @@ namespace OpenSim.Framework
         /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
         /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
         /// stay longer in cache.
-        /// </remarks>        
+        /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.PurgeExpired"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
@@ -1503,7 +1503,7 @@ namespace OpenSim.Framework
         /// <seealso cref="ICnmCache{TKey,TValue}.Set"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
         public long MaxElementSize
         {
             get { return m_maxElementSize; }
@@ -1517,7 +1517,7 @@ namespace OpenSim.Framework
         /// <value>
         /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </value>
-        /// <remarks>        
+        /// <remarks>
         /// <para>
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
@@ -1562,10 +1562,10 @@ namespace OpenSim.Framework
         /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
         /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
         /// </para>
-        /// </remarks>        
+        /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
         public long Size
@@ -1576,9 +1576,9 @@ namespace OpenSim.Framework
         /// <summary>
         /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
-        /// <value>        
+        /// <value>
         /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
         /// <remarks>
         /// <para>
         /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -1630,7 +1630,7 @@ namespace OpenSim.Framework
         /// </para>
         /// <para>
         /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
@@ -1810,7 +1810,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <returns>
         /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
diff --git a/OpenSim/Framework/CnmSynchronizedCache.cs b/OpenSim/Framework/CnmSynchronizedCache.cs
index c09900e..2bafbe9 100644
--- a/OpenSim/Framework/CnmSynchronizedCache.cs
+++ b/OpenSim/Framework/CnmSynchronizedCache.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
             /// </returns>
             /// <exception cref="InvalidOperationException">
             /// The enumerator has reach end of collection or <see cref="MoveNext"/> is not called.
-            /// </exception>              
+            /// </exception>
             public KeyValuePair<TKey, TValue> Current
             {
                 get { return m_enumerator.Current; }
@@ -327,10 +327,10 @@ namespace OpenSim.Framework
         /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
         /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
         /// </para>
-        /// </remarks>        
+        /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
         public bool IsSizeLimited
@@ -366,7 +366,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
         /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
@@ -377,7 +377,7 @@ namespace OpenSim.Framework
         /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
         /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
         /// stay longer in cache.
-        /// </remarks>        
+        /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.PurgeExpired"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
@@ -440,7 +440,7 @@ namespace OpenSim.Framework
         /// <seealso cref="ICnmCache{TKey,TValue}.Set"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
         public long MaxElementSize
         {
             get
@@ -458,7 +458,7 @@ namespace OpenSim.Framework
         /// <value>
         /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </value>
-        /// <remarks>        
+        /// <remarks>
         /// <para>
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
@@ -507,10 +507,10 @@ namespace OpenSim.Framework
         /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
         /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
         /// </para>
-        /// </remarks>        
+        /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
         public long Size
@@ -527,9 +527,9 @@ namespace OpenSim.Framework
         /// <summary>
         /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
-        /// <value>        
+        /// <value>
         /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
         /// <remarks>
         /// <para>
         /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -584,7 +584,7 @@ namespace OpenSim.Framework
         /// </para>
         /// <para>
         /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
@@ -704,7 +704,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <returns>
         /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 238810a..aa71536 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.Communications.Cache
     /// Stores user profile and inventory data received from backend services for a particular user.
     /// </summary>
     public class CachedUserInfo
-    {        
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         //// <value>
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Communications.Cache
                             resolvedFolders.Add(folder);
                             resolvedFolderDictionary[folder.ID] = folder;
                             parentFolder.AddChildFolder(folder);
-                        }                            
+                        }
                     }
                 } // foreach (folder in pendingCategorizationFolders[parentFolder.ID])
 
@@ -219,7 +219,7 @@ namespace OpenSim.Framework.Communications.Cache
         /// <summary>
         /// Fetch inventory for this user.
         /// </summary>
-        /// This has to be executed as a separate step once user information is retreived.  
+        /// This has to be executed as a separate step once user information is retreived.
         /// This will occur synchronously if the inventory service is in the same process as this class, and
         /// asynchronously otherwise.
         public void FetchInventory()
@@ -422,7 +422,7 @@ namespace OpenSim.Framework.Communications.Cache
         ///
         /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE
         /// so this will work to rename an existing folder.  Needless to say, to rely on this is very confusing,
-        /// and needs to be changed.        
+        /// and needs to be changed.
         ///
         /// <param name="folderID"></param>
         /// <param name="type"></param>
@@ -500,7 +500,7 @@ namespace OpenSim.Framework.Communications.Cache
                     InventoryFolderImpl oldParentFolder = RootFolder.FindFolder(folder.ParentID);
 
                     if (oldParentFolder != null)
-                    {                        
+                    {
                         oldParentFolder.RemoveChildFolder(folderID);
                         parentFolder.AddChildFolder(folder);
                     }
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 7f1c7e9..9e12d948 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache
         /// User profiles indexed by name
         /// </summary>
         private readonly Dictionary<string, CachedUserInfo> m_userProfilesByName 
-            = new Dictionary<string, CachedUserInfo>();        
+            = new Dictionary<string, CachedUserInfo>();
         
         /// <summary>
         /// The root library folder.
@@ -123,35 +123,35 @@ namespace OpenSim.Framework.Communications.Cache
         /// <summary>
         /// Get details of the given user.
         /// </summary>
-        /// If the user isn't in cache then the user is requested from the profile service.  
+        /// If the user isn't in cache then the user is requested from the profile service.
         /// <param name="userID"></param>
-        /// <returns>null if no user details are found</returns>        
+        /// <returns>null if no user details are found</returns>
         public CachedUserInfo GetUserDetails(string fname, string lname)
         {
             lock (m_userProfilesByName)
-            {    
+            {
                 CachedUserInfo userInfo;
                 
-                if (m_userProfilesByName.TryGetValue(string.Format(NAME_FORMAT, fname, lname), out userInfo))                    
+                if (m_userProfilesByName.TryGetValue(string.Format(NAME_FORMAT, fname, lname), out userInfo))
                 {
                     return userInfo;
-                }                
+                }
                 else
-                {                
+                {
                     UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(fname, lname);
                 
                     if (userProfile != null)
-                        return AddToCaches(userProfile);             
+                        return AddToCaches(userProfile);
                     else
                         return null;
-                }               
+                }
             }
         }
         
         /// <summary>
         /// Get details of the given user.
         /// </summary>
-        /// If the user isn't in cache then the user is requested from the profile service.  
+        /// If the user isn't in cache then the user is requested from the profile service.
         /// <param name="userID"></param>
         /// <returns>null if no user details are found</returns>
         public CachedUserInfo GetUserDetails(UUID userID)
@@ -185,20 +185,20 @@ namespace OpenSim.Framework.Communications.Cache
         // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via
         // returning a read only class from the cache).
 //        public bool StoreProfile(UserProfileData userProfile)
-//        {            
+//        {
 //            lock (m_userProfilesById)
-//            {            
+//            {
 //                CachedUserInfo userInfo = GetUserDetails(userProfile.ID);
-//                
+//
 //                if (userInfo != null)
 //                {
-//                    userInfo.m_userProfile = userProfile;                   
+//                    userInfo.m_userProfile = userProfile;
 //                    m_commsManager.UserService.UpdateUserProfile(userProfile);
-//                    
+//
 //                    return true;
 //                }
 //            }
-//            
+//
 //            return false;
 //        }
         
@@ -220,7 +220,7 @@ namespace OpenSim.Framework.Communications.Cache
                 }
             }
             
-            return createdUserInfo;            
+            return createdUserInfo;
         }
         
         /// <summary>
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 if (m_userProfilesById.ContainsKey(userId))
                 {
-                    CachedUserInfo userInfo = m_userProfilesById[userId];                    
+                    CachedUserInfo userInfo = m_userProfilesById[userId];
                     m_userProfilesById.Remove(userId);
                     
                     lock (m_userProfilesByName)
@@ -244,7 +244,7 @@ namespace OpenSim.Framework.Communications.Cache
                     
                     return true;
                 }
-            }        
+            }
             
             return false;
         }
diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs
index 73e2db0..3419ce2 100644
--- a/OpenSim/Framework/Communications/Clients/RegionClient.cs
+++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs
@@ -35,6 +35,8 @@ using System.Text;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
 using log4net;
 
 namespace OpenSim.Framework.Communications.Clients
@@ -43,7 +45,7 @@ namespace OpenSim.Framework.Communications.Clients
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public bool DoCreateChildAgentCall(RegionInfo region, AgentCircuitData aCircuit, string authKey, out string reason)
+        public bool DoCreateChildAgentCall(GridRegion region, AgentCircuitData aCircuit, string authKey, out string reason)
         {
             reason = String.Empty;
 
@@ -166,7 +168,7 @@ namespace OpenSim.Framework.Communications.Clients
 
         }
 
-        public bool DoChildAgentUpdateCall(RegionInfo region, IAgentData cAgentData)
+        public bool DoChildAgentUpdateCall(GridRegion region, IAgentData cAgentData)
         {
             // Eventually, we want to use a caps url instead of the agentID
             string uri = string.Empty;
@@ -260,7 +262,7 @@ namespace OpenSim.Framework.Communications.Clients
             return true;
         }
 
-        public bool DoRetrieveRootAgentCall(RegionInfo region, UUID id, out IAgentData agent)
+        public bool DoRetrieveRootAgentCall(GridRegion region, UUID id, out IAgentData agent)
         {
             agent = null;
             // Eventually, we want to use a caps url instead of the agentID
@@ -348,7 +350,7 @@ namespace OpenSim.Framework.Communications.Clients
         }
 
 
-        public bool DoCloseAgentCall(RegionInfo region, UUID id)
+        public bool DoCloseAgentCall(GridRegion region, UUID id)
         {
             string uri = string.Empty;
             try
@@ -391,7 +393,7 @@ namespace OpenSim.Framework.Communications.Clients
             return true;
         }
 
-        public bool DoCreateObjectCall(RegionInfo region, ISceneObject sog, string sogXml2, bool allowScriptCrossing)
+        public bool DoCreateObjectCall(GridRegion region, ISceneObject sog, string sogXml2, bool allowScriptCrossing)
         {
             ulong regionHandle = GetRegionHandle(region.RegionHandle);
             string uri 
@@ -474,7 +476,7 @@ namespace OpenSim.Framework.Communications.Clients
 
         }
 
-        public bool DoCreateObjectCall(RegionInfo region, UUID userID, UUID itemID)
+        public bool DoCreateObjectCall(GridRegion region, UUID userID, UUID itemID)
         {
             ulong regionHandle = GetRegionHandle(region.RegionHandle);
             string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + UUID.Zero + "/" + regionHandle.ToString() + "/";
@@ -646,7 +648,7 @@ namespace OpenSim.Framework.Communications.Clients
             return false;
         }
 
-        public virtual void SendUserInformation(RegionInfo regInfo, AgentCircuitData aCircuit)
+        public virtual void SendUserInformation(GridRegion regInfo, AgentCircuitData aCircuit)
         {
         }
 
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index e9a6adb..2410f31 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -59,11 +59,6 @@ namespace OpenSim.Framework.Communications
         }
         protected IMessagingService m_messageService;
 
-        public IGridServices GridService
-        {
-            get { return m_gridService; }
-        }
-        protected IGridServices m_gridService;
 
         public UserProfileCacheService UserProfileCacheService
         {
@@ -95,8 +90,8 @@ namespace OpenSim.Framework.Communications
         public IUserAdminService UserAdminService
         {
             get { return m_userAdminService; }
-        }        
-        protected IUserAdminService m_userAdminService;        
+        }
+        protected IUserAdminService m_userAdminService;
 
         /// <summary>
         /// Constructor
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs
index 4afc58f..760aa62 100644
--- a/OpenSim/Framework/Communications/IAvatarService.cs
+++ b/OpenSim/Framework/Communications/IAvatarService.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Communications
         /// Update avatar appearance information
         /// </summary>
         /// <param name="user"></param>
-        /// <param name="appearance"></param>        
+        /// <param name="appearance"></param>
         void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
     }
 }
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
deleted file mode 100644
index 6365919..0000000
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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.Collections.Generic;
-using OpenMetaverse;
-
-namespace OpenSim.Framework.Communications
-{
-    public interface IGridServices
-    {
-        string gdebugRegionName { get; set; }
-        
-        /// <summary>
-        /// If true, then regions will accept logins from the user service.  If false, then they will not.
-        /// </summary>
-        bool RegionLoginsEnabled { get; set; }
-
-        /// <summary>
-        /// Register a region with the grid service.
-        /// </summary>
-        /// <param name="regionInfos"> </param>
-        /// <returns></returns>
-        /// <exception cref="System.Exception">Thrown if region registration failed</exception>
-        RegionCommsListener RegisterRegion(RegionInfo regionInfos);
-
-        /// <summary>
-        /// Deregister a region with the grid service.
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
-        /// <exception cref="System.Exception">Thrown if region deregistration failed</exception>
-        bool DeregisterRegion(RegionInfo regionInfo);   
-
-        /// <summary>
-        /// Get information about the regions neighbouring the given co-ordinates.
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns></returns>
-        List<SimpleRegionInfo> RequestNeighbours(uint x, uint y);
-
-        RegionInfo RequestNeighbourInfo(ulong regionHandle);
-        RegionInfo RequestNeighbourInfo(UUID regionID);
-        RegionInfo RequestNeighbourInfo(string name);
-        RegionInfo RequestNeighbourInfo(string host, uint port);
-
-        RegionInfo RequestClosestRegion(string regionName);
-        Dictionary<string, string> GetGridSettings();
-        List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
-        // not complete yet, only contains the fields needed for ParcelInfoReqeust
-        LandData RequestLandData(ulong regionHandle, uint x, uint y);
-
-        /// <summary>
-        /// Get information about regions starting with the provided name. 
-        /// </summary>
-        /// <param name="name">
-        /// The name to match against.
-        /// </param>
-        /// <param name="maxNumber">
-        /// The maximum number of results to return.
-        /// </param>
-        /// <returns>
-        /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the
-        /// grid-server couldn't be contacted or returned an error, return null. 
-        /// </returns>
-        List<RegionInfo> RequestNamedRegions(string name, int maxNumber);
-    }
-}
diff --git a/OpenSim/Framework/Communications/IUserAdminService.cs b/OpenSim/Framework/Communications/IUserAdminService.cs
index 15b989d..423b49b 100644
--- a/OpenSim/Framework/Communications/IUserAdminService.cs
+++ b/OpenSim/Framework/Communications/IUserAdminService.cs
@@ -66,6 +66,6 @@ namespace OpenSim.Framework.Communications
         /// <param name="lastName"></param>
         /// <param name="newPassword"></param>
         /// <returns>true if the update was successful, false otherwise</returns>
-        bool ResetUserPassword(string firstName, string lastName, string newPassword);        
+        bool ResetUserPassword(string firstName, string lastName, string newPassword);
     }
 }
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 725225d..dfa059d 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -128,18 +128,30 @@ namespace OpenSim.Framework.Communications
         /// 
         /// <param name="friendlistowner">The agent for whom we're retreiving the friends Data.</param>
         /// <returns>
-        /// A List of FriendListItems that contains info about the user's friends.  
+        /// A List of FriendListItems that contains info about the user's friends.
         /// Always returns a list even if the user has no friends
-        /// </returns>        
+        /// </returns>
         List<FriendListItem> GetUserFriendList(UUID friendlistowner);
 
         // This probably shouldn't be here, it belongs to IAuthentication
         // But since Scenes only have IUserService references, I'm placing it here for now.
         bool VerifySession(UUID userID, UUID sessionID);
 
+        /// <summary>
+        /// Authenticate a user by their password.
+        /// </summary>
+        /// 
+        /// This is used by callers outside the login process that want to
+        /// verify a user who has given their password.
+        ///
+        /// This should probably also be in IAuthentication but is here for the same reasons as VerifySession() is
+        ///
+        /// <param name="userID"></param>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        bool AuthenticateUserByPassword(UUID userID, string password);
 
         // Temporary Hack until we move everything to the new service model
         void SetInventoryService(IInventoryService invService);
-
     }
 }
diff --git a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
index 98d0e0f..e96c5e8 100644
--- a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
+++ b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Osp
             
         public string Name { get { return "OspInventoryWrapperPlugin"; } }
         public string Version { get { return "0.1"; } }
-        public void Initialise() {}       
+        public void Initialise() {}
         public void Initialise(string connect) {}
         public void Dispose() {}
 
@@ -80,9 +80,9 @@ namespace OpenSim.Framework.Communications.Osp
         }
 
         protected InventoryItemBase PostProcessItem(InventoryItemBase item)
-        {            
+        {
             item.CreatorIdAsUuid = OspResolver.ResolveOspa(item.CreatorId, m_commsManager);
-            return item;            
+            return item;
         }
         
         public List<InventoryFolderBase> getFolderHierarchy(UUID parentID) { return m_wrappedPlugin.getFolderHierarchy(parentID); }
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs
index e98317a..32f0efc 100644
--- a/OpenSim/Framework/Communications/Osp/OspResolver.cs
+++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs
@@ -33,13 +33,13 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Framework.Communications.Osp
-{    
+{
     /// <summary>
     /// Resolves OpenSim Profile Anchors (OSPA).  An OSPA is a string used to provide information for 
     /// identifying user profiles or supplying a simple name if no profile is available.
     /// </summary>
     public class OspResolver
-    {   
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         public const string OSPA_PREFIX = "ospa:";
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Communications.Osp
         {
             return 
                 OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName;
-        }        
+        }
         
         /// <summary>
         /// Resolve an osp string into the most suitable internal OpenSim identifier.
@@ -89,13 +89,13 @@ namespace OpenSim.Framework.Communications.Osp
         /// is returned.
         /// </returns>
         public static UUID ResolveOspa(string ospa, CommunicationsManager commsManager)
-        {                       
+        {
             if (!ospa.StartsWith(OSPA_PREFIX))
                 return UUID.Zero;
 
             m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
             
-            string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);            
+            string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);
             string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY);
             
             foreach (string tuple in ospaTuples)
@@ -162,7 +162,7 @@ namespace OpenSim.Framework.Communications.Osp
             tempUserProfile.ID = HashName(tempUserProfile.Name);
             
             m_log.DebugFormat(
-                "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);            
+                "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);
             commsManager.UserService.AddTemporaryUserProfile(tempUserProfile);
             
             return tempUserProfile.ID;
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index bf59f8e..922cd49 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -1072,7 +1072,7 @@ namespace OpenSim.Framework.Communications.Services
         /// <param name="user"></param>
         /// <param name="response"></param>
         /// <param name="remoteClient"></param>
-        /// <returns>true if the region was successfully contacted, false otherwise</returns>        
+        /// <returns>true if the region was successfully contacted, false otherwise</returns>
         protected abstract bool PrepareLoginToRegion(
             RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint client);
 
@@ -1221,11 +1221,13 @@ namespace OpenSim.Framework.Communications.Services
                 {
                     return Util.CreateUnknownUserErrorResponse();
                 }
+                
                 UUID.TryParse((string)requestData["session_id"], out guess_sid);
                 if (guess_sid == UUID.Zero)
                 {
                     return Util.CreateUnknownUserErrorResponse();
                 }
+                
                 if (m_userManager.VerifySession(guess_aid, guess_sid))
                 {
                     authed = "TRUE";
@@ -1243,6 +1245,5 @@ namespace OpenSim.Framework.Communications.Services
             response.Value = responseData;
             return response;
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
index 43f1440..2413055 100644
--- a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
+++ b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
@@ -33,9 +33,9 @@ using OpenMetaverse;
 using OpenSim.Data;
 
 namespace OpenSim.Framework.Communications
-{                
+{
     /// <summary>
-    /// Plugin for managing temporary user profiles.  
+    /// Plugin for managing temporary user profiles.
     /// </summary>
     public class TemporaryUserProfilePlugin : IUserDataPlugin
     {
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Communications
         
         public string Name { get { return "TemporaryUserProfilePlugin"; } }
         public string Version { get { return "0.1"; } }
-        public void Initialise() {}       
+        public void Initialise() {}
         public void Initialise(string connect) {}
         public void Dispose() {}
         
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
index ac0dc6d..caaebd7 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
@@ -149,6 +149,11 @@ namespace OpenSim.Framework.Communications.Tests
             {
                 throw new NotImplementedException();
             }
+
+            public virtual bool AuthenticateUserByPassword(UUID userID, string password)
+            {
+                throw new NotImplementedException();
+            }
         }
     }
 }
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index e5d8895..830c877 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Framework.Communications.Tests
 
             timedOut = true;
             lock (this)
-            {                   
+            {
                 UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
              }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
             
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
@@ -171,7 +171,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
 
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
 
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
@@ -271,7 +271,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
 
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
@@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
 
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 0a9d2ae..e891d9c 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -318,7 +318,7 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestHelper.InMethod();
 
-            //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()");            
+            //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()");
             //log4net.Config.XmlConfigurator.Configure();
             
             string error_already_logged = "You appear to be already logged in. " +
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 58174a0..bf4f331 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -44,7 +44,8 @@ namespace OpenSim.Framework.Communications
     /// <summary>
     /// Base class for user management (create, read, etc)
     /// </summary>
-    public abstract class UserManagerBase : IUserService, IUserAdminService, IAvatarService, IMessagingService, IAuthentication
+    public abstract class UserManagerBase 
+        : IUserService, IUserAdminService, IAvatarService, IMessagingService, IAuthentication
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -649,15 +650,17 @@ namespace OpenSim.Framework.Communications
         public virtual UUID AddUser(
             string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID)
         {
-            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty);
 
             UserProfileData user = new UserProfileData();
+
+            user.PasswordSalt = Util.Md5Hash(UUID.Random().ToString());
+            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + user.PasswordSalt);
+
             user.HomeLocation = new Vector3(128, 128, 100);
             user.ID = SetUUID;
             user.FirstName = firstName;
             user.SurName = lastName;
             user.PasswordHash = md5PasswdHash;
-            user.PasswordSalt = String.Empty;
             user.Created = Util.UnixTimeSinceEpoch();
             user.HomeLookAt = new Vector3(100, 100, 100);
             user.HomeRegionX = regX;
@@ -891,7 +894,10 @@ namespace OpenSim.Framework.Communications
 
             if (userProfile != null && userProfile.CurrentAgent != null)
             {
-                m_log.DebugFormat("[USER AUTH]: Verifying session {0} for {1}; current  session {2}", sessionID, userID, userProfile.CurrentAgent.SessionID);
+                m_log.DebugFormat(
+                    "[USER AUTH]: Verifying session {0} for {1}; current  session {2}", 
+                    sessionID, userID, userProfile.CurrentAgent.SessionID);
+                
                 if (userProfile.CurrentAgent.SessionID == sessionID)
                 {
                     return true;
@@ -901,6 +907,26 @@ namespace OpenSim.Framework.Communications
             return false;
         }
 
+        public virtual bool AuthenticateUserByPassword(UUID userID, string password)
+        {
+//            m_log.DebugFormat("[USER AUTH]: Authenticating user {0} given password {1}", userID, password);
+            
+            UserProfileData userProfile = GetUserProfile(userID);
+
+            if (null == userProfile)
+                return false;
+      
+            string md5PasswordHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + userProfile.PasswordSalt);
+
+//            m_log.DebugFormat(
+//                "[USER AUTH]: Submitted hash {0}, stored hash {1}", md5PasswordHash, userProfile.PasswordHash);
+    
+            if (md5PasswordHash == userProfile.PasswordHash)
+                return true;
+            else
+                return false;
+        }
+
         #endregion
     }
 }
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 06136ff..9671bc2 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Console
         /// <param name="helpParts">Parsed parts of the help string.  If empty then general help is returned.</param>
         /// <returns></returns>
         public List<string> GetHelp(string[] cmd)
-        {                  
+        {
             List<string> help = new List<string>();
             List<string> helpParts = new List<string>(cmd);
             
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.Console
         /// <param name="helpParts"></param>
         /// <returns></returns>
         private List<string> CollectHelp(List<string> helpParts)
-        {            
+        {
             string originalHelpRequest = string.Join(" ", helpParts.ToArray());
             List<string> help = new List<string>();
             
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Console
                 if (dict[helpPart] is Dictionary<string, Object>)
                     dict = (Dictionary<string, object>)dict[helpPart]; 
                 
-                helpParts.RemoveAt(0);                                                               
+                helpParts.RemoveAt(0);
             }
         
             // There was a command for the given help string
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.Console
             }
             
             return help;
-        }            
+        }
 
         private List<string> CollectHelp(Dictionary<string, object> dict)
         {
@@ -180,7 +180,7 @@ namespace OpenSim.Framework.Console
         /// <param name="longhelp"></param>
         /// <param name="fn"></param>
         public void AddCommand(string module, bool shared, string command,
-                string help, string longhelp, CommandDelegate fn)   
+                string help, string longhelp, CommandDelegate fn)
         {
             AddCommand(module, shared, command, help, longhelp,
                     String.Empty, fn);
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 67bff4c..c27072c 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -197,8 +197,8 @@ namespace OpenSim.Framework.Console
 
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
-            m_Server.AddPollServiceHTTPHandler(uri, HandleHttpCloseSession,
-                    new PollServiceEventArgs(HasEvents, GetEvents, NoEvents,
+            m_Server.AddPollServiceHTTPHandler(uri, HandleHttpPoll,
+                    new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents,
                     sessionID));
 
             XmlDocument xmldoc = new XmlDocument();
@@ -230,6 +230,11 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
+        private Hashtable HandleHttpPoll(Hashtable request)
+        {
+            return new Hashtable();
+        }
+
         private Hashtable HandleHttpCloseSession(Hashtable request)
         {
             DoExpire();
@@ -365,7 +370,7 @@ namespace OpenSim.Framework.Console
             }
         }
 
-        private bool HasEvents(UUID sessionID)
+        private bool HasEvents(UUID RequestID, UUID sessionID)
         {
             ConsoleConnection c = null;
 
@@ -381,19 +386,19 @@ namespace OpenSim.Framework.Console
             return false;
         }
 
-        private Hashtable GetEvents(UUID sessionID, string request)
+        private Hashtable GetEvents(UUID RequestID, UUID sessionID, string request)
         {
             ConsoleConnection c = null;
 
             lock (m_Connections)
             {
                 if (!m_Connections.ContainsKey(sessionID))
-                    return NoEvents();
+                    return NoEvents(RequestID, UUID.Zero);
                 c = m_Connections[sessionID];
             }
             c.last = System.Environment.TickCount;
             if (c.lastLineSeen >= m_LineNumber)
-                return NoEvents();
+                return NoEvents(RequestID, UUID.Zero);
 
             Hashtable result = new Hashtable();
 
@@ -435,7 +440,7 @@ namespace OpenSim.Framework.Console
             return result;
         }
 
-        private Hashtable NoEvents()
+        private Hashtable NoEvents(UUID RequestID, UUID id)
         {
             Hashtable result = new Hashtable();
 
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 9aa5d03..3a43a14 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -90,13 +90,13 @@ namespace OpenSim.Framework
 
             m_configMember.addConfigurationOption("allow_forceful_banlines",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Allow Forceful Banlines", "TRUE", true);   
+                                                "Allow Forceful Banlines", "TRUE", true);
             
             m_configMember.addConfigurationOption("allow_region_registration", 
                                                 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
                                                 "Allow regions to register immediately upon grid server startup? true/false", 
                                                 "True", 
-                                                false);            
+                                                false);
             m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                  "Remote console access user name [Default: disabled]", "", false);
 
@@ -147,7 +147,7 @@ namespace OpenSim.Framework
                     break;
                 case "allow_region_registration":
                     AllowRegionRegistration = (bool)configuration_result;
-                    break;                
+                    break;
                 case "console_user":
                     ConsoleUser = (string)configuration_result;
                     break;
diff --git a/OpenSim/Framework/IAssetCache.cs b/OpenSim/Framework/IAssetCache.cs
index 751fdd5..654180d 100644
--- a/OpenSim/Framework/IAssetCache.cs
+++ b/OpenSim/Framework/IAssetCache.cs
@@ -34,23 +34,23 @@ namespace OpenSim.Framework
 
     /// <summary>
     /// Interface to the local asset cache.  This is the mechanism through which assets can be added and requested.
-    /// </summary>    
+    /// </summary>
     public interface IAssetCache :  IPlugin
     {
         /// <value>
         /// The 'server' from which assets can be requested and to which assets are persisted.
-        /// </value>        
+        /// </value>
        
-        void Initialise(ConfigSettings cs);        
+        void Initialise(ConfigSettings cs);
 
         /// <summary>
         /// Report statistical data to the log.
-        /// </summary>        
+        /// </summary>
         void ShowState();
         
         /// <summary>
         /// Clear the asset cache.
-        /// </summary>        
+        /// </summary>
         void Clear();
         
         /// <summary>
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="assetId"></param>
         /// <param name="asset"></param>
-        /// <returns>true if the asset was in the cache, false if it was not</returns>        
+        /// <returns>true if the asset was in the cache, false if it was not</returns>
         bool TryGetCachedAsset(UUID assetID, out AssetBase asset);
         
         /// <summary>
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
         /// <param name="isTexture"></param>
         /// A callback invoked when the asset has either been found or not found.
         /// If the asset was found this is called with the asset UUID and the asset data
-        /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param>        
+        /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param>
         void GetAsset(UUID assetID, AssetRequestCallback callback, bool isTexture);
         
         /// <summary>
@@ -84,13 +84,13 @@ namespace OpenSim.Framework
         ///
         /// <param name="assetID"></param>
         /// <param name="isTexture"></param>
-        /// <returns>null if the asset could not be retrieved</returns>        
+        /// <returns>null if the asset could not be retrieved</returns>
         AssetBase GetAsset(UUID assetID, bool isTexture);
         
         /// <summary>
         /// Add an asset to both the persistent store and the cache.
         /// </summary>
-        /// <param name="asset"></param>        
+        /// <param name="asset"></param>
         void AddAsset(AssetBase asset);
         
         /// <summary>
@@ -100,14 +100,14 @@ namespace OpenSim.Framework
         /// of the asset cache.  This is needed because the osdynamic
         /// texture code grows the asset cache without bounds.  The
         /// real solution here is a much better cache archicture, but
-        /// this is a stop gap measure until we have such a thing.        
+        /// this is a stop gap measure until we have such a thing.
         void ExpireAsset(UUID assetID);
         
         /// <summary>
         /// Handle an asset request from the client.  The result will be sent back asynchronously.
         /// </summary>
         /// <param name="userInfo"></param>
-        /// <param name="transferRequest"></param>        
+        /// <param name="transferRequest"></param>
         void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest);
     }
 
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 91a5d5c..d3bd9e7 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -810,7 +810,7 @@ namespace OpenSim.Framework
         /// </summary>
         void Start();
         
-        void Stop();        
+        void Stop();
 
         //     void ActivateGesture(UUID assetId, UUID gestureId);
 
@@ -824,7 +824,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="agentID">The id of the agent associated with the appearance</param>
         /// <param name="visualParams"></param>
-        /// <param name="textureEntry"></param>        
+        /// <param name="textureEntry"></param>
         void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
 
         void SendStartPingCheck(byte seq);
@@ -833,7 +833,7 @@ namespace OpenSim.Framework
         /// Tell the client that an object has been deleted
         /// </summary>
         /// <param name="regionHandle"></param>
-        /// <param name="localID"></param>        
+        /// <param name="localID"></param>
         void SendKillObject(ulong regionHandle, uint localID);
 
         void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
diff --git a/OpenSim/Framework/ICnmCache.cs b/OpenSim/Framework/ICnmCache.cs
index a1ac322..27b9c56 100644
--- a/OpenSim/Framework/ICnmCache.cs
+++ b/OpenSim/Framework/ICnmCache.cs
@@ -180,16 +180,16 @@ namespace OpenSim.Framework
         /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
         /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
         /// </para>
-        /// </remarks>        
+        /// </remarks>
         /// <seealso cref="MaxElementSize"/>
         /// <seealso cref="Size"/>
-        /// <seealso cref="MaxSize"/>        
+        /// <seealso cref="MaxSize"/>
         /// <seealso cref="IsCountLimited"/>
         /// <seealso cref="IsTimeLimited"/>
         bool IsSizeLimited { get; }
 
         /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
         /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
@@ -200,7 +200,7 @@ namespace OpenSim.Framework
         /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from 
         /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
         /// stay longer in cache.
-        /// </remarks>        
+        /// </remarks>
         /// <seealso cref="ExpirationTime"/>
         /// <seealso cref="PurgeExpired"/>
         /// <seealso cref="IsCountLimited"/>
@@ -237,7 +237,7 @@ namespace OpenSim.Framework
         /// <seealso cref="Set"/>
         /// <seealso cref="IsSizeLimited"/>
         /// <seealso cref="Size"/>
-        /// <seealso cref="MaxSize"/>        
+        /// <seealso cref="MaxSize"/>
         long MaxElementSize { get; }
 
         /// <summary>
@@ -246,7 +246,7 @@ namespace OpenSim.Framework
         /// <value>
         /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </value>
-        /// <remarks>        
+        /// <remarks>
         /// <para>
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
@@ -278,10 +278,10 @@ namespace OpenSim.Framework
         /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
         /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
         /// </para>
-        /// </remarks>        
+        /// </remarks>
         /// <seealso cref="MaxElementSize"/>
         /// <seealso cref="IsSizeLimited"/>
-        /// <seealso cref="MaxSize"/>        
+        /// <seealso cref="MaxSize"/>
         /// <seealso cref="IsCountLimited"/>
         /// <seealso cref="ExpirationTime"/>
         long Size { get; }
@@ -289,9 +289,9 @@ namespace OpenSim.Framework
         /// <summary>
         /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
-        /// <value>        
+        /// <value>
         /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
         /// <remarks>
         /// <para>
         /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -322,7 +322,7 @@ namespace OpenSim.Framework
         /// </para>
         /// <para>
         /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ExpirationTime"/> in the cache.
         /// </para>
         /// </remarks>
         /// <seealso cref="IsTimeLimited"/>
@@ -418,7 +418,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <returns>
         /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
index ba4c616..307c6bc 100644
--- a/OpenSim/Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/IRegionCommsListener.cs
@@ -46,8 +46,6 @@ namespace OpenSim.Framework
 
     public delegate bool CloseAgentConnection(UUID agentID);
 
-    public delegate bool RegionUp(RegionInfo region);
-
     public delegate bool ChildAgentUpdate(ChildAgentDataUpdate cAgentData);
 
     public delegate void LogOffUser(UUID agentID, UUID regionSecret, string message);
@@ -65,7 +63,6 @@ namespace OpenSim.Framework
         event AcknowledgePrimCross OnAcknowledgePrimCrossed;
         event UpdateNeighbours OnNeighboursUpdate;
         event CloseAgentConnection OnCloseAgentConnection;
-        event RegionUp OnRegionUp;
         event ChildAgentUpdate OnChildAgentUpdate;
         event LogOffUser OnLogOffUser;
         event GetLandData OnGetLandData;
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 2e2c703..489653f 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework
         GodTakeCopy = 5,
         Delete = 6,
         Return = 9
-    };     
+    };
 
     public interface IScene
     {
@@ -74,7 +74,7 @@ namespace OpenSim.Framework
         void CloseAllAgents(uint circuitcode);
 
         void Restart(int seconds);
-        bool OtherRegionUp(RegionInfo thisRegion);
+        //RegionInfo OtherRegionUp(RegionInfo thisRegion);
 
         string GetSimulatorVersion();
 
diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs
index db19527..4fc3e01 100644
--- a/OpenSim/Framework/ISceneObject.cs
+++ b/OpenSim/Framework/ISceneObject.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
     public interface ISceneObject
     {
-        UUID UUID { get; }            
+        UUID UUID { get; }
         ISceneObject CloneForNewScene();
         string ToXml2();
         string ExtraToXmlString();
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index 3eef6f6..a12183c 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Framework
             ID = id;
             Name = name;
             Owner = owner;
-            ParentID = parent;           
+            ParentID = parent;
         }
 
         public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version)
diff --git a/OpenSim/Framework/InventoryFolderImpl.cs b/OpenSim/Framework/InventoryFolderImpl.cs
index 00462f9..29c7682 100644
--- a/OpenSim/Framework/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/InventoryFolderImpl.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// Find a folder given a PATH_DELIMITER delimited path starting from this folder
-        /// </summary>        
+        /// </summary>
         ///
         /// This method does not handle paths that contain multiple delimitors
         ///
@@ -314,7 +314,7 @@ namespace OpenSim.Framework
         /// FIXME: Delimitors which occur in names themselves are not currently escapable.
         /// 
         /// <param name="path">
-        /// The path to the required folder.  
+        /// The path to the required folder.
         /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
         /// </param>
         /// <returns>null if the folder is not found</returns>
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 7150c82..aeb01e2 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -34,10 +34,10 @@ namespace OpenSim.Framework
     /// Inventory Item - contains all the properties associated with an individual inventory piece.
     /// </summary>
     public class InventoryItemBase : InventoryNodeBase, ICloneable
-    {       
+    {
         /// <value>
         /// The inventory type of the item.  This is slightly different from the asset type in some situations.
-        /// </value>        
+        /// </value>
         public int InvType 
         { 
             get
@@ -54,7 +54,7 @@ namespace OpenSim.Framework
 
         /// <value>
         /// The folder this item is contained in
-        /// </value>        
+        /// </value>
         public UUID Folder 
         { 
             get
@@ -71,7 +71,7 @@ namespace OpenSim.Framework
 
         /// <value>
         /// The creator of this item
-        /// </value>        
+        /// </value>
         public string CreatorId 
         { 
             get
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
             {
                 m_creatorIdAsUuid = value;
             }
-        }     
+        }
         protected UUID m_creatorIdAsUuid = UUID.Zero;
 
         /// <value>
@@ -130,13 +130,13 @@ namespace OpenSim.Framework
             set
             {
                 m_description = value;
-            }            
+            }
         }
         protected string m_description = String.Empty;
 
         /// <value>
         ///
-        /// </value>          
+        /// </value>
         public uint NextPermissions 
         { 
             get
@@ -153,7 +153,7 @@ namespace OpenSim.Framework
 
         /// <value>
         /// A mask containing permissions for the current owner (cannot be enforced)
-        /// </value>        
+        /// </value>
         public uint CurrentPermissions 
         { 
             get
@@ -170,7 +170,7 @@ namespace OpenSim.Framework
 
         /// <value>
         ///
-        /// </value>        
+        /// </value>
         public uint BasePermissions 
         { 
             get
@@ -187,7 +187,7 @@ namespace OpenSim.Framework
 
         /// <value>
         ///
-        /// </value>        
+        /// </value>
         public uint EveryOnePermissions 
         { 
             get
@@ -204,7 +204,7 @@ namespace OpenSim.Framework
 
         /// <value>
         ///
-        /// </value>        
+        /// </value>
         public uint GroupPermissions 
         { 
             get
@@ -221,7 +221,7 @@ namespace OpenSim.Framework
 
         /// <value>
         /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
-        /// </value>        
+        /// </value>
         public int AssetType 
         { 
             get
@@ -238,7 +238,7 @@ namespace OpenSim.Framework
 
         /// <value>
         /// The UUID of the associated asset on the asset server
-        /// </value>        
+        /// </value>
         public UUID AssetID 
         { 
             get
@@ -255,7 +255,7 @@ namespace OpenSim.Framework
 
         /// <value>
         ///
-        /// </value>        
+        /// </value>
         public UUID GroupID 
         { 
             get
@@ -272,13 +272,13 @@ namespace OpenSim.Framework
 
         /// <value>
         ///
-        /// </value>        
+        /// </value>
         public bool GroupOwned 
         { 
             get
             {
                 return m_groupOwned;
-            }               
+            }
                 
             set
             {
@@ -289,7 +289,7 @@ namespace OpenSim.Framework
 
         /// <value>
         ///
-        /// </value>        
+        /// </value>
         public int SalePrice 
         { 
             get
@@ -306,7 +306,7 @@ namespace OpenSim.Framework
 
         /// <value>
         ///
-        /// </value>        
+        /// </value>
         public byte SaleType 
         { 
             get
@@ -323,7 +323,7 @@ namespace OpenSim.Framework
 
         /// <value>
         ///
-        /// </value>        
+        /// </value>
         public uint Flags 
         { 
             get
@@ -340,7 +340,7 @@ namespace OpenSim.Framework
 
         /// <value>
         ///
-        /// </value>        
+        /// </value>
         public int CreationDate 
         { 
             get
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
index f49cce1..31c3fd1 100644
--- a/OpenSim/Framework/InventoryNodeBase.cs
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -31,12 +31,12 @@ namespace OpenSim.Framework
 {
     /// <summary>
     /// Common base class for inventory nodes of different types (files, folders, etc.)
-    /// </summary>        
+    /// </summary>
     public class InventoryNodeBase
-    {                
+    {
         /// <summary>
         /// The name of the node (64 characters or less)
-        /// </summary>        
+        /// </summary>
         public virtual string Name
         {
             get { return m_name; }
@@ -51,17 +51,17 @@ namespace OpenSim.Framework
         {
             get { return m_id; }
             set { m_id = value; }
-        }       
+        }
         private UUID m_id;
         
         /// <summary>
         /// The agent who's inventory this is contained by
-        /// </summary>        
+        /// </summary>
         public virtual UUID Owner
         {
             get { return m_owner; }
             set { m_owner = value; }
         }
-        private UUID m_owner;        
+        private UUID m_owner;
     }
 }
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 3b00af3..f720222 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
     public class NetworkServersInfo
     {
-        public string AssetSendKey = String.Empty;        
+        public string AssetSendKey = String.Empty;
         public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/";
 
         public string GridRecvKey = String.Empty;
@@ -102,8 +102,7 @@ namespace OpenSim.Framework
                                                                ConfigSettings.DefaultInventoryServerHttpPort.ToString());
             secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
 
-            MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
-                                                               "http://127.0.0.1:" + ConfigSettings.DefaultMessageServerHttpPort);
+            MessagingURL = config.Configs["Network"].GetString("messaging_server_url", string.Empty);
         }
     }
 }
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 016c78c..90200d6 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -47,7 +47,6 @@ namespace OpenSim.Framework
         private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
         private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
         private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
-        private RegionUp handlerRegionUp = null; // OnRegionUp;
         private LogOffUser handlerLogOffUser = null;
         private GetLandData handlerGetLandData = null;
 
@@ -62,7 +61,6 @@ namespace OpenSim.Framework
         public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed;
         public event AcknowledgePrimCross OnAcknowledgePrimCrossed;
         public event CloseAgentConnection OnCloseAgentConnection;
-        public event RegionUp OnRegionUp;
         public event ChildAgentUpdate OnChildAgentUpdate;
         public event LogOffUser OnLogOffUser;
         public event GetLandData OnGetLandData;
@@ -108,17 +106,6 @@ namespace OpenSim.Framework
             return false;
         }
 
-        public virtual bool TriggerRegionUp(RegionInfo region)
-        {
-            handlerRegionUp = OnRegionUp;
-            if (handlerRegionUp != null)
-            {
-                handlerRegionUp(region);
-                return true;
-            }
-            return false;
-        }
-
         public virtual bool TriggerChildAgentUpdate(ChildAgentDataUpdate cAgentData)
         {
             handlerChildAgentUpdate = OnChildAgentUpdate;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 3896a6e..d3a5357 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Xml;
@@ -63,6 +64,13 @@ namespace OpenSim.Framework
         }
         protected string m_serverURI;
 
+        public string RegionName
+        {
+            get { return m_regionName; }
+            set { m_regionName = value; }
+        }
+        protected string m_regionName = String.Empty;
+
         protected bool Allow_Alternate_Ports;
         public bool m_allow_alternate_ports;
         protected string m_externalHostName;
@@ -100,6 +108,7 @@ namespace OpenSim.Framework
 
         public SimpleRegionInfo(RegionInfo ConvertFrom)
         {
+            m_regionName = ConvertFrom.RegionName;
             m_regionLocX = ConvertFrom.RegionLocX;
             m_regionLocY = ConvertFrom.RegionLocY;
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
@@ -197,6 +206,67 @@ namespace OpenSim.Framework
         {
             return m_internalEndPoint.Port;
         }
+
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> kvp = new Dictionary<string, object>();
+            kvp["uuid"] = RegionID.ToString();
+            kvp["locX"] = RegionLocX.ToString();
+            kvp["locY"] = RegionLocY.ToString();
+            kvp["external_ip_address"] = ExternalEndPoint.Address.ToString();
+            kvp["external_port"] = ExternalEndPoint.Port.ToString();
+            kvp["external_host_name"] = ExternalHostName;
+            kvp["http_port"] = HttpPort.ToString();
+            kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
+            kvp["internal_port"] = InternalEndPoint.Port.ToString();
+            kvp["alternate_ports"] = m_allow_alternate_ports.ToString();
+            kvp["server_uri"] = ServerURI;
+
+            return kvp;
+        }
+
+        public SimpleRegionInfo(Dictionary<string, object> kvp)
+        {
+            if ((kvp["external_ip_address"] != null) && (kvp["external_port"] != null))
+            {
+                int port = 0;
+                Int32.TryParse((string)kvp["external_port"], out port);
+                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["external_ip_address"]), port);
+                ExternalEndPoint = ep;
+            }
+            else
+                ExternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+
+            if (kvp["external_host_name"] != null)
+                ExternalHostName = (string)kvp["external_host_name"];
+
+            if (kvp["http_port"] != null)
+            {
+                UInt32 port = 0;
+                UInt32.TryParse((string)kvp["http_port"], out port);
+                HttpPort = port;
+            }
+
+            if ((kvp["internal_ip_address"] != null) && (kvp["internal_port"] != null))
+            {
+                int port = 0;
+                Int32.TryParse((string)kvp["internal_port"], out port);
+                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["internal_ip_address"]), port);
+                InternalEndPoint = ep;
+            }
+            else
+                InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+
+            if (kvp["alternate_ports"] != null)
+            {
+                bool alts = false;
+                Boolean.TryParse((string)kvp["alternate_ports"], out alts);
+                m_allow_alternate_ports = alts;
+            }
+
+            if (kvp["server_uri"] != null)
+                ServerURI = (string)kvp["server_uri"];
+        }
     }
 
     public class RegionInfo : SimpleRegionInfo
@@ -222,7 +292,6 @@ namespace OpenSim.Framework
         public UUID originRegionID = UUID.Zero;
         public string proxyUrl = "";
         public int ProxyOffset = 0;
-        public string RegionName = String.Empty;
         public string regionSecret = UUID.Random().ToString();
         
         public string osSecret;
@@ -971,7 +1040,7 @@ namespace OpenSim.Framework
         public static RegionInfo Create(UUID regionID, string regionName, uint regX, uint regY, string externalHostName, uint httpPort, uint simPort, uint remotingPort, string serverURI)
         {
             RegionInfo regionInfo;
-            IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(externalHostName), (int)simPort);                    
+            IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(externalHostName), (int)simPort);
             regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, externalHostName);
             regionInfo.RemotingPort = remotingPort;
             regionInfo.RemotingAddress = externalHostName;
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
new file mode 100644
index 0000000..a3bc5d1
--- /dev/null
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 System.IO;
+using System.Text;
+using System.Xml;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Framework.Serialization.External
+{
+    /// <summary>
+    /// Serialize and deserialize LandData as an external format.
+    /// </summary>
+    public class LandDataSerializer
+    {
+        protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
+        
+        /// <summary>
+        /// Reify/deserialize landData
+        /// </summary>
+        /// <param name="serializedLandData"></param>
+        /// <returns></returns>
+        /// <exception cref="System.Xml.XmlException"></exception>
+        public static LandData Deserialize(byte[] serializedLandData)
+        {
+            return Deserialize(m_utf8Encoding.GetString(serializedLandData, 0, serializedLandData.Length));
+        }
+        
+        /// <summary>
+        /// Reify/deserialize landData
+        /// </summary>
+        /// <param name="serializedLandData"></param>
+        /// <returns></returns>
+        /// <exception cref="System.Xml.XmlException"></exception>
+        public static LandData Deserialize(string serializedLandData)
+        {
+            LandData landData = new LandData();
+            
+            StringReader sr = new StringReader(serializedLandData);
+            XmlTextReader xtr = new XmlTextReader(sr);
+            
+            xtr.ReadStartElement("LandData");
+
+            landData.Area           = Convert.ToInt32(                 xtr.ReadElementString("Area"));
+            landData.AuctionID      = Convert.ToUInt32(                xtr.ReadElementString("AuctionID"));
+            landData.AuthBuyerID    = UUID.Parse(                      xtr.ReadElementString("AuthBuyerID"));
+            landData.Category       = (ParcelCategory)Convert.ToSByte( xtr.ReadElementString("Category"));
+            landData.ClaimDate      = Convert.ToInt32(                 xtr.ReadElementString("ClaimDate"));
+            landData.ClaimPrice     = Convert.ToInt32(                 xtr.ReadElementString("ClaimPrice"));
+            landData.GlobalID       = UUID.Parse(                      xtr.ReadElementString("GlobalID"));
+            landData.GroupID        = UUID.Parse(                      xtr.ReadElementString("GroupID"));
+            landData.IsGroupOwned   = Convert.ToBoolean(               xtr.ReadElementString("IsGroupOwned"));
+            landData.Bitmap         = Convert.FromBase64String(        xtr.ReadElementString("Bitmap"));
+            landData.Description    =                                  xtr.ReadElementString("Description");
+            landData.Flags          = Convert.ToUInt32(                xtr.ReadElementString("Flags"));
+            landData.LandingType    = Convert.ToByte(                  xtr.ReadElementString("LandingType"));
+            landData.Name           =                                  xtr.ReadElementString("Name");
+            landData.Status         = (ParcelStatus)Convert.ToSByte(   xtr.ReadElementString("Status"));
+            landData.LocalID        = Convert.ToInt32(                 xtr.ReadElementString("LocalID"));
+            landData.MediaAutoScale = Convert.ToByte(                  xtr.ReadElementString("MediaAutoScale"));
+            landData.MediaID        = UUID.Parse(                      xtr.ReadElementString("MediaID"));
+            landData.MediaURL       =                                  xtr.ReadElementString("MediaURL");
+            landData.MusicURL       =                                  xtr.ReadElementString("MusicURL");
+            landData.OwnerID        = UUID.Parse(                      xtr.ReadElementString("OwnerID"));
+
+            landData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+            xtr.Read();
+            if (xtr.Name != "ParcelAccessList")
+                throw new XmlException(String.Format("Expected \"ParcelAccessList\" element but got \"{0}\"", xtr.Name));
+
+            if (!xtr.IsEmptyElement)
+            {
+                while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
+                {
+                    ParcelManager.ParcelAccessEntry pae = new ParcelManager.ParcelAccessEntry();
+
+                    xtr.ReadStartElement("ParcelAccessEntry");
+                    pae.AgentID    = UUID.Parse(                           xtr.ReadElementString("AgentID"));
+                    pae.Time       = Convert.ToDateTime(                   xtr.ReadElementString("Time"));
+                    pae.Flags      = (AccessList)Convert.ToUInt32(         xtr.ReadElementString("AccessList"));
+                    xtr.ReadEndElement();
+                    
+                    landData.ParcelAccessList.Add(pae);
+                }
+            }
+            xtr.Read();
+
+            landData.PassHours      = Convert.ToSingle(                    xtr.ReadElementString("PassHours"));
+            landData.PassPrice      = Convert.ToInt32(                     xtr.ReadElementString("PassPrice"));
+            landData.SalePrice      = Convert.ToInt32(                     xtr.ReadElementString("SalePrice"));
+            landData.SnapshotID     = UUID.Parse(                          xtr.ReadElementString("SnapshotID"));
+            landData.UserLocation   = Vector3.Parse(                       xtr.ReadElementString("UserLocation"));
+            landData.UserLookAt     = Vector3.Parse(                       xtr.ReadElementString("UserLookAt"));
+            landData.Dwell          = Convert.ToInt32(                     xtr.ReadElementString("Dwell"));
+            landData.OtherCleanTime = Convert.ToInt32(                     xtr.ReadElementString("OtherCleanTime"));
+
+            xtr.ReadEndElement();
+            
+            xtr.Close();
+            sr.Close();
+            
+            return landData;
+        }
+        
+        public static string Serialize(LandData landData)
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter xtw = new XmlTextWriter(sw);
+            xtw.Formatting = Formatting.Indented;
+
+            xtw.WriteStartDocument();
+            xtw.WriteStartElement("LandData");
+            
+            xtw.WriteElementString("Area",           Convert.ToString(landData.Area));            
+            xtw.WriteElementString("AuctionID",      Convert.ToString(landData.AuctionID));
+            xtw.WriteElementString("AuthBuyerID",    landData.AuthBuyerID.ToString());
+            xtw.WriteElementString("Category",       Convert.ToString((sbyte)landData.Category));
+            xtw.WriteElementString("ClaimDate",      Convert.ToString(landData.ClaimDate));
+            xtw.WriteElementString("ClaimPrice",     Convert.ToString(landData.ClaimPrice));
+            xtw.WriteElementString("GlobalID",       landData.GlobalID.ToString());
+            xtw.WriteElementString("GroupID",        landData.GroupID.ToString());
+            xtw.WriteElementString("IsGroupOwned",   Convert.ToString(landData.IsGroupOwned));
+            xtw.WriteElementString("Bitmap",         Convert.ToBase64String(landData.Bitmap));
+            xtw.WriteElementString("Description",    landData.Description);
+            xtw.WriteElementString("Flags",          Convert.ToString((uint)landData.Flags));
+            xtw.WriteElementString("LandingType",    Convert.ToString((byte)landData.LandingType));
+            xtw.WriteElementString("Name",           landData.Name);
+            xtw.WriteElementString("Status",         Convert.ToString((sbyte)landData.Status));
+            xtw.WriteElementString("LocalID",        landData.LocalID.ToString());
+            xtw.WriteElementString("MediaAutoScale", Convert.ToString(landData.MediaAutoScale));
+            xtw.WriteElementString("MediaID",        landData.MediaID.ToString());
+            xtw.WriteElementString("MediaURL",       landData.MediaURL);
+            xtw.WriteElementString("MusicURL",       landData.MusicURL);
+            xtw.WriteElementString("OwnerID",        landData.OwnerID.ToString());
+
+            xtw.WriteStartElement("ParcelAccessList");
+            foreach (ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
+            {
+                xtw.WriteStartElement("ParcelAccessEntry");
+                xtw.WriteElementString("AgentID",     pal.AgentID.ToString());
+                xtw.WriteElementString("Time",        pal.Time.ToString("s"));
+                xtw.WriteElementString("AccessList",  Convert.ToString((uint)pal.Flags));
+                xtw.WriteEndElement();
+            }
+            xtw.WriteEndElement();
+            
+            xtw.WriteElementString("PassHours",       Convert.ToString(landData.PassHours));
+            xtw.WriteElementString("PassPrice",       Convert.ToString(landData.PassPrice));
+            xtw.WriteElementString("SalePrice",       Convert.ToString(landData.SalePrice));
+            xtw.WriteElementString("SnapshotID",      landData.SnapshotID.ToString());
+            xtw.WriteElementString("UserLocation",    landData.UserLocation.ToString());
+            xtw.WriteElementString("UserLookAt",      landData.UserLookAt.ToString());
+            xtw.WriteElementString("Dwell",           Convert.ToString(landData.Dwell));
+            xtw.WriteElementString("OtherCleanTime",  Convert.ToString(landData.OtherCleanTime));
+
+            xtw.WriteEndElement();
+
+            xtw.Close();
+            sw.Close();
+            
+            return sw.ToString();
+        }
+    }
+}
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 274f41f..b5901e1 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.Serialization.External
                         settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString());
                         break;
                 }
-            }                    
+            }
            
             xtr.ReadEndElement();
             xtr.ReadStartElement("Terrain");
@@ -200,8 +200,8 @@ namespace OpenSim.Framework.Serialization.External
             
             xtw.WriteStartElement("RegionSettings");
             
-            xtw.WriteStartElement("General");            
-            xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());            
+            xtw.WriteStartElement("General");
+            xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());
             xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString());
             xtw.WriteElementString("AllowLandJoinDivide", settings.AllowLandJoinDivide.ToString());
             xtw.WriteElementString("BlockFly", settings.BlockFly.ToString());
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index eb77e65..fb269b7 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Serialization.External
     /// Serialize and deserialize region settings as an external format.
     /// </summary>
     public class UserProfileSerializer
-    {    
+    {
         public const int MAJOR_VERSION = 0;
         public const int MINOR_VERSION = 1;
         
@@ -65,6 +65,6 @@ namespace OpenSim.Framework.Serialization.External
             sw.Close();
             
             return sw.ToString();
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
new file mode 100644
index 0000000..14e0462
--- /dev/null
+++ b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using NUnit.Framework;
+
+namespace OpenSim.Framework.Serialization.Tests
+{
+    [TestFixture]
+    public class LandDataSerializerTest
+    {
+        private LandData land;
+        private LandData landWithParcelAccessList;
+
+        private static string preSerialized = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n  <Area>128</Area>\n  <AuctionID>0</AuctionID>\n  <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n  <Category>10</Category>\n  <ClaimDate>0</ClaimDate>\n  <ClaimPrice>0</ClaimPrice>\n  <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n  <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n  <IsGroupOwned>False</IsGroupOwned>\n  <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n  <Description>land data to test LandDataSerializer</Description>\n  <Flags>536870944</Flags>\n  <LandingType>2</LandingType>\n  <Name>LandDataSerializerTest Land</Name>\n  <Status>0</Status>\n  <LocalID>0</LocalID>\n  <MediaAutoScale>1</MediaAutoScale>\n  <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n  <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n  <MusicURL />\n  <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n  <ParcelAccessList />\n  <PassHours>0</PassHours>\n  <PassPrice>0</PassPrice>\n  <SalePrice>0</SalePrice>\n  <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n  <UserLocation>&lt;0, 0, 0&gt;</UserLocation>\n  <UserLookAt>&lt;0, 0, 0&gt;</UserLookAt>\n  <Dwell>0</Dwell>\n  <OtherCleanTime>0</OtherCleanTime>\n</LandData>";
+        private static string preSerializedWithParcelAccessList = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n  <Area>128</Area>\n  <AuctionID>0</AuctionID>\n  <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n  <Category>10</Category>\n  <ClaimDate>0</ClaimDate>\n  <ClaimPrice>0</ClaimPrice>\n  <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n  <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n  <IsGroupOwned>False</IsGroupOwned>\n  <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n  <Description>land data to test LandDataSerializer</Description>\n  <Flags>536870944</Flags>\n  <LandingType>2</LandingType>\n  <Name>LandDataSerializerTest Land</Name>\n  <Status>0</Status>\n  <LocalID>0</LocalID>\n  <MediaAutoScale>1</MediaAutoScale>\n  <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n  <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n  <MusicURL />\n  <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n  <ParcelAccessList>\n    <ParcelAccessEntry>\n      <AgentID>62d65d45-c91a-4f77-862c-46557d978b6c</AgentID>\n      <Time>2009-10-01T00:00:00</Time>\n      <AccessList>2</AccessList>\n    </ParcelAccessEntry>\n    <ParcelAccessEntry>\n      <AgentID>ec2a8d18-2378-4fe0-8b68-2a31b57c481e</AgentID>\n      <Time>2010-10-20T00:00:00</Time>\n      <AccessList>1</AccessList>\n    </ParcelAccessEntry>\n  </ParcelAccessList>\n  <PassHours>0</PassHours>\n  <PassPrice>0</PassPrice>\n  <SalePrice>0</SalePrice>\n  <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n  <UserLocation>&lt;0, 0, 0&gt;</UserLocation>\n  <UserLookAt>&lt;0, 0, 0&gt;</UserLookAt>\n  <Dwell>0</Dwell>\n  <OtherCleanTime>0</OtherCleanTime>\n</LandData>";
+
+
+  
+
+        [SetUp]
+        public void setup()
+        {
+            // setup LandData object
+            this.land = new LandData();
+            this.land.AABBMax = new Vector3(0, 0, 0);
+            this.land.AABBMin = new Vector3(128, 128, 128);
+            this.land.Area = 128;
+            this.land.AuctionID = 0;
+            this.land.AuthBuyerID = new UUID();
+            this.land.Category = ParcelCategory.Residential;
+            this.land.ClaimDate = 0;
+            this.land.ClaimPrice = 0;
+            this.land.GlobalID = new UUID("54ff9641-dd40-4a2c-b1f1-47dd3af24e50");
+            this.land.GroupID = new UUID("d740204e-bbbf-44aa-949d-02c7d739f6a5");
+            this.land.GroupPrims = 0;
+            this.land.Description = "land data to test LandDataSerializer";
+            this.land.Flags = (uint)(ParcelFlags.AllowDamage | ParcelFlags.AllowVoiceChat);
+            this.land.LandingType = (byte)LandingType.Direct;
+            this.land.Name = "LandDataSerializerTest Land";
+            this.land.Status = ParcelStatus.Leased;
+            this.land.LocalID = 0;
+            this.land.MediaAutoScale = (byte)0x01;
+            this.land.MediaID = new UUID("d4452578-2f25-4b97-a81b-819af559cfd7");
+            this.land.MediaURL = "http://videos.opensimulator.org/bumblebee.mp4";
+            this.land.OwnerID = new UUID("1b8eedf9-6d15-448b-8015-24286f1756bf");
+
+            this.landWithParcelAccessList = this.land.Copy();
+            this.landWithParcelAccessList.ParcelAccessList.Clear();
+
+            ParcelManager.ParcelAccessEntry pae0 = new ParcelManager.ParcelAccessEntry();
+            pae0.AgentID = new UUID("62d65d45-c91a-4f77-862c-46557d978b6c");
+            pae0.Flags = AccessList.Ban;
+            pae0.Time = new DateTime(2009, 10, 01);
+            this.landWithParcelAccessList.ParcelAccessList.Add(pae0);
+
+            ParcelManager.ParcelAccessEntry pae1 = new ParcelManager.ParcelAccessEntry();
+            pae1.AgentID = new UUID("ec2a8d18-2378-4fe0-8b68-2a31b57c481e");
+            pae1.Flags = AccessList.Access;
+            pae1.Time = new DateTime(2010, 10, 20);
+            this.landWithParcelAccessList.ParcelAccessList.Add(pae1);
+        }
+
+        /// <summary>
+        /// Test the LandDataSerializer.Serialize() method
+        /// </summary>
+        [Test]
+        public void LandDataSerializerSerializeTest()
+        {
+            string serialized = LandDataSerializer.Serialize(this.land);
+            Assert.That(serialized.Length > 0, "Serialize(LandData) returned empty string");
+            Assert.That(serialized == LandDataSerializerTest.preSerialized, 
+                        "result of Serialize(LandData) does not match expected result");
+
+            string serializedWithParcelAccessList = LandDataSerializer.Serialize(this.landWithParcelAccessList);
+            Assert.That(serializedWithParcelAccessList.Length > 0, 
+                        "Serialize(LandData) returned empty string for LandData object with ParcelAccessList");
+            Assert.That(serializedWithParcelAccessList == LandDataSerializerTest.preSerializedWithParcelAccessList, 
+                        "result of Serialize(LandData) does not match expected result (pre-serialized with parcel access list");
+        }
+
+        /// <summary>
+        /// Test the LandDataSerializer.Deserialize() method
+        /// </summary>
+        [Test]
+        public void TestLandDataSerializerDeserializeFromStringTest()
+        {
+            LandData reifiedLandData = LandDataSerializer.Deserialize(LandDataSerializerTest.preSerialized);
+            Assert.That(reifiedLandData != null, "Deserialize(string) returned null");
+            Assert.That(reifiedLandData.GlobalID == this.land.GlobalID, "Reified LandData.GlobalID != original LandData.GlobalID");
+            Assert.That(reifiedLandData.Name == this.land.Name, "Reified LandData.Name != original LandData.Name");
+
+            LandData reifiedLandDataWithParcelAccessList = LandDataSerializer.Deserialize(LandDataSerializerTest.preSerializedWithParcelAccessList);
+            Assert.That(reifiedLandDataWithParcelAccessList != null, 
+                        "Deserialize(string) returned null (pre-serialized with parcel access list)");
+            Assert.That(reifiedLandDataWithParcelAccessList.GlobalID == this.landWithParcelAccessList.GlobalID, 
+                        "Reified LandData.GlobalID != original LandData.GlobalID (pre-serialized with parcel access list)");
+            Assert.That(reifiedLandDataWithParcelAccessList.Name == this.landWithParcelAccessList.Name, 
+                        "Reified LandData.Name != original LandData.Name (pre-serialized with parcel access list)");
+        }
+    }
+}
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 7a244ff..632b551 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.Servers
                         m_consoleAppender.Threshold = Level.All;
                     
                     Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
-                }                                          
+                }
                 
                 m_console.Commands.AddCommand("base", false, "quit",
                         "quit",
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers
         
         /// <summary>
         /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
-        /// </summary>      
+        /// </summary>
         public virtual void ShutdownSpecific() {}
         
         /// <summary>
@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Servers
         /// </summary>
         public virtual void Startup()
         {
-            m_log.Info("[STARTUP]: Beginning startup processing");                        
+            m_log.Info("[STARTUP]: Beginning startup processing");
 
             EnhanceVersionInformation();
             
@@ -301,7 +301,7 @@ namespace OpenSim.Framework.Servers
 
         /// <summary>
         /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
-        /// </summary>      
+        /// </summary>
         public virtual void Shutdown()
         {
             ShutdownSpecific();
@@ -367,7 +367,7 @@ namespace OpenSim.Framework.Servers
         }
 
         public virtual void HandleShow(string module, string[] cmd)
-        {            
+        {
             List<string> args = new List<string>(cmd);
 
             args.RemoveAt(0);
@@ -375,7 +375,7 @@ namespace OpenSim.Framework.Servers
             string[] showParams = args.ToArray();
 
             switch (showParams[0])
-            {                       
+            {
                 case "info":
                     Notice("Version: " + m_version);
                     Notice("Startup directory: " + m_startupDirectory);
diff --git a/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
index fe69ad3..5afa110 100644
--- a/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}", verb, requestUrl, e);
                 }
                     
-            }, null);         
+            }, null);
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 771ae05..6c63c6c 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public BaseHttpServer(uint port, bool ssl) : this (port)
         {
-            m_ssl = ssl;          
+            m_ssl = ssl;
         }
 
         public BaseHttpServer(uint port, bool ssl, uint sslport, string CN) : this (port, ssl)
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             lock (m_rpcHandlers)
             {
                 m_rpcHandlers[method] = handler;
-                m_rpcHandlersKeepAlive[method] = keepAlive; // default              
+                m_rpcHandlersKeepAlive[method] = keepAlive; // default
             }
             
             return true;
@@ -256,13 +256,51 @@ namespace OpenSim.Framework.Servers.HttpServer
             IHttpClientContext context = (IHttpClientContext)source;
             IHttpRequest request = args.Request;
             
-
             PollServiceEventArgs psEvArgs;
+
             if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out psEvArgs))
             {
-                
-                m_PollServiceManager.Enqueue(new PollServiceHttpRequest(psEvArgs, context, request));
-                //DoHTTPGruntWork(psEvArgs.NoEvents(),new OSHttpResponse(new HttpResponse(context, request)));
+                PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request);
+
+                if (psEvArgs.Request != null)
+                {
+                    OSHttpRequest req = new OSHttpRequest(context, request);
+                    
+                    Stream requestStream = req.InputStream;
+
+                    Encoding encoding = Encoding.UTF8;
+                    StreamReader reader = new StreamReader(requestStream, encoding);
+
+                    string requestBody = reader.ReadToEnd();
+
+                    Hashtable keysvals = new Hashtable();
+                    Hashtable headervals = new Hashtable();
+
+                    string[] querystringkeys = req.QueryString.AllKeys;
+                    string[] rHeaders = req.Headers.AllKeys;
+
+                    keysvals.Add("body", requestBody);
+                    keysvals.Add("uri", req.RawUrl);
+                    keysvals.Add("content-type", req.ContentType);
+                    keysvals.Add("http-method", req.HttpMethod);
+
+                    foreach (string queryname in querystringkeys)
+                    {
+                        keysvals.Add(queryname, req.QueryString[queryname]);
+                    }
+
+                    foreach (string headername in rHeaders)
+                    {
+                        headervals[headername] = req.Headers[headername];
+                    }
+
+                    keysvals.Add("headers",headervals);
+                    keysvals.Add("querystringkeys", querystringkeys);
+
+                    psEvArgs.Request(psreq.RequestID, keysvals);
+                }
+
+                m_PollServiceManager.Enqueue(psreq);
             }
             else
             {
@@ -275,49 +313,17 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             OSHttpRequest req = new OSHttpRequest(context, request);
             OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
-            //resp.KeepAlive = req.KeepAlive;
-            //m_log.Info("[Debug BASE HTTP SERVER]: Got Request");
-            //HttpServerContextObj objstate= new HttpServerContextObj(req,resp);
-            //ThreadPool.QueueUserWorkItem(new WaitCallback(ConvertIHttpClientContextToOSHttp), (object)objstate);
             HandleRequest(req, resp);
         }
 
         public void ConvertIHttpClientContextToOSHttp(object stateinfo)
         {
             HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
-            //OSHttpRequest request = new OSHttpRequest(objstate.context,objstate.req);
-            //OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(objstate.context, objstate.req));
 
             OSHttpRequest request = objstate.oreq;
             OSHttpResponse resp = objstate.oresp;
-            //OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(objstate.context, objstate.req));
 
-            /*
-            request.AcceptTypes = objstate.req.AcceptTypes;
-            request.ContentLength = (long)objstate.req.ContentLength;
-            request.Headers = objstate.req.Headers;
-            request.HttpMethod = objstate.req.Method;
-            request.InputStream = objstate.req.Body;
-            foreach (string str in request.Headers)
-            {
-                if (str.ToLower().Contains("content-type: "))
-                {
-                    request.ContentType = str.Substring(13, str.Length - 13);
-                    break;
-                }
-            }
-            //request.KeepAlive = objstate.req.
-            foreach (HttpServer.HttpInput httpinput in objstate.req.QueryString)
-            {
-                request.QueryString.Add(httpinput.Name, httpinput[httpinput.Name]);
-            }
-            
-            //request.Query = objstate.req.//objstate.req.QueryString;
-            //foreach (
-            //request.QueryString = objstate.req.QueryString;
-
-             */
-            HandleRequest(request,resp);           
+            HandleRequest(request,resp);
         }
 
         public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
@@ -332,6 +338,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //  probability event; if a request is matched it is normally expected to be
                 //  handled
                 //m_log.Debug("[BASE HTTP SERVER]: Handling Request" + request.RawUrl);
+
                 IHttpAgentHandler agentHandler;
 
                 if (TryGetAgentHandler(request, response, out agentHandler))
@@ -342,10 +349,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                     }
                 }
 
-                IRequestHandler requestHandler;
                 //response.KeepAlive = true;
                 response.SendChunked = false;
 
+                IRequestHandler requestHandler;
+
                 string path = request.RawUrl;
                 string handlerKey = GetHandlerKey(request.HttpMethod, path);
 
@@ -359,6 +367,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                     response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type.
 
+
                     if (requestHandler is IStreamedRequestHandler)
                     {
                         IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler;
@@ -404,6 +413,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         //                        }
 
                         keysvals.Add("requestbody", requestBody);
+                        keysvals.Add("headers",headervals);
                         if (keysvals.Contains("method"))
                         {
                             //m_log.Warn("[HTTP]: Contains Method");
@@ -702,7 +712,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     lock (m_rpcHandlers)
                     {
                         methodWasFound = m_rpcHandlers.TryGetValue(methodName, out method);
-                    }                            
+                    }
                     
                     if (methodWasFound)
                     {
@@ -726,8 +736,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                     else
                     {
                         xmlRpcResponse = new XmlRpcResponse();
+                        
                         // Code set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
-                        xmlRpcResponse.SetFault(-32601, String.Format("Requested method [{0}] not found", methodName));
+                        xmlRpcResponse.SetFault(
+                            XmlRpcErrorCodes.SERVER_ERROR_METHOD, 
+                            String.Format("Requested method [{0}] not found", methodName));
                     }
 
                     responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
@@ -747,6 +760,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     response.SendChunked = false;
                     response.ContentLength64 = buf.Length;
                     response.ContentEncoding = Encoding.UTF8;
+                    
                     try
                     {
                         response.OutputStream.Write(buf, 0, buf.Length);
@@ -917,7 +931,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 catch (IOException e)
                 {
-                    m_log.DebugFormat("[BASE HTTP SERVER] LLSD IOException {0}.", e);                    
+                    m_log.DebugFormat("[BASE HTTP SERVER] LLSD IOException {0}.", e);
                 }
                 catch (SocketException e)
                 {
@@ -1354,7 +1368,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                                 bestMatch = pattern;
                         }
                     }
-                }           
+                }
 
                 if (String.IsNullOrEmpty(bestMatch))
                 {
@@ -1466,7 +1480,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     m_log.Warn("[BASE HTTP SERVER] XmlRpcRequest issue: " + e.Message);
                 }
-            }            
+            }
         }
 
         public void SendHTML404(OSHttpResponse response, string host)
@@ -1575,7 +1589,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     // if you want more detailed trace information from the HttpServer
                     //m_httpListener2.UseTraceLogs = true;
                     
-                    //m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;                    
+                    //m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;
                 }
                 else
                 {
@@ -1610,7 +1624,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err)
-        {            
+        {
             switch (err)
             {
                 case SocketError.NotSocket:
@@ -1621,7 +1635,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         public void httpServerException(object source, Exception exception)
-        {            
+        {
             m_log.ErrorFormat("[HTTPSERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
            /*
             if (HTTPDRunning)// && NotSocketErrors > 5)
@@ -1648,7 +1662,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             } 
             catch (NullReferenceException)
             {
-                m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer.");    
+                m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer.");
             }
             
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index 1bdf4fa..d13408d 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -128,6 +128,6 @@ namespace OpenSim.Framework.Servers.HttpServer
         
         string GetHTTP404(string host);
 
-        string GetHTTP500();       
+        string GetHTTP500();
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index fed490e..9d512c6 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -30,20 +30,23 @@ using System.Collections;
 using OpenMetaverse;
 namespace OpenSim.Framework.Servers.HttpServer
 {
-    public delegate bool HasEventsMethod(UUID pId);
+    public delegate void RequestMethod(UUID requestID, Hashtable request);
+    public delegate bool HasEventsMethod(UUID requestID, UUID pId);
 
-    public delegate Hashtable GetEventsMethod(UUID pId, string request);
+    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId, string request);
 
-    public delegate Hashtable NoEventsMethod();
+    public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
 
     public class PollServiceEventArgs : EventArgs
     {
         public HasEventsMethod HasEvents;
         public GetEventsMethod GetEvents;
         public NoEventsMethod NoEvents;
+        public RequestMethod Request;
         public UUID Id;
-        public PollServiceEventArgs(HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId)
+        public PollServiceEventArgs(RequestMethod pRequest, HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId)
         {
+            Request = pRequest;
             HasEvents = pHasEvents;
             GetEvents = pGetEvents;
             NoEvents = pNoEvents;
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index ff7c1e8..553a7eb 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -27,6 +27,7 @@
 
 using System;
 using HttpServer;
+using OpenMetaverse;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -37,12 +38,14 @@ namespace OpenSim.Framework.Servers.HttpServer
         public readonly IHttpClientContext HttpContext;
         public readonly IHttpRequest Request;
         public readonly int RequestTime;
+        public readonly UUID RequestID;
         public PollServiceHttpRequest(PollServiceEventArgs pPollServiceArgs, IHttpClientContext pHttpContext, IHttpRequest pRequest)
         {
             PollServiceArgs = pPollServiceArgs;
             HttpContext = pHttpContext;
             Request = pRequest;
             RequestTime = System.Environment.TickCount;
+            RequestID = UUID.Random();
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 4020190..1c54581 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             foreach (object o in m_requests)
             {
                 PollServiceHttpRequest req = (PollServiceHttpRequest) o;
-                m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(), new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
+                m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id), new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
             }
 
             m_requests.Clear();
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 41fb376..ce32443 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -100,11 +100,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 PollServiceHttpRequest req = m_request.Dequeue();
                 try
                 {
-                    if (req.PollServiceArgs.HasEvents(req.PollServiceArgs.Id))
+                    if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
                     {
                         StreamReader str = new StreamReader(req.Request.Body);
 
-                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.PollServiceArgs.Id, str.ReadToEnd());
+                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
                         m_server.DoHTTPGruntWork(responsedata,
                                                  new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
                     }
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     {
                         if ((Environment.TickCount - req.RequestTime) > m_timeout)
                         {
-                            m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(),
+                            m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),
                                                      new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
                         }
                         else
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
new file mode 100644
index 0000000..a0d4008
--- /dev/null
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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.IO;
+using System.Net;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+
+namespace OpenSim.Framework.Servers.HttpServer
+{
+    public class SynchronousRestFormsRequester
+    {
+        /// <summary>
+        /// Perform a synchronous REST request.
+        /// </summary>
+        /// <param name="verb"></param>
+        /// <param name="requestUrl"></param>
+        /// <param name="obj"> </param>
+        /// <returns></returns>
+        ///
+        /// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting
+        /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
+        public static string MakeRequest(string verb, string requestUrl, string obj)
+        {
+            WebRequest request = WebRequest.Create(requestUrl);
+            request.Method = verb;
+
+            if ((verb == "POST") || (verb == "PUT"))
+            {
+                request.ContentType = "text/www-form-urlencoded";
+
+                MemoryStream buffer = new MemoryStream();
+                int length = 0;
+                using (StreamWriter writer = new StreamWriter(buffer))
+                {
+                    writer.Write(obj);
+                    writer.Flush();
+                }
+
+                length = (int)obj.Length;
+                request.ContentLength = length;
+
+                Stream requestStream = request.GetRequestStream();
+                requestStream.Write(buffer.ToArray(), 0, length);
+            }
+
+            string respstring = String.Empty;
+
+            try
+            {
+                using (WebResponse resp = request.GetResponse())
+                {
+                    if (resp.ContentLength > 0)
+                    {
+                        using (StreamReader reader = new StreamReader(resp.GetResponseStream()))
+                        {
+                            respstring = reader.ReadToEnd();
+                        }
+                    }
+                }
+            }
+            catch (System.InvalidOperationException)
+            {
+                // This is what happens when there is invalid XML
+            }
+            return respstring;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 6f9b00c..9f98310 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.6";
+        private const string VERSION_NUMBER = "0.6.8";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
@@ -56,7 +56,7 @@ namespace OpenSim
         public const int VERSIONINFO_VERSION_LENGTH = 27;
         
         /// <value>
-        /// This is the external interface version.  It is separate from the OpenSimulator project version.  
+        /// This is the external interface version.  It is separate from the OpenSimulator project version.
         /// 
         /// This version number should be 
         /// increased by 1 every time a code change makes the previous OpenSimulator revision incompatible
@@ -67,7 +67,7 @@ namespace OpenSim
         /// 
         /// Having this version number allows the grid service to reject connections from regions running a version
         /// of the code that is too old. 
-        ///   
+        ///
         /// </value>
         public readonly static int MajorInterfaceVersion = 6;
     }
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index 084964d..3d8f32f 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -35,9 +35,9 @@ namespace OpenSim.Framework
     /// 
     /// TODO: This looks very much like the OpenMetaverse SimStatsPacket.  It should be much more generic stats
     /// storage.
-    /// </summary>        
+    /// </summary>
     public class SimStats
-    {                 
+    {
         public uint RegionX
         {
             get { return m_regionX; }
@@ -47,25 +47,25 @@ namespace OpenSim.Framework
         public uint RegionY
         {
             get { return m_regionY; }
-        }        
+        }
         private uint m_regionY;
         
         public SimStatsPacket.RegionBlock RegionBlock
         {
             get { return m_regionBlock; }
-        }                
+        }
         private SimStatsPacket.RegionBlock m_regionBlock;
         
         public SimStatsPacket.StatBlock[] StatsBlock
         {
             get { return m_statsBlock; }
-        }        
+        }
         private SimStatsPacket.StatBlock[] m_statsBlock;
         
         public uint RegionFlags
         {
             get { return m_regionFlags; }
-        }        
+        }
         private uint m_regionFlags;
             
         public uint ObjectCapacity
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
 
         public UUID RegionUUID
         {
-            get { return regionUUID;}   
+            get { return regionUUID; }
         }
         private UUID regionUUID;
                 
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 946d7f5..25ae6b0 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
     /// A dictionary for task inventory.
     /// </summary>
     /// This class is not thread safe.  Callers must synchronize on Dictionary methods or Clone() this object before
-    /// iterating over it.    
+    /// iterating over it.
     public class TaskInventoryDictionary : Dictionary<UUID, TaskInventoryItem>,
                                            ICloneable, IXmlSerializable
     {
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
index fa6f0b8..d3a239d 100644
--- a/OpenSim/Framework/ThreadTracker.cs
+++ b/OpenSim/Framework/ThreadTracker.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework
         }
 
         private static void ThreadTrackerThreadLoop()
-        {            
+        {
             try
             {
                 while (true)
@@ -70,8 +70,8 @@ namespace OpenSim.Framework
             {
                 m_log.ErrorFormat(
                     "[THREAD TRACKER]: Thread tracker cleanup thread terminating with exception.  Please report this error.  Exception is {0}", 
-                    e);                
-            }                
+                    e);
+            }
         }
 
         public static void Add(Thread thread)
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 16f265c..0fa82cf 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("library_location",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Path to library control file",
-                                                string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);            
+                                                string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);
             
             m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index f51a199..413f152 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -217,7 +217,7 @@ namespace OpenSim.Framework
         public string Name
         {
             get { return String.Format("{0} {1}", m_firstname, m_surname); }
-        }        
+        }
 
         public string Email
         {
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 58344f3..17fc58c 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Framework
     /// </summary>
     public class Util
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);       
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static uint nextXferID = 5000;
         private static Random randomClass = new Random();
@@ -70,6 +70,39 @@ namespace OpenSim.Framework
         public static readonly Regex UUIDPattern 
             = new Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
         
+        /// <summary>
+        /// Linear interpolates B<->C using percent A
+        /// </summary>
+        /// <param name="a"></param>
+        /// <param name="b"></param>
+        /// <param name="c"></param>
+        /// <returns></returns>
+        public static double lerp(double a, double b, double c)
+        {
+            return (b*a) + (c*(1 - a));
+        }
+
+        /// <summary>
+        /// Bilinear Interpolate, see Lerp but for 2D using 'percents' X & Y.
+        /// Layout:
+        ///     A B
+        ///     C D
+        /// A<->C = Y
+        /// C<->D = X
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <param name="a"></param>
+        /// <param name="b"></param>
+        /// <param name="c"></param>
+        /// <param name="d"></param>
+        /// <returns></returns>
+        public static double lerp2D(double x, double y, double a, double b, double c, double d)
+        {
+            return lerp(y, lerp(x, a, b), lerp(x, c, d));
+        }
+
+
         /// <value>
         /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 
         /// </value>
@@ -103,7 +136,7 @@ namespace OpenSim.Framework
             float dx = a.X - b.X;
             float dy = a.Y - b.Y;
             float dz = a.Z - b.Z;
-            return (dx*dx + dy*dy + dz*dz) < (amount*amount);           
+            return (dx*dx + dy*dy + dz*dz) < (amount*amount);
         }
 
         /// <summary>
@@ -942,7 +975,7 @@ namespace OpenSim.Framework
             else
             {
                 os = ReadEtcIssue();
-            }         
+            }
                       
             if (os.Length > 45)
             {
@@ -1170,6 +1203,32 @@ namespace OpenSim.Framework
             return found.ToArray();
         }
 
+        public static string ServerURI(string uri)
+        {
+            if (uri == string.Empty)
+                return string.Empty;
+
+            // Get rid of eventual slashes at the end
+            uri = uri.TrimEnd('/');
+
+            IPAddress ipaddr1 = null;
+            string port1 = "";
+            try
+            {
+                ipaddr1 = Util.GetHostFromURL(uri);
+            }
+            catch { }
+
+            try
+            {
+                port1 = uri.Split(new char[] { ':' })[2];
+            }
+            catch { }
+
+            // We tried our best to convert the domain names to IP addresses
+            return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri;
+        }
+
         #region FireAndForget Threading Pattern
 
         public static void FireAndForget(System.Threading.WaitCallback callback)
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
index 6f2c1ba..df5eaab 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
@@ -324,44 +324,53 @@ namespace OpenSim.Grid.MessagingServer.Modules
         /// <returns></returns>
         public XmlRpcResponse UserLoggedOn(XmlRpcRequest request, IPEndPoint remoteClient)
         {
-            Hashtable requestData = (Hashtable)request.Params[0];
+            try
+            {
+                Hashtable requestData = (Hashtable)request.Params[0];
+
+                AgentCircuitData agentData = new AgentCircuitData();
+                agentData.SessionID = new UUID((string)requestData["sessionid"]);
+                agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
+                agentData.firstname = (string)requestData["firstname"];
+                agentData.lastname = (string)requestData["lastname"];
+                agentData.AgentID = new UUID((string)requestData["agentid"]);
+                agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
+                agentData.CapsPath = (string)requestData["caps_path"];
+
+                if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
+                {
+                    agentData.child = true;
+                }
+                else
+                {
+                    agentData.startpos =
+                         new Vector3(Convert.ToSingle(requestData["positionx"]),
+                                     Convert.ToSingle(requestData["positiony"]),
+                                     Convert.ToSingle(requestData["positionz"]));
+                    agentData.child = false;
+                }
 
-            AgentCircuitData agentData = new AgentCircuitData();
-            agentData.SessionID = new UUID((string)requestData["sessionid"]);
-            agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
-            agentData.firstname = (string)requestData["firstname"];
-            agentData.lastname = (string)requestData["lastname"];
-            agentData.AgentID = new UUID((string)requestData["agentid"]);
-            agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-            agentData.CapsPath = (string)requestData["caps_path"];
+                ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
+
+                m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
+                                 agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");
+
+                UserPresenceData up = new UserPresenceData();
+                up.agentData = agentData;
+                up.friendData = GetUserFriendList(agentData.AgentID);
+                up.regionData = m_regionModule.GetRegionInfo(regionHandle);
+                up.OnlineYN = true;
+                up.lookupUserRegionYN = false;
+                ProcessFriendListSubscriptions(up);
 
-            if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
-            {
-                agentData.child = true;
             }
-            else
+            catch (Exception e)
             {
-                agentData.startpos =
-                     new Vector3(Convert.ToSingle(requestData["positionx"]),
-                                 Convert.ToSingle(requestData["positiony"]),
-                                 Convert.ToSingle(requestData["positionz"]));
-                agentData.child = false;
+                m_log.WarnFormat("[LOGIN]: Exception on UserLoggedOn: {0}", e);
             }
 
-            ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
-
-            m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
-                             agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");
-
-            UserPresenceData up = new UserPresenceData();
-            up.agentData = agentData;
-            up.friendData = GetUserFriendList(agentData.AgentID);
-            up.regionData = m_regionModule.GetRegionInfo(regionHandle);
-            up.OnlineYN = true;
-            up.lookupUserRegionYN = false;
-            ProcessFriendListSubscriptions(up);
-
             return new XmlRpcResponse();
+
         }
 
         /// <summary>
@@ -372,11 +381,18 @@ namespace OpenSim.Grid.MessagingServer.Modules
         /// <returns></returns>
         public XmlRpcResponse UserLoggedOff(XmlRpcRequest request, IPEndPoint remoteClient)
         {
-            m_log.Info("[USERLOGOFF]: User logged off called");
-            Hashtable requestData = (Hashtable)request.Params[0];
+            try
+            {
+                m_log.Info("[USERLOGOFF]: User logged off called");
+                Hashtable requestData = (Hashtable)request.Params[0];
 
-            UUID AgentID = new UUID((string)requestData["agentid"]);
-            ProcessLogOff(AgentID);
+                UUID AgentID = new UUID((string)requestData["agentid"]);
+                ProcessLogOff(AgentID);
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[USERLOGOFF]: Exception on UserLoggedOff: {0}", e);
+            }
 
             return new XmlRpcResponse();
         }
diff --git a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
index 8006119..76c4899 100644
--- a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
@@ -70,6 +70,6 @@ namespace OpenSim.Grid.MessagingServer.Modules
         {
             //throw new Exception("The method or operation is not implemented.");
             return null;
-        }     
+        }
     }
 }
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
index 9d31d81..77caf47 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Grid.UserServer.Modules
 
     /// <summary>
     /// Hypergrid login service used in grid mode.
-    /// </summary>     
+    /// </summary>
     public class UserLoginAuthService : HGLoginAuthService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 01d5537..7d0e0de 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -34,6 +34,7 @@ using System.Text.RegularExpressions;
 using log4net;
 using Nwc.XmlRpc;
 using OpenMetaverse;
+using Nini.Config;
 using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
@@ -42,6 +43,9 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Grid.UserServer.Modules
 {
@@ -51,7 +55,7 @@ namespace OpenSim.Grid.UserServer.Modules
 
     /// <summary>
     /// Login service used in grid mode.
-    /// </summary>     
+    /// </summary>
     public class UserLoginService : LoginService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -63,6 +67,8 @@ namespace OpenSim.Grid.UserServer.Modules
         public UserConfig m_config;
         private readonly IRegionProfileRouter m_regionProfileService;
 
+        private IGridService m_GridService;
+
         protected BaseHttpServer m_httpServer;
 
         public UserLoginService(
@@ -76,6 +82,8 @@ namespace OpenSim.Grid.UserServer.Modules
             m_defaultHomeY = m_config.DefaultY;
             m_interInventoryService = inventoryService;
             m_regionProfileService = regionProfileService;
+
+            m_GridService = new GridServicesConnector(config.GridServerURL.ToString());
         }
 
         public void RegisterHandlers(BaseHttpServer httpServer, bool registerLLSDHandler, bool registerOpenIDHandlers)
@@ -203,47 +211,38 @@ namespace OpenSim.Grid.UserServer.Modules
 
         protected override RegionInfo RequestClosestRegion(string region)
         {
-            RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(region,
-                                                                                         m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
-
-            if (profileData != null)
-            {
-                return profileData.ToRegionInfo();
-            }
-            else
-            {
-                return null;
-            }
+            return GridRegionToRegionInfo(m_GridService.GetRegionByName(UUID.Zero, region));
         }
 
         protected override RegionInfo GetRegionInfo(ulong homeRegionHandle)
         {
-            RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(homeRegionHandle,
-                                                                                         m_config.GridServerURL, m_config.GridSendKey,
-                                                                                         m_config.GridRecvKey);
-            if (profileData != null)
-            {
-                return profileData.ToRegionInfo();
-            }
-            else
-            {
-                return null;
-            }
+            uint x = 0, y = 0;
+            Utils.LongToUInts(homeRegionHandle, out x, out y);
+            return GridRegionToRegionInfo(m_GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y));
         }
 
         protected override RegionInfo GetRegionInfo(UUID homeRegionId)
         {
-            RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(homeRegionId,
-                                                                                         m_config.GridServerURL, m_config.GridSendKey,
-                                                                                         m_config.GridRecvKey);
-            if (profileData != null)
-            {
-                return profileData.ToRegionInfo();
-            }
-            else
-            {
+            return GridRegionToRegionInfo(m_GridService.GetRegionByUUID(UUID.Zero, homeRegionId));
+        }
+
+        private RegionInfo GridRegionToRegionInfo(GridRegion gregion)
+        {
+            if (gregion == null)
                 return null;
-            }
+
+            RegionInfo rinfo = new RegionInfo();
+            rinfo.ExternalHostName = gregion.ExternalHostName;
+            rinfo.HttpPort = gregion.HttpPort;
+            rinfo.InternalEndPoint = gregion.InternalEndPoint;
+            rinfo.RegionID = gregion.RegionID;
+            rinfo.RegionLocX = (uint)(gregion.RegionLocX / Constants.RegionSize);
+            rinfo.RegionLocY = (uint)(gregion.RegionLocY / Constants.RegionSize);
+            rinfo.RegionName = gregion.RegionName;
+            rinfo.ScopeID = gregion.ScopeID;
+            rinfo.ServerURI = gregion.ServerURI;
+
+            return rinfo;
         }
 
         protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient)
@@ -280,9 +279,8 @@ namespace OpenSim.Grid.UserServer.Modules
                 //response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
 
                 // Take off trailing / so that the caps path isn't //CAPS/someUUID
-                if (regionInfo.httpServerURI.EndsWith("/"))
-                    regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1);
-                response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
+                string uri = regionInfo.httpServerURI.Trim(new char[] { '/' });
+                response.SeedCapability = uri + CapsUtil.GetCapsSeedPath(capsPath);
 
 
                 // Notify the target of an incoming user
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs
index 002f232..36c6297 100644
--- a/OpenSim/Grid/UserServer.Modules/UserManager.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs
@@ -108,6 +108,9 @@ namespace OpenSim.Grid.UserServer.Modules
             m_httpServer.AddXmlRPCHandler("get_user_by_uuid", XmlRPCGetUserMethodUUID);
             m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", XmlRPCGetAvatarPickerAvatar);
 
+            // Used by IAR module to do password checks
+            m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword);
+
             m_httpServer.AddXmlRPCHandler("update_user_current_region", XmlRPCAtRegion);
             m_httpServer.AddXmlRPCHandler("logout_of_simulator", XmlRPCLogOffUserMethodUUID);
             m_httpServer.AddXmlRPCHandler("get_agent_by_uuid", XmlRPCGetAgentMethodUUID);
@@ -203,6 +206,57 @@ namespace OpenSim.Grid.UserServer.Modules
 
         #region XMLRPC User Methods
 
+        /// <summary>
+        /// Authenticate a user using their password
+        /// </summary>
+        /// <param name="request">Must contain values for "user_uuid" and "password" keys</param>
+        /// <param name="remoteClient"></param>
+        /// <returns></returns>
+        public XmlRpcResponse XmlRPCAuthenticateUserMethodPassword(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+//            m_log.DebugFormat("[USER MANAGER]: Received authenticated user by password request from {0}", remoteClient);
+            
+            Hashtable requestData = (Hashtable)request.Params[0];
+            string userUuidRaw = (string)requestData["user_uuid"];
+            string password = (string)requestData["password"];
+
+            if (null == userUuidRaw)
+                return Util.CreateUnknownUserErrorResponse();
+
+            UUID userUuid;
+            if (!UUID.TryParse(userUuidRaw, out userUuid))
+                return Util.CreateUnknownUserErrorResponse();
+
+            UserProfileData userProfile = m_userDataBaseService.GetUserProfile(userUuid);
+            if (null == userProfile)
+                return Util.CreateUnknownUserErrorResponse();
+
+            string authed;
+            
+            if (null == password)
+            {
+                authed = "FALSE";
+            }
+            else
+            {
+                if (m_userDataBaseService.AuthenticateUserByPassword(userUuid, password))
+                    authed = "TRUE";
+                else
+                    authed = "FALSE";
+            }
+
+//            m_log.DebugFormat(
+//                "[USER MANAGER]: Authentication by password result from {0} for {1} is {2}",
+//                remoteClient, userUuid, authed);
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable responseData = new Hashtable();
+            responseData["auth_user"] = authed;
+            response.Value = responseData;
+            
+            return response;
+        }
+
         public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             // XmlRpcResponse response = new XmlRpcResponse();
@@ -246,10 +300,10 @@ namespace OpenSim.Grid.UserServer.Modules
                     m_userDataBaseService.CommitAgent(ref userProfile);
                     //setUserProfile(userProfile);
 
-
                     returnstring = "TRUE";
                 }
             }
+                
             responseData.Add("returnString", returnstring);
             response.Value = responseData;
             return response;
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index baf0fd3..286076d7 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -187,13 +187,13 @@ namespace OpenSim.Grid.UserServer
         /// <param name="inventoryService"></param>
         protected virtual void StartupUserServerModules()
         {
-            m_log.Info("[STARTUP]: Establishing data connection");                        
+            m_log.Info("[STARTUP]: Establishing data connection");
             
             //we only need core components so we can request them from here
             IInterServiceInventoryServices inventoryService;
             TryGet<IInterServiceInventoryServices>(out inventoryService);
             
-            CommunicationsManager commsManager = new UserServerCommsManager(inventoryService);            
+            CommunicationsManager commsManager = new UserServerCommsManager(inventoryService);
 
             //setup database access service, for now this has to be created before the other modules.
             m_userDataBaseService = new UserDataBaseService(commsManager);
@@ -260,8 +260,6 @@ namespace OpenSim.Grid.UserServer
             m_userManager.PostInitialise();
             m_avatarAppearanceModule.PostInitialise();
             m_friendsModule.PostInitialise();
-
-            m_avatarAppearanceModule.PostInitialise();
         }
 
         protected virtual void RegisterHttpHandlers()
@@ -276,8 +274,6 @@ namespace OpenSim.Grid.UserServer
             m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
             m_messagesService.RegisterHandlers(m_httpServer);
             m_gridInfoService.RegisterHandlers(m_httpServer);
-
-            m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
         }
 
         public override void ShutdownSpecific()
diff --git a/OpenSim/Grid/UserServer/UserServerCommsManager.cs b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
index 7200836..8ef693b 100644
--- a/OpenSim/Grid/UserServer/UserServerCommsManager.cs
+++ b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
@@ -28,9 +28,9 @@
 using OpenSim.Framework.Communications;
 
 namespace OpenSim.Grid.UserServer
-{        
+{
     public class UserServerCommsManager : CommunicationsManager
-    {        
+    {
         public UserServerCommsManager(IInterServiceInventoryServices interServiceInventoryService)
             : base(null, null)
         {
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 2fd26bf..241af53 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -91,7 +91,7 @@ namespace OpenSim
                 m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config");
             }
 
-            // Check if the system is compatible with OpenSimulator.   
+            // Check if the system is compatible with OpenSimulator.
             // Ensures that the minimum system requirements are met
             m_log.Info("Performing compatibility checks... ");
             string supported = String.Empty;
diff --git a/OpenSim/Region/Application/HGCommands.cs b/OpenSim/Region/Application/HGCommands.cs
index 1786e54..f503db7 100644
--- a/OpenSim/Region/Application/HGCommands.cs
+++ b/OpenSim/Region/Application/HGCommands.cs
@@ -43,16 +43,11 @@ namespace OpenSim
     public class HGCommands
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public static IHyperlink HGServices = null;
-
-        private static uint m_autoMappingX = 0;
-        private static uint m_autoMappingY = 0;
-        private static bool m_enableAutoMapping = false;
 
         public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, CommunicationsManager m_commsManager,
             StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version)
         {
-            HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(m_commsManager, HGServices);
+            HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(m_commsManager);
 
             return
                 new HGScene(
@@ -61,213 +56,5 @@ namespace OpenSim
                     m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
         }
 
-        public static void RunHGCommand(string command, string[] cmdparams, Scene scene)
-        {
-            if (command.Equals("link-mapping"))
-            {
-                if (cmdparams.Length == 2)
-                {
-                    try
-                    {
-                        m_autoMappingX = Convert.ToUInt32(cmdparams[0]);
-                        m_autoMappingY = Convert.ToUInt32(cmdparams[1]);
-                        m_enableAutoMapping = true;
-                    }
-                    catch (Exception)
-                    {
-                        m_autoMappingX = 0;
-                        m_autoMappingY = 0;
-                        m_enableAutoMapping = false;
-                    }
-                }
-            }
-            else if (command.Equals("link-region"))
-            {
-                if (cmdparams.Length < 3)
-                {
-                    if ((cmdparams.Length == 1) || (cmdparams.Length == 2))
-                    {
-                        LoadXmlLinkFile(cmdparams, scene);
-                    }
-                    else
-                    {
-                        LinkRegionCmdUsage();
-                    }
-                    return;
-                }
-
-                if (cmdparams[2].Contains(":"))
-                {
-                    // New format
-                    uint xloc, yloc;
-                    string mapName;
-                    try
-                    {
-                        xloc = Convert.ToUInt32(cmdparams[0]);
-                        yloc = Convert.ToUInt32(cmdparams[1]);
-                        mapName = cmdparams[2];
-                        if (cmdparams.Length > 3)
-                            for (int i = 3; i < cmdparams.Length; i++)
-                                mapName += " " + cmdparams[i];
-
-                        m_log.Info(">> MapName: " + mapName);
-                        //internalPort = Convert.ToUInt32(cmdparams[4]);
-                        //remotingPort = Convert.ToUInt32(cmdparams[5]);
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Warn("[HGrid] Wrong format for link-region command: " + e.Message);
-                        LinkRegionCmdUsage();
-                        return;
-                    }
-
-                    HGHyperlink.TryLinkRegionToCoords(scene, null, mapName, xloc, yloc);
-                }
-                else
-                {
-                    // old format
-                    RegionInfo regInfo;
-                    uint xloc, yloc;
-                    uint externalPort;
-                    string externalHostName;
-                    try
-                    {
-                        xloc = Convert.ToUInt32(cmdparams[0]);
-                        yloc = Convert.ToUInt32(cmdparams[1]);
-                        externalPort = Convert.ToUInt32(cmdparams[3]);
-                        externalHostName = cmdparams[2];
-                        //internalPort = Convert.ToUInt32(cmdparams[4]);
-                        //remotingPort = Convert.ToUInt32(cmdparams[5]);
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Warn("[HGrid] Wrong format for link-region command: " + e.Message);
-                        LinkRegionCmdUsage();
-                        return;
-                    }
-
-                    //if (TryCreateLink(xloc, yloc, externalPort, externalHostName, out regInfo))
-                    if (HGHyperlink.TryCreateLink(scene, null, xloc, yloc, "", externalPort, externalHostName, out regInfo))
-                    {
-                        if (cmdparams.Length >= 5)
-                        {
-                            regInfo.RegionName = "";
-                            for (int i = 4; i < cmdparams.Length; i++)
-                                regInfo.RegionName += cmdparams[i] + " ";
-                        }
-                    }
-                }
-                return;
-            }
-            else if (command.Equals("unlink-region"))
-            {
-                if (cmdparams.Length < 1)
-                {
-                    UnlinkRegionCmdUsage();
-                    return;
-                }
-                if (HGHyperlink.TryUnlinkRegion(scene, cmdparams[0]))
-                    m_log.InfoFormat("[HGrid]: Successfully unlinked {0}", cmdparams[0]);
-                else
-                    m_log.InfoFormat("[HGrid]: Unable to unlink {0}, region not found", cmdparams[0]);
-            }
-        }
-
-        private static void LoadXmlLinkFile(string[] cmdparams, Scene scene)
-        {
-            //use http://www.hgurl.com/hypergrid.xml for test
-            try
-            {
-                XmlReader r = XmlReader.Create(cmdparams[0]);
-                XmlConfigSource cs = new XmlConfigSource(r);
-                string[] excludeSections = null;
-
-                if (cmdparams.Length == 2)
-                {
-                    if (cmdparams[1].ToLower().StartsWith("excludelist:"))
-                    {
-                        string excludeString = cmdparams[1].ToLower();
-                        excludeString = excludeString.Remove(0, 12);
-                        char[] splitter = {';'};
-
-                        excludeSections = excludeString.Split(splitter);
-                    }
-                }
-
-                for (int i = 0; i < cs.Configs.Count; i++)
-                {
-                    bool skip = false;
-                    if ((excludeSections != null) && (excludeSections.Length > 0))
-                    {
-                        for (int n = 0; n < excludeSections.Length; n++)
-                        {
-                            if (excludeSections[n] == cs.Configs[i].Name.ToLower())
-                            {
-                                skip = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!skip)
-                    {
-                        ReadLinkFromConfig(cs.Configs[i], scene);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-            }
-        }
-
-
-        private static void ReadLinkFromConfig(IConfig config, Scene scene)
-        {
-            RegionInfo regInfo;
-            uint xloc, yloc;
-            uint externalPort;
-            string externalHostName;
-            uint realXLoc, realYLoc;
-
-            xloc = Convert.ToUInt32(config.GetString("xloc", "0"));
-            yloc = Convert.ToUInt32(config.GetString("yloc", "0"));
-            externalPort = Convert.ToUInt32(config.GetString("externalPort", "0"));
-            externalHostName = config.GetString("externalHostName", "");
-            realXLoc = Convert.ToUInt32(config.GetString("real-xloc", "0"));
-            realYLoc = Convert.ToUInt32(config.GetString("real-yloc", "0"));
-
-            if (m_enableAutoMapping)
-            {
-                xloc = (uint) ((xloc%100) + m_autoMappingX);
-                yloc = (uint) ((yloc%100) + m_autoMappingY);
-            }
-
-            if (((realXLoc == 0) && (realYLoc == 0)) ||
-                (((realXLoc - xloc < 3896) || (xloc - realXLoc < 3896)) &&
-                 ((realYLoc - yloc < 3896) || (yloc - realYLoc < 3896))))
-            {
-                if (
-                    HGHyperlink.TryCreateLink(scene, null, xloc, yloc, "", externalPort,
-                                              externalHostName, out regInfo))
-                {
-                    regInfo.RegionName = config.GetString("localName", "");
-                }
-            }
-        }
-
-
-        private static void LinkRegionCmdUsage()
-        {
-            m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>]");
-            m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]");
-            m_log.Info("Usage: link-region <URI_of_xml> [<exclude>]");
-        }
-
-        private static void UnlinkRegionCmdUsage()
-        {
-            m_log.Info("Usage: unlink-region <HostName>:<HttpPort>");
-            m_log.Info("Usage: unlink-region <LocalName>");
-        }
-
     }
 }
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index b23cdc3..4d8409bb 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -493,7 +493,7 @@ namespace OpenSim
         {
             if (cmd.Length < 4)
             {
-                m_log.Error("Usage: create region <region name> <region_file.xml>");
+                m_log.Error("Usage: create region <region name> <region_file.ini>");
                 return;
             }
             if (cmd[3].EndsWith(".xml"))
@@ -520,7 +520,7 @@ namespace OpenSim
             }
             else
             {
-                m_log.Error("Usage: create region <region name> <region_file.xml>");
+                m_log.Error("Usage: create region <region name> <region_file.ini>");
                 return;
             }
         }
@@ -553,7 +553,7 @@ namespace OpenSim
         /// <param name="cmd"></param>
         private void HandleLoginStatus(string module, string[] cmd)
         {
-            if (m_commsManager.GridService.RegionLoginsEnabled == false)
+            if (m_sceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled == false)
 
                 m_log.Info("[ Login ]  Login are disabled ");
             else
@@ -1230,20 +1230,20 @@ namespace OpenSim
         protected void LoadOar(string module, string[] cmdparams)
         {
             try
-            {            
+            {
                 if (cmdparams.Length > 2)
                 {
-                    m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);             
+                    m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
                 }
                 else
                 {
-                    m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);              
+                    m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
                 }
             }
             catch (Exception e)
             {
                 m_log.Error(e.Message);
-            }   
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 7bc0b77..468c5d7 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -98,7 +98,7 @@ namespace OpenSim
 
         /// <value>
         /// The config information passed into the OpenSimulator region server.
-        /// </value>        
+        /// </value>
         public OpenSimConfigSource ConfigSource
         {
             get { return m_config; }
@@ -209,9 +209,9 @@ namespace OpenSim
             }
 
             // Only enable logins to the regions once we have completely finished starting up (apart from scripts)
-            if ((m_commsManager != null) && (m_commsManager.GridService != null))
+            if ((SceneManager.CurrentOrFirstScene != null) && (SceneManager.CurrentOrFirstScene.SceneGridService != null))
             {
-                m_commsManager.GridService.RegionLoginsEnabled = true;
+                SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = true;
             }
 
             AddPluginCommands();
@@ -299,12 +299,12 @@ namespace OpenSim
             if (LoginEnabled)
             {
                 m_log.Info("[LOGIN]: Login is now enabled.");
-                m_commsManager.GridService.RegionLoginsEnabled = true;
+                SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = true;
             }
             else
             {
                 m_log.Info("[LOGIN]: Login is now disabled.");
-                m_commsManager.GridService.RegionLoginsEnabled = false;
+                SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = false;
             }
         }
 
@@ -383,14 +383,14 @@ namespace OpenSim
 
             scene.SetModuleInterfaces();
 
-            // Prims have to be loaded after module configuration since some modules may be invoked during the load            
+            // Prims have to be loaded after module configuration since some modules may be invoked during the load
             scene.LoadPrimsFromStorage(regionInfo.originRegionID);
             
             // moved these here as the terrain texture has to be created after the modules are initialized
             // and has to happen before the region is registered with the grid.
             scene.CreateTerrainTexture(false);
             
-            // TODO : Try setting resource for region xstats here on scene            
+            // TODO : Try setting resource for region xstats here on scene
             MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 
             
             try
@@ -399,7 +399,7 @@ namespace OpenSim
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e);
+                m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace);
 
                 // Carrying on now causes a lot of confusion down the
                 // line - we need to get the user's attention
@@ -507,7 +507,7 @@ namespace OpenSim
         /// Remove a region from the simulator without deleting it permanently.
         /// </summary>
         /// <param name="scene"></param>
-        /// <returns></returns>   
+        /// <returns></returns>
         public void CloseRegion(Scene scene)
         {
             // only need to check this if we are not at the
@@ -526,7 +526,7 @@ namespace OpenSim
         /// Remove a region from the simulator without deleting it permanently.
         /// </summary>
         /// <param name="name"></param>
-        /// <returns></returns>   
+        /// <returns></returns>
         public void CloseRegion(string name)
         {
             Scene target;
@@ -539,7 +539,7 @@ namespace OpenSim
         /// </summary>
         /// <param name="regionInfo"></param>
         /// <param name="clientServer"> </param>
-        /// <returns></returns>        
+        /// <returns></returns>
         protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer)
         {
             return SetupScene(regionInfo, 0, null, out clientServer);
@@ -750,7 +750,7 @@ namespace OpenSim
             }
 
             public string Path
-            {   
+            {
                 // This is for the OpenSimulator instance and is the osSecret hashed
                 get { return "/" + osXStatsURI + "/"; }
             }
@@ -791,7 +791,7 @@ namespace OpenSim
             }
 
             public string Path
-            {   
+            {
                 // This is for the OpenSimulator instance and is the user provided URI 
                 get { return "/" + osUXStatsURI + "/"; }
             }
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index 5667d64..84ea0b3 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -87,9 +87,9 @@ namespace OpenSim.Region.ClientStack
         public IClientNetworkServer CreateServer(
             IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port,
             AgentCircuitManager authenticateClass)
-        {    
+        {
             return CreateServer(
-                _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, authenticateClass);                                               
+                _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, authenticateClass);
         }
 
         /// <summary>
@@ -104,11 +104,11 @@ namespace OpenSim.Region.ClientStack
         /// </param>
         /// <param name="assetCache"></param>
         /// <param name="authenticateClass"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public IClientNetworkServer CreateServer(
             IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource,
             AgentCircuitManager authenticateClass)
-        {            
+        {
             if (plugin != null)
             {
                 IClientNetworkServer server =
diff --git a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
index a3c23cc..231b3aa 100644
--- a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
+++ b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Region.ClientStack
     /// 
     /// At the moment this is very incomplete - other tweakable settings could be added.  This is also somewhat LL client
     /// oriented right now.
-    /// </summary>    
+    /// </summary>
     public class ClientStackUserSettings
     {
         /// <summary>
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f05c490..d8bd36d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1637,6 +1637,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
             enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
             enablesimpacket.SimulatorInfo.Port = neighbourPort;
+
+            enablesimpacket.Header.Reliable = true; // ESP's should be reliable.
+
             OutPacket(enablesimpacket, ThrottleOutPacketType.Task);
         }
 
@@ -2302,7 +2305,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return itemBlock;
         }
         
-        public void SendBulkUpdateInventory(InventoryNodeBase node)        
+        public void SendBulkUpdateInventory(InventoryNodeBase node)
         {
             if (node is InventoryItemBase)
                 SendBulkUpdateInventoryItem((InventoryItemBase)node);
@@ -2907,7 +2910,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 else if (m_avatarTerseUpdates.Count == 1)
                 {
                     lock (m_avatarTerseUpdateTimer)
-                        m_avatarTerseUpdateTimer.Start();                
+                        m_avatarTerseUpdateTimer.Start();
                 }
             }
         }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 8484846..ff739c5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             TextureThrottle = new LLPacketThrottle(1000, throttleMaxBPS / 2, 4000, userSettings.ClientThrottleMultipler);
 
 
-            // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second.           
+            // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second.
 
 
             ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings;
@@ -419,7 +419,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue();
 
-                        SendQueue.Enqueue(qpack);                        
+                        SendQueue.Enqueue(qpack);
                         TotalThrottle.AddBytes(qpack.Length);
                         ResendThrottle.AddBytes(qpack.Length);
                         
@@ -491,7 +491,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue();
 
-                        SendQueue.Enqueue(qpack);                       
+                        SendQueue.Enqueue(qpack);
                         TotalThrottle.AddBytes(qpack.Length);
                         TextureThrottle.AddBytes(qpack.Length);
                         qchanged = true;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index 56219d1..70d94e7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -48,11 +48,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>
         /// Tweakable user settings
         /// </summary>
-        private ClientStackUserSettings m_userSettings;        
+        private ClientStackUserSettings m_userSettings;
 
         public LLPacketServer(ILLClientStackNetworkHandler networkHandler, ClientStackUserSettings userSettings)
         {
-            m_userSettings = userSettings;            
+            m_userSettings = userSettings;
             m_networkHandler = networkHandler;
             
             m_networkHandler.RegisterPacketServer(this);
@@ -114,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             sessionInfo = circuitManager.AuthenticateSession(sessionId, agentId, circuitCode); 
 
             if (!sessionInfo.Authorised)
-                return false;  
+                return false;
             
             return true;
         }
@@ -129,7 +129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="proxyEP"></param>
         /// <returns>
         /// true if a new circuit was created, false if a circuit with the given circuit code already existed
-        /// </returns>        
+        /// </returns>
         public virtual bool AddNewClient(
             EndPoint epSender, UseCircuitCodePacket useCircuit, 
             AuthenticateResponse sessionInfo, EndPoint proxyEP)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
index 01bff6d..52effc5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
@@ -26,7 +26,7 @@
  */
 
 namespace OpenSim.Region.ClientStack.LindenUDP
-{    
+{
     public class LLPacketThrottle
     {
         private readonly int m_maxAllowableThrottle;
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public int Min
         {
             get { return m_minAllowableThrottle; }
-        }  
+        }
         
         public int Current
         {
@@ -105,13 +105,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public int Throttle
         {
-            get { return m_currentThrottle; }            
+            get { return m_currentThrottle; }
             set
             {
                 if (value < m_minAllowableThrottle)
                 {
                     m_currentThrottle = m_minAllowableThrottle;
-                }                
+                }
                 else if (value > m_maxAllowableThrottle)
                 {
                     m_currentThrottle = m_maxAllowableThrottle;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 9ee8df5..c779b08 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     userSettings.ClientThrottleMultipler = config.GetFloat("client_throttle_multiplier");
                 if (config.Contains("client_socket_rcvbuf_size"))
                     m_clientSocketReceiveBuffer = config.GetInt("client_socket_rcvbuf_size");
-            }   
+            }
             
             m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler);
             m_log.DebugFormat("[CLIENT]: client_socket_rcvbuf_size  = {0}", (m_clientSocketReceiveBuffer != 0 ? 
@@ -228,7 +228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         m_log.Debug("[CLIENT]: " + e);
                     }
-                }    
+                }
             
             
                 if (proxyPortOffset != 0)
@@ -254,7 +254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (packet != null)
             {
                 if (packet.Type == PacketType.UseCircuitCode)
-                    AddNewClient((UseCircuitCodePacket)packet, epSender, epProxy);                                  
+                    AddNewClient((UseCircuitCodePacket)packet, epSender, epProxy);
                 else
                     ProcessInPacket(packet, epSender);
             }
@@ -290,7 +290,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             catch (Exception e)
             {
                 m_log.Error("[CLIENT]: Exception in processing packet - ignoring: ", e);
-            }           
+            }
         }
         
         /// <summary>
@@ -299,7 +299,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected virtual void BeginReceive()
         {
             m_socket.BeginReceiveFrom(
-                RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref reusedEpSender, ReceivedData, null);            
+                RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref reusedEpSender, ReceivedData, null);
         }
 
         /// <summary>
@@ -322,7 +322,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // ENDLESS LOOP ON PURPOSE!
                     // Reset connection and get next UDP packet off the buffer
                     // If the UDP packet is part of the same stream, this will happen several hundreds of times before
-                    // the next set of UDP data is for a valid client.         
+                    // the next set of UDP data is for a valid client.
 
                     try
                     {
@@ -347,7 +347,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     m_log.ErrorFormat("[CLIENT]: Exception thrown during BeginReceive(): {0}", ex);
                 }
             }
-        }       
+        }
 
         /// <summary>
         /// Close a client circuit.  This is done in response to an exception on receive, and should not be called
@@ -363,12 +363,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     m_packetServer.CloseCircuit(circuit);
                     
-                    if (e != null)                    
+                    if (e != null)
                         m_log.ErrorFormat(
-                            "[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, reusedEpSender, e);                                    
+                            "[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, reusedEpSender, e);
                 }
             }
-        }       
+        }
         
         /// <summary>
         /// Finish the process of asynchronously receiving the next bit of raw data
@@ -410,7 +410,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 m_log.DebugFormat("[CLIENT]: ObjectDisposedException: Object {0} disposed.", e.ObjectName);
                 // Uhh, what object, and why? this needs better handling.
-            }      
+            }
             
             return hasReceivedOkay;
         }
@@ -422,10 +422,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="epSender"></param>
         /// <param name="epProxy"></param>
         protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy)
-        {            
+        {
             //Slave regions don't accept new clients
             if (m_localScene.RegionStatus != RegionStatus.SlaveScene)
-            {                
+            {
                 AuthenticateResponse sessionInfo;
                 bool isNewCircuit = false;
                 
@@ -441,8 +441,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 lock (clientCircuits)
                 {
                     if (!clientCircuits.ContainsKey(epSender))
-                    {                        
-                        clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);                        
+                    {
+                        clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
                         isNewCircuit = true;
                     }
                 }
@@ -461,9 +461,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                     
                     //m_log.DebugFormat(
                     //    "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", 
-                    //    useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);                    
-                }                
-            }            
+                    //    useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
+                }
+            }
             
             // Ack the UseCircuitCode packet
             PacketAckPacket ack_it = (PacketAckPacket)PacketPool.Instance.GetPacket(PacketType.PacketAck);
@@ -605,7 +605,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
                 
                 return;
-            }               
+            }
 
             lock (clientCircuits)
             {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
index f2a8bd2..c45d11f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
@@ -28,7 +28,7 @@
 using OpenMetaverse;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
-{        
+{
     public class LLUtil
     {
         /// <summary>
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 9fb1041..daab84f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             catch
             {
                 // I don't care, just leave log4net off
-            }            
+            }
         }
         
         /// <summary>
@@ -63,20 +63,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         /// <param name="scene"></param>
         /// <param name="testLLUDPServer"></param>
         /// <param name="testPacketServer"></param>
-        /// <param name="acm">Agent circuit manager used in setting up the stack</param>        
+        /// <param name="acm">Agent circuit manager used in setting up the stack</param>
         protected void SetupStack(
             IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, 
             out AgentCircuitManager acm)
         {
             IConfigSource configSource = new IniConfigSource();
             ClientStackUserSettings userSettings = new ClientStackUserSettings();
-            testLLUDPServer = new TestLLUDPServer();             
+            testLLUDPServer = new TestLLUDPServer();
             acm = new AgentCircuitManager();
                                     
-            uint port = 666;            
+            uint port = 666;
             testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm);
             testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings);
-            testLLUDPServer.LocalScene = scene;            
+            testLLUDPServer.LocalScene = scene;
         }
         
         /// <summary>
@@ -124,7 +124,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 
             acm.AddNewCircuit(circuitCode, acd);
             
-            testLLUDPServer.LoadReceive(uccp, epSender);            
+            testLLUDPServer.LoadReceive(uccp, epSender);
             testLLUDPServer.ReceiveData(null);
         }
         
@@ -142,15 +142,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb };
             onp.Header.Zerocoded = false;
             
-            return onp;            
+            return onp;
         }
         
         /// <summary>
         /// Test adding a client to the stack
         /// </summary>
-        [Test, LongRunning]        
+        [Test, LongRunning]
         public void TestAddClient()
-        {            
+        {
             TestHelper.InMethod();
 
             uint myCircuitCode = 123456;
@@ -177,7 +177,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             
             EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 999);
             
-            testLLUDPServer.LoadReceive(uccp, testEp);            
+            testLLUDPServer.LoadReceive(uccp, testEp);
             testLLUDPServer.ReceiveData(null);
             
             // Circuit shouildn't exist since the circuit manager doesn't know about this circuit for authentication yet
@@ -185,8 +185,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                         
             acm.AddNewCircuit(myCircuitCode, acd);
             
-            testLLUDPServer.LoadReceive(uccp, testEp);            
-            testLLUDPServer.ReceiveData(null);            
+            testLLUDPServer.LoadReceive(uccp, testEp);
+            testLLUDPServer.ReceiveData(null);
             
             // Should succeed now
             Assert.IsTrue(testLLUDPServer.HasCircuit(myCircuitCode));
@@ -196,24 +196,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         /// <summary>
         /// Test removing a client from the stack
         /// </summary>
-        [Test]        
+        [Test]
         public void TestRemoveClient()
         {
             TestHelper.InMethod();
 
-            uint myCircuitCode = 123457;     
+            uint myCircuitCode = 123457;
             
             TestLLUDPServer testLLUDPServer;
             TestLLPacketServer testLLPacketServer;
             AgentCircuitManager acm;
-            SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm);            
+            SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm);
             AddClient(myCircuitCode, new IPEndPoint(IPAddress.Loopback, 1000), testLLUDPServer, acm);
             
-            testLLUDPServer.RemoveClientCircuit(myCircuitCode);            
+            testLLUDPServer.RemoveClientCircuit(myCircuitCode);
             Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode));
             
             // Check that removing a non-existant circuit doesn't have any bad effects
-            testLLUDPServer.RemoveClientCircuit(101);            
+            testLLUDPServer.RemoveClientCircuit(101);
             Assert.IsFalse(testLLUDPServer.HasCircuit(101));
         }
         
@@ -232,8 +232,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             TestLLUDPServer testLLUDPServer;
             TestLLPacketServer testLLPacketServer;
             AgentCircuitManager acm;
-            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);            
-            AddClient(myCircuitCode, testEp, testLLUDPServer, acm);  
+            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
+            AddClient(myCircuitCode, testEp, testLLUDPServer, acm);
 
             byte[] data = new byte[] { 0x01, 0x02, 0x03, 0x04 };
 
@@ -252,7 +252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp);
             testLLUDPServer.ReceiveData(null);
             
-            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1));  
+            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1));
             Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1));
         }
         
@@ -270,17 +270,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             uint circuitCodeA = 130000;
             EndPoint epA = new IPEndPoint(IPAddress.Loopback, 1300);
             UUID agentIdA   = UUID.Parse("00000000-0000-0000-0000-000000001300");
-            UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300");   
+            UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300");
             
             uint circuitCodeB = 130001;
             EndPoint epB = new IPEndPoint(IPAddress.Loopback, 1301);
             UUID agentIdB   = UUID.Parse("00000000-0000-0000-0000-000000001301");
-            UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301");            
+            UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301");
             
             TestLLUDPServer testLLUDPServer;
             TestLLPacketServer testLLPacketServer;
             AgentCircuitManager acm;
-            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);            
+            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
             AddClient(circuitCodeA, epA, agentIdA, sessionIdA, testLLUDPServer, acm);
             AddClient(circuitCodeB, epB, agentIdB, sessionIdB, testLLUDPServer, acm);
             
@@ -292,8 +292,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             
             Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA));
          
-            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));  
-            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));            
-        }        
+            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));
+            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));
+        }
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
index c831f68..34c21aa 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
@@ -28,6 +28,7 @@
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
@@ -58,7 +59,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         
         public override void RemoveClient(UUID agentID) {}
         public override void CloseAllAgents(uint circuitcode) {}
-        public override bool OtherRegionUp(RegionInfo thisRegion) { return false; }
+        public override void OtherRegionUp(GridRegion otherRegion) {  }
             
         /// <summary>
         /// Doesn't really matter what the call is - we're using this to test that a packet has actually been received
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
index 8b11ccc..cde155b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         [Test]
         /// <summary>
         /// More a placeholder, really
-        /// </summary>        
+        /// </summary>
         public void InPacketTest()
         {
             TestHelper.InMethod();
@@ -87,20 +87,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         /// <param name="scene"></param>
         /// <param name="testLLUDPServer"></param>
         /// <param name="testPacketServer"></param>
-        /// <param name="acm">Agent circuit manager used in setting up the stack</param>        
+        /// <param name="acm">Agent circuit manager used in setting up the stack</param>
         protected void SetupStack(
             IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, 
             out AgentCircuitManager acm)
         {
             IConfigSource configSource = new IniConfigSource();
             ClientStackUserSettings userSettings = new ClientStackUserSettings();
-            testLLUDPServer = new TestLLUDPServer();             
+            testLLUDPServer = new TestLLUDPServer();
             acm = new AgentCircuitManager();
                                     
-            uint port = 666;            
+            uint port = 666;
             testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm);
             testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings);
-            testLLUDPServer.LocalScene = scene;            
-        }        
+            testLLUDPServer.LocalScene = scene;
+        }
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
index d055969..1fba847 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
@@ -31,7 +31,7 @@ using OpenMetaverse.Packets;
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 { 
     public class TestLLPacketServer : LLPacketServer
-    {        
+    {
         /// <summary>
         /// Record counts of packets received
         /// </summary>
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                 m_packetsReceived[packet.Type]++;
             else
                 m_packetsReceived[packet.Type] = 1;
-        }    
+        }
         
         public int GetTotalPacketsReceived()
         {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index 1dffefb..f98586d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             ChunkSenderTuple tuple = m_chunksToLoad.Dequeue();
             RecvBuffer = tuple.Data;
             numBytes   = tuple.Data.Length;
-            epSender   = tuple.Sender;                       
+            epSender   = tuple.Sender;
             
             return true;
         }
@@ -114,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         {
             while (m_chunksToLoad.Count > 0)
                 OnReceivedData(result);
-        }                
+        }
         
         /// <summary>
         /// Has a circuit with the given code been established?
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
     /// Record the data and sender tuple
     /// </summary>
     public class ChunkSenderTuple
-    {        
+    {
         public byte[] Data;
         public EndPoint Sender;
         public bool BeginReceiveException;
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index a266a40..c7aeca14 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ClientStack
             get { return m_commsManager; }
             set { m_commsManager = value; }
         }
-        protected CommunicationsManager m_commsManager;        
+        protected CommunicationsManager m_commsManager;
 
         protected StorageManager m_storageManager;
         
@@ -80,15 +80,15 @@ namespace OpenSim.Region.ClientStack
         /// </summary>
         /// 
         /// <param name="osSceneIdentifier">
-        /// The name of the OpenSim scene this physics scene is serving.  This will be used in log messages.  
+        /// The name of the OpenSim scene this physics scene is serving.  This will be used in log messages.
         /// </param>
-        /// <returns></returns>        
+        /// <returns></returns>
         protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier);
         
         protected abstract StorageManager CreateStorageManager();
         protected abstract ClientStackManager CreateClientStackManager();
         protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
-                                             AgentCircuitManager circuitManager);        
+                                             AgentCircuitManager circuitManager);
 
         protected override void StartupSpecific()
         {
@@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack
         /// <param name="meshEngine">The name of the mesh engine to use</param>
         /// <param name="config">The configuration data to pass to the physics and mesh engines</param>
         /// <param name="osSceneIdentifier">
-        /// The name of the OpenSim scene this physics scene is serving.  This will be used in log messages.  
+        /// The name of the OpenSim scene this physics scene is serving.  This will be used in log messages.
         /// </param>
         /// <returns></returns>
         protected PhysicsScene GetPhysicsScene(
diff --git a/OpenSim/Region/ClientStack/ThrottleSettings.cs b/OpenSim/Region/ClientStack/ThrottleSettings.cs
index 5dcb706..fe4718c 100644
--- a/OpenSim/Region/ClientStack/ThrottleSettings.cs
+++ b/OpenSim/Region/ClientStack/ThrottleSettings.cs
@@ -26,12 +26,12 @@
  */
 
 namespace OpenSim.Region.ClientStack
-{    
+{
     /// <summary>
     /// Represent throttle settings for a client stack.  These settings are in bytes per second
     /// </summary> 
     public class ThrottleSettings
-    {        
+    {
         /// <summary>
         /// Minimum bytes per second that the throttle can be set to.
         /// </summary>
@@ -39,13 +39,13 @@ namespace OpenSim.Region.ClientStack
         
         /// <summary>
         /// Maximum bytes per second that the throttle can be set to.
-        /// </summary>        
-        public int Max;  
+        /// </summary>
+        public int Max;
         
         /// <summary>
         /// Current bytes per second that the throttle should be set to.
-        /// </summary>        
-        public int Current;    
+        /// </summary>
+        public int Current;
               
         public ThrottleSettings(int min, int max, int current)
         {
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 80f2e79..e80f6ab 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -40,30 +40,21 @@ namespace OpenSim.Region.Communications.Hypergrid
 {
     public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1
     {
-        IHyperlink m_osw = null;
-        public IHyperlink HGServices
-        {
-            get { return m_osw; }
-        }
 
         public HGCommunicationsGridMode(
             NetworkServersInfo serversInfo,
             SceneManager sman, LibraryRootFolder libraryRootFolder)
             : base(serversInfo, libraryRootFolder)
         {
-            // From constructor at CommunicationsOGS1
-            HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, sman, m_userProfileCacheService);
-            m_gridService = gridInterComms;
-            m_osw = gridInterComms;
 
             HGUserServices userServices = new HGUserServices(this);
             // This plugin arrangement could eventually be configurable rather than hardcoded here.
             userServices.AddPlugin(new TemporaryUserProfilePlugin());
-            userServices.AddPlugin(new HGUserDataPlugin(this, userServices));            
+            userServices.AddPlugin(new HGUserDataPlugin(this, userServices));
             
             m_userService = userServices;
             m_messageService = userServices;
-            m_avatarService = userServices;           
+            m_avatarService = userServices;
         }
     }
 }
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index e4e12d4..4e3f5a1 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -41,14 +41,13 @@ namespace OpenSim.Region.Communications.Hypergrid
     public class HGCommunicationsStandalone : CommunicationsManager
     {
         public HGCommunicationsStandalone(
-            ConfigSettings configSettings,                          
+            ConfigSettings configSettings,
             NetworkServersInfo serversInfo,
             BaseHttpServer httpServer,
-            HGGridServices gridService, 
             LibraryRootFolder libraryRootFolder, 
             bool dumpAssetsToFile)
             : base(serversInfo, libraryRootFolder)
-        {           
+        {
             LocalUserServices localUserService =
                 new LocalUserServices(
                     serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
@@ -59,13 +58,11 @@ namespace OpenSim.Region.Communications.Hypergrid
             hgUserService.AddPlugin(new TemporaryUserProfilePlugin());
             hgUserService.AddPlugin(new HGUserDataPlugin(this, hgUserService));
             
-            m_userService = hgUserService;            
-            m_userAdminService = hgUserService;            
+            m_userService = hgUserService;
+            m_userAdminService = hgUserService;
             m_avatarService = hgUserService;
             m_messageService = hgUserService;
             
-            gridService.UserProfileCache = m_userProfileCacheService;
-            m_gridService = gridService;                        
         }
     }
 }
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
deleted file mode 100644
index 54cde0f..0000000
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ /dev/null
@@ -1,1024 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Runtime.Remoting;
-using System.Security.Authentication;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Communications.OGS1;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-// using OpenSim.Region.Environment.Modules.Framework;
-
-namespace OpenSim.Region.Communications.Hypergrid
-{
-    /// <summary>
-    /// This class encapsulates the main hypergrid functions related to creating and managing
-    /// hyperlinks, as well as processing all the inter-region comms between a region and
-    /// an hyperlinked region.
-    /// </summary>
-    public class HGGridServices : IGridServices, IHyperlink
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-
-        public BaseHttpServer httpListener;
-        public NetworkServersInfo serversInfo;
-
-        protected List<RegionInfo> m_regionsOnInstance = new List<RegionInfo>();
-
-        // Hyperlink regions are hyperlinks on the map
-        protected List<RegionInfo> m_hyperlinkRegions = new List<RegionInfo>();
-
-        // Known regions are home regions of visiting foreign users.
-        // They are not on the map as static hyperlinks. They are dynamic hyperlinks, they go away when
-        // the visitor goes away. They are mapped to X=0 on the map.
-        // This is key-ed on agent ID
-        protected Dictionary<UUID, RegionInfo> m_knownRegions = new Dictionary<UUID, RegionInfo>();
-
-        protected UserProfileCacheService m_userProfileCache;
-        protected SceneManager m_sceneman;
-
-        private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
-
-        public virtual string gdebugRegionName
-        {
-            get { return "Override me"; }
-            set { ; }
-        }
-
-        public string rdebugRegionName
-        {
-            get { return _rdebugRegionName; }
-            set { _rdebugRegionName = value; }
-        }
-        private string _rdebugRegionName = String.Empty;
-
-        public virtual bool RegionLoginsEnabled
-        {
-            get { return true; }
-            set { ; }
-        }
-
-        public UserProfileCacheService UserProfileCache
-        {
-            set { m_userProfileCache = value; }
-        }
-
-        private Random random;
-
-        /// <summary>
-        /// Contructor.  Adds "expect_hg_user" and "check" xmlrpc method handlers
-        /// </summary>
-        /// <param name="servers_info"></param>
-        public HGGridServices(NetworkServersInfo servers_info, SceneManager sman)
-        {
-            serversInfo = servers_info;
-            m_sceneman = sman;
-
-            random = new Random();
-
-            MainServer.Instance.AddXmlRPCHandler("link_region", LinkRegionRequest);
-            MainServer.Instance.AddXmlRPCHandler("expect_hg_user", ExpectHGUser);
-
-            HGNetworkServersInfo.Init(servers_info.AssetURL, servers_info.InventoryURL, servers_info.UserURL);
-        }
-
-        // see IGridServices
-        public virtual RegionCommsListener RegisterRegion(RegionInfo regionInfo)
-        {
-            // Region doesn't exist here. Trying to link remote region
-
-            m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort);
-            regionInfo.RegionID = LinkRegion(regionInfo); // UUID.Random();
-            if (!regionInfo.RegionID.Equals(UUID.Zero))
-            {
-                m_hyperlinkRegions.Add(regionInfo);
-                m_log.Info("[HGrid]: Successfully linked to region_uuid " + regionInfo.RegionID);
-
-                //Try get the map image
-                GetMapImage(regionInfo);
-            }
-            else
-            {
-                m_log.Info("[HGrid]: No such region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "(" + regionInfo.InternalEndPoint.Port + ")");
-            }
-            // Note that these remote regions aren't registered in localBackend, so return null, no local listeners
-            return null;
-        }
-
-        // see IGridServices
-        public virtual bool DeregisterRegion(RegionInfo regionInfo)
-        {
-            if (m_hyperlinkRegions.Contains(regionInfo))
-            {
-                m_hyperlinkRegions.Remove(regionInfo);
-                return true;
-            }
-            foreach (KeyValuePair<UUID, RegionInfo> kvp in m_knownRegions)
-            {
-                if (kvp.Value == regionInfo)
-                {
-                    m_knownRegions.Remove(kvp.Key);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public virtual Dictionary<string, string> GetGridSettings()
-        {
-            Dictionary<string, string> returnGridSettings = new Dictionary<string, string>();
-            lock (m_queuedGridSettings)
-            {
-                foreach (string Dictkey in m_queuedGridSettings.Keys)
-                {
-                    returnGridSettings.Add(Dictkey, m_queuedGridSettings[Dictkey]);
-                }
-
-                m_queuedGridSettings.Clear();
-            }
-
-            return returnGridSettings;
-        }
-
-        // see IGridServices
-        public virtual List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
-        {
-            List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
-            foreach (RegionInfo reg in m_hyperlinkRegions)
-            {
-                if (reg.RegionLocX != x || reg.RegionLocY != y)
-                {
-                    //m_log.Debug("CommsManager- RequestNeighbours() - found a different region in list, checking location");
-                    if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2)))
-                    {
-                        if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2)))
-                        {
-                            neighbours.Add(reg);
-                        }
-                    }
-                }
-            }
-
-            return neighbours;
-        }
-
-        /// <summary>
-        /// Request information about a region.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns>
-        /// null on a failure to contact or get a response from the grid server
-        /// FIXME: Might be nicer to return a proper exception here since we could inform the client more about the
-        /// nature of the faiulre.
-        /// </returns>
-        public virtual RegionInfo RequestNeighbourInfo(UUID Region_UUID)
-        {
-            foreach (RegionInfo info in m_hyperlinkRegions)
-            {
-                if (info.RegionID == Region_UUID) return info;
-            }
-
-            // I don't trust region uuids to be unique...
-            //foreach (RegionInfo info in m_knownRegions.Values)
-            //{
-            //    if (info.RegionID == Region_UUID) return info;
-            //}
-
-            return null;
-        }
-
-        /// <summary>
-        /// Request information about a region.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public virtual RegionInfo RequestNeighbourInfo(ulong regionHandle)
-        {
-            //m_log.Debug(" >> RequestNeighbourInfo for " + regionHandle);
-            foreach (RegionInfo info in m_hyperlinkRegions)
-            {
-                //m_log.Debug("    .. " + info.RegionHandle);
-                if (info.RegionHandle == regionHandle) return info;
-            }
-
-            foreach (RegionInfo info in m_knownRegions.Values)
-            {
-                if (info.RegionHandle == regionHandle)
-                {
-                    //m_log.Debug("XXX------ known region " + info.RegionHandle);
-                    return info;
-                }
-            }
-
-            return null;
-        }
-
-        public virtual RegionInfo RequestNeighbourInfo(string name)
-        {
-            foreach (RegionInfo info in m_hyperlinkRegions)
-            {
-                //m_log.Debug("    .. " + info.RegionHandle);
-                if (info.RegionName == name) return info;
-            }
-
-            foreach (RegionInfo info in m_knownRegions.Values)
-            {
-                if (info.RegionName == name)
-                {
-                    //m_log.Debug("XXX------ known region " + info.RegionHandle);
-                    return info;
-                }
-            }
-
-            return null;
-        }
-
-        public virtual RegionInfo RequestNeighbourInfo(string hostName, uint port)
-        {
-            foreach (RegionInfo info in m_hyperlinkRegions)
-            {
-                //m_log.Debug("    .. " + info.RegionHandle);
-                if ((info.ExternalHostName == hostName) && (info.HttpPort == port))
-                    return info;
-            }
-
-            foreach (RegionInfo info in m_knownRegions.Values)
-            {
-                if ((info.ExternalHostName == hostName) && (info.HttpPort == port))
-                {
-                    //m_log.Debug("XXX------ known region " + info.RegionHandle);
-                    return info;
-                }
-            }
-
-            return null;
-        }
-
-        public virtual RegionInfo RequestClosestRegion(string regionName)
-        {
-            foreach (RegionInfo info in m_hyperlinkRegions)
-            {
-                if (info.RegionName == regionName) return info;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="minX"></param>
-        /// <param name="minY"></param>
-        /// <param name="maxX"></param>
-        /// <param name="maxY"></param>
-        /// <returns></returns>
-        public virtual List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            List<MapBlockData> neighbours = new List<MapBlockData>();
-
-            foreach (RegionInfo regInfo in m_hyperlinkRegions)
-            {
-                if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) &&
-                    ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
-                {
-                    MapBlockData map = new MapBlockData();
-                    map.Name = regInfo.RegionName;
-                    map.X = (ushort)regInfo.RegionLocX;
-                    map.Y = (ushort)regInfo.RegionLocY;
-                    map.WaterHeight = (byte)regInfo.RegionSettings.WaterHeight;
-                    map.MapImageId = regInfo.RegionSettings.TerrainImageID;
-                    //                    m_log.Debug("ImgID: " + map.MapImageId);
-                    map.Agents = 1;
-                    map.RegionFlags = 72458694;
-                    map.Access = regInfo.AccessLevel;
-                    neighbours.Add(map);
-                }
-            }
-
-            return neighbours;
-        }
-
-
-        protected virtual void GetMapImage(RegionInfo info)
-        {
-            try
-            {
-                string regionimage = "regionImage" + info.RegionID.ToString();
-                regionimage = regionimage.Replace("-", "");
-
-                WebClient c = new WebClient();
-                string uri = "http://" + info.ExternalHostName + ":" + info.HttpPort + "/index.php?method=" + regionimage;
-                //m_log.Debug("JPEG: " + uri);
-                c.DownloadFile(uri, info.RegionID.ToString() + ".jpg");
-                Bitmap m = new Bitmap(info.RegionID.ToString() + ".jpg");
-                //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
-                byte[] imageData = OpenJPEG.EncodeFromImage(m, true);
-                AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString());
-                info.RegionSettings.TerrainImageID = ass.FullID;
-                ass.Type = (int)AssetType.Texture;
-                ass.Temporary = false;
-                ass.Local = true;
-                ass.Data = imageData;
-                
-                m_sceneman.CurrentOrFirstScene.AssetService.Store(ass);
-
-            }
-            catch // LEGIT: Catching problems caused by OpenJPEG p/invoke
-            {
-                m_log.Warn("[HGrid]: Failed getting/storing map image, because it is probably already in the cache");
-            }
-        }
-
-        // A little ugly, since this code is exactly the same as OSG1's, and we're already
-        // calling that for when the region in in grid mode... (for the grid regions)
-        //
-        public virtual LandData RequestLandData (ulong regionHandle, uint x, uint y)
-        {
-            m_log.DebugFormat("[HGrid]: requests land data in {0}, at {1}, {2}",
-                              regionHandle, x, y);
-
-            // Remote region
-
-            Hashtable hash = new Hashtable();
-            hash["region_handle"] = regionHandle.ToString();
-            hash["x"] = x.ToString();
-            hash["y"] = y.ToString();
-
-            IList paramList = new ArrayList();
-            paramList.Add(hash);
-            LandData landData = null;
-
-            try
-            {
-                RegionInfo info = RequestNeighbourInfo(regionHandle);
-                if (info != null) // just to be sure
-                {
-                    XmlRpcRequest request = new XmlRpcRequest("land_data", paramList);
-                    string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
-                    XmlRpcResponse response = request.Send(uri, 10000);
-                    if (response.IsFault)
-                    {
-                        m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString);
-                    }
-                    else
-                    {
-                        hash = (Hashtable)response.Value;
-                        try
-                        {
-                            landData = new LandData();
-                            landData.AABBMax = Vector3.Parse((string)hash["AABBMax"]);
-                            landData.AABBMin = Vector3.Parse((string)hash["AABBMin"]);
-                            landData.Area = Convert.ToInt32(hash["Area"]);
-                            landData.AuctionID = Convert.ToUInt32(hash["AuctionID"]);
-                            landData.Description = (string)hash["Description"];
-                            landData.Flags = Convert.ToUInt32(hash["Flags"]);
-                            landData.GlobalID = new UUID((string)hash["GlobalID"]);
-                            landData.Name = (string)hash["Name"];
-                            landData.OwnerID = new UUID((string)hash["OwnerID"]);
-                            landData.SalePrice = Convert.ToInt32(hash["SalePrice"]);
-                            landData.SnapshotID = new UUID((string)hash["SnapshotID"]);
-                            landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]);
-                            m_log.DebugFormat("[HGrid]: Got land data for parcel {0}", landData.Name);
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[HGrid]: Got exception while parsing land-data:", e);
-                        }
-                    }
-                }
-                else m_log.WarnFormat("[HGrid]: Couldn't find region with handle {0}", regionHandle);
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[HGrid]: Couldn't contact region {0}: {1}", regionHandle, e);
-            }
-
-            return landData;
-        }
-
-        // Grid Request Processing
-        public virtual List<RegionInfo> RequestNamedRegions (string name, int maxNumber)
-        {
-            List<RegionInfo> infos = new List<RegionInfo>();
-            foreach (RegionInfo info in m_hyperlinkRegions)
-            {
-                if (info.RegionName.ToLower().Contains(name))
-                {
-                    infos.Add(info);
-                }
-            }
-            return infos;
-        }
-
-
-        private UUID LinkRegion(RegionInfo info)
-        {
-            UUID uuid = UUID.Zero;
-
-            Hashtable hash = new Hashtable();
-            hash["region_name"] = info.RegionName;
-
-            IList paramList = new ArrayList();
-            paramList.Add(hash);
-
-            XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
-            string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
-            m_log.Debug("[HGrid]: Linking to " + uri);
-            XmlRpcResponse response = request.Send(uri, 10000);
-            if (response.IsFault)
-            {
-                m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString);
-            }
-            else
-            {
-                hash = (Hashtable)response.Value;
-                //foreach (Object o in hash)
-                //    m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
-                try
-                {
-                    UUID.TryParse((string)hash["uuid"], out uuid);
-                    info.RegionID = uuid;
-                    if ((string)hash["handle"] != null)
-                    {
-                        info.regionSecret = (string)hash["handle"];
-                        //m_log.Debug(">> HERE: " + info.regionSecret);
-                    }
-                    if (hash["region_image"] != null)
-                    {
-                        UUID img = UUID.Zero;
-                        UUID.TryParse((string)hash["region_image"], out img);
-                        info.RegionSettings.TerrainImageID = img;
-                    }
-                    if (hash["region_name"] != null)
-                    {
-                        info.RegionName = (string)hash["region_name"];
-                        //m_log.Debug(">> " + info.RegionName);
-                    }
-                    if (hash["internal_port"] != null)
-                    {
-                        int port = Convert.ToInt32((string)hash["internal_port"]);
-                        info.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
-                        //m_log.Debug(">> " + info.InternalEndPoint.ToString());
-                    }
-                    if (hash["remoting_port"] != null)
-                    {
-                        info.RemotingPort = Convert.ToUInt32(hash["remoting_port"]);
-                        //m_log.Debug(">> " + info.RemotingPort);
-                    }
-
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[HGrid]: Got exception while parsing hyperlink response " + e.StackTrace);
-                }
-            }
-            return uuid;
-        }
-
-        /// <summary>
-        /// Someone wants to link to us
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse LinkRegionRequest(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            //string host = (string)requestData["host"];
-            //string portstr = (string)requestData["port"];
-            string name = (string)requestData["region_name"];
-
-            m_log.DebugFormat("[HGrid]: Hyperlink request");
-
-
-            RegionInfo regInfo = null;
-            foreach (RegionInfo r in m_regionsOnInstance)
-            {
-                if ((r.RegionName != null) && (name != null) && (r.RegionName.ToLower() == name.ToLower()))
-                {
-                    regInfo = r;
-                    break;
-                }
-            }
-
-            if (regInfo == null)
-                regInfo = m_regionsOnInstance[0]; // Send out the first region
-
-            Hashtable hash = new Hashtable();
-            hash["uuid"] = regInfo.RegionID.ToString();
-            hash["handle"] = regInfo.RegionHandle.ToString();
-            //m_log.Debug(">> Here " + regInfo.RegionHandle);
-            hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString();
-            hash["region_name"] = regInfo.RegionName;
-            hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
-            hash["remoting_port"] = ConfigSettings.DefaultRegionRemotingPort.ToString();
-            //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port);
-
-
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = hash;
-            return response;
-        }
-
-        public bool InformRegionOfUser(RegionInfo regInfo, AgentCircuitData agentData)
-        {
-            //ulong regionHandle = regInfo.RegionHandle;
-            try
-            {
-                //regionHandle = Convert.ToUInt64(regInfo.regionSecret);
-                m_log.Info("[HGrid]: InformRegionOfUser: Remote hyperlinked region " + regInfo.regionSecret);
-            }
-            catch
-            {
-                m_log.Info("[HGrid]: InformRegionOfUser: Local grid region " + regInfo.regionSecret);
-            }
-
-            string capsPath = agentData.CapsPath;
-            Hashtable loginParams = new Hashtable();
-            loginParams["session_id"] = agentData.SessionID.ToString();
-            loginParams["secure_session_id"] = agentData.SecureSessionID.ToString();
-
-            loginParams["firstname"] = agentData.firstname;
-            loginParams["lastname"] = agentData.lastname;
-
-            loginParams["agent_id"] = agentData.AgentID.ToString();
-            loginParams["circuit_code"] = agentData.circuitcode.ToString();
-            loginParams["startpos_x"] = agentData.startpos.X.ToString();
-            loginParams["startpos_y"] = agentData.startpos.Y.ToString();
-            loginParams["startpos_z"] = agentData.startpos.Z.ToString();
-            loginParams["caps_path"] = capsPath;
-
-            CachedUserInfo u = m_userProfileCache.GetUserDetails(agentData.AgentID);
-            if (u != null && u.UserProfile != null)
-            {
-                loginParams["region_uuid"] = u.UserProfile.HomeRegionID.ToString(); // This seems to be always Zero
-                //m_log.Debug("  --------- Home Region UUID -------");
-                //m_log.Debug("  >> " + loginParams["region_uuid"] + " <<");
-                //m_log.Debug("  --------- ---------------- -------");
-
-                string serverURI = "";
-                if (u.UserProfile is ForeignUserProfileData)
-                    serverURI = HGNetworkServersInfo.ServerURI(((ForeignUserProfileData)u.UserProfile).UserServerURI);
-                loginParams["userserver_id"] = (serverURI == "") || (serverURI == null) ? HGNetworkServersInfo.Singleton.LocalUserServerURI : serverURI;
-
-                serverURI = HGNetworkServersInfo.ServerURI(u.UserProfile.UserAssetURI);
-                loginParams["assetserver_id"] = (serverURI == "") || (serverURI == null) ? HGNetworkServersInfo.Singleton.LocalAssetServerURI : serverURI;
-
-                serverURI = HGNetworkServersInfo.ServerURI(u.UserProfile.UserInventoryURI);
-                loginParams["inventoryserver_id"] = (serverURI == "") || (serverURI == null) ? HGNetworkServersInfo.Singleton.LocalInventoryServerURI : serverURI;
-
-                loginParams["root_folder_id"] = u.UserProfile.RootInventoryFolderID;
-
-                RegionInfo rinfo = RequestNeighbourInfo(u.UserProfile.HomeRegion);
-                if (rinfo != null)
-                {
-                    loginParams["internal_port"] = rinfo.InternalEndPoint.Port.ToString();
-                    if (!IsLocalUser(u))
-                    {
-                        loginParams["regionhandle"] = rinfo.regionSecret; // user.CurrentAgent.Handle.ToString();
-                        //m_log.Debug("XXX--- informregionofuser (foreign user) here handle: " + rinfo.regionSecret);
-
-                        loginParams["home_address"]  = ((ForeignUserProfileData)(u.UserProfile)).UserHomeAddress;
-                        loginParams["home_port"]     = ((ForeignUserProfileData)(u.UserProfile)).UserHomePort;
-                        loginParams["home_remoting"] = ((ForeignUserProfileData)(u.UserProfile)).UserHomeRemotingPort;
-                    }
-                    else
-                    {
-                        //m_log.Debug("XXX--- informregionofuser (local user) here handle: " + rinfo.regionSecret);
-
-                        //// local user about to jump out, let's process the name
-                        // On second thoughts, let's not do this for the *user*; let's only do it for the *agent*
-                        //loginParams["firstname"] = agentData.firstname + "." + agentData.lastname;
-                        //loginParams["lastname"] = serversInfo.UserURL;
-
-                        // local user, first time out. let's ask the grid about this user's home region
-                        loginParams["regionhandle"] = u.UserProfile.HomeRegion.ToString(); // user.CurrentAgent.Handle.ToString();
-
-                        loginParams["home_address"] = rinfo.ExternalHostName;
-                        m_log.Debug("  --------- Home Address -------");
-                        m_log.Debug("  >> " + loginParams["home_address"] + " <<");
-                        m_log.Debug("  --------- ------------ -------");
-                        loginParams["home_port"] = rinfo.HttpPort.ToString();
-                        loginParams["home_remoting"] = ConfigSettings.DefaultRegionRemotingPort.ToString(); ;
-                    }
-                }
-                else
-                {
-                        m_log.Warn("[HGrid]: User's home region info not found: " + u.UserProfile.HomeRegionX + ", " + u.UserProfile.HomeRegionY);
-                }
-            }
-
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(loginParams);
-
-            // Send
-            string uri = "http://" + regInfo.ExternalHostName + ":" + regInfo.HttpPort + "/";
-            //m_log.Debug("XXX uri: " + uri);
-            XmlRpcRequest request = new XmlRpcRequest("expect_hg_user", SendParams);
-            XmlRpcResponse reply;
-            try
-            {
-                reply = request.Send(uri, 6000);
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[HGrid]: Failed to notify region about user. Reason: " + e.Message);
-                return false;
-            }
-
-            if (!reply.IsFault)
-            {
-                bool responseSuccess = true;
-                if (reply.Value != null)
-                {
-                    Hashtable resp = (Hashtable)reply.Value;
-                    if (resp.ContainsKey("success"))
-                    {
-                        if ((string)resp["success"] == "FALSE")
-                        {
-                            responseSuccess = false;
-                        }
-                    }
-                }
-                if (responseSuccess)
-                {
-                    m_log.Info("[HGrid]: Successfully informed remote region about user " + agentData.AgentID);
-                    return true;
-                }
-                else
-                {
-                    m_log.ErrorFormat("[HGrid]: Region responded that it is not available to receive clients");
-                    return false;
-                }
-            }
-            else
-            {
-                m_log.ErrorFormat("[HGrid]: XmlRpc request to region failed with message {0}, code {1} ", reply.FaultString, reply.FaultCode);
-                return false;
-            }
-        }
-
-
-        /// <summary>
-        /// Received from other HGrid nodes when a user wants to teleport here.  This call allows
-        /// the region to prepare for direct communication from the client.  Sends back an empty
-        /// xmlrpc response on completion.
-        /// This is somewhat similar to OGS1's ExpectUser, but with the additional task of
-        /// registering the user in the local user cache.
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse ExpectHGUser(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            ForeignUserProfileData userData = new ForeignUserProfileData();
-
-            userData.FirstName = (string)requestData["firstname"];
-            userData.SurName = (string)requestData["lastname"];
-            userData.ID = new UUID((string)requestData["agent_id"]);
-            userData.HomeLocation = new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
-                                  (float)Convert.ToDecimal((string)requestData["startpos_y"]),
-                                  (float)Convert.ToDecimal((string)requestData["startpos_z"]));
-
-            userData.UserServerURI = (string)requestData["userserver_id"];
-            userData.UserAssetURI = (string)requestData["assetserver_id"];
-            userData.UserInventoryURI = (string)requestData["inventoryserver_id"];
-
-            UUID rootID = UUID.Zero;
-            UUID.TryParse((string)requestData["root_folder_id"], out rootID);
-            userData.RootInventoryFolderID = rootID;
-
-            UUID uuid = UUID.Zero;
-            UUID.TryParse((string)requestData["region_uuid"], out uuid);
-            userData.HomeRegionID         = uuid; // not quite comfortable about this...
-            ulong userRegionHandle        = Convert.ToUInt64((string)requestData["regionhandle"]);
-            //userData.HomeRegion           = userRegionHandle;
-            userData.UserHomeAddress      = (string)requestData["home_address"];
-            userData.UserHomePort         = (string)requestData["home_port"];
-            int userhomeinternalport      = Convert.ToInt32((string)requestData["internal_port"]);
-            userData.UserHomeRemotingPort = (string)requestData["home_remoting"];
-
-
-            m_log.DebugFormat("[HGrid]: Prepare for connection from {0} {1} (@{2}) UUID={3}",
-                              userData.FirstName, userData.SurName, userData.UserServerURI, userData.ID);
-            m_log.Debug("[HGrid]: home_address: " + userData.UserHomeAddress +
-                       "; home_port: " + userData.UserHomePort + "; remoting: " + userData.UserHomeRemotingPort);
-
-            XmlRpcResponse resp = new XmlRpcResponse();
-
-            // Let's check if someone is trying to get in with a stolen local identity.
-            // The need for this test is a consequence of not having truly global names :-/
-            CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(userData.ID);
-            if ((uinfo != null) && !(uinfo.UserProfile is ForeignUserProfileData))
-            {
-                m_log.WarnFormat("[HGrid]: Foreign user trying to get in with local identity. Access denied.");
-                Hashtable respdata = new Hashtable();
-                respdata["success"] = "FALSE";
-                respdata["reason"] = "Foreign user has the same ID as a local user.";
-                resp.Value = respdata;
-                return resp;
-            }
-
-            if (!RegionLoginsEnabled)
-            {
-                m_log.InfoFormat(
-                    "[HGrid]: Denying access for user {0} {1} because region login is currently disabled",
-                    userData.FirstName, userData.SurName);
-
-                Hashtable respdata = new Hashtable();
-                respdata["success"] = "FALSE";
-                respdata["reason"] = "region login currently disabled";
-                resp.Value = respdata;
-            }
-            else
-            {
-                // Finally, everything looks ok
-                //m_log.Debug("XXX---- EVERYTHING OK ---XXX");
-
-                // 1 - Preload the user data
-                m_userProfileCache.PreloadUserCache(userData);
-
-                if (m_knownRegions.ContainsKey(userData.ID))
-                {
-                    // This was left here when the user departed
-                    m_knownRegions.Remove(userData.ID);
-                }
-
-                // 2 - Load the region info into list of known regions
-                RegionInfo rinfo = new RegionInfo();
-                rinfo.RegionID         = userData.HomeRegionID;
-                rinfo.ExternalHostName = userData.UserHomeAddress;
-                rinfo.HttpPort         = Convert.ToUInt32(userData.UserHomePort);
-                rinfo.RemotingPort     = Convert.ToUInt32(userData.UserHomeRemotingPort);
-                rinfo.RegionID = userData.HomeRegionID;
-                // X=0 on the map
-                rinfo.RegionLocX = 0;
-                rinfo.RegionLocY = (uint)(random.Next(0, Int32.MaxValue)); //(uint)m_knownRegions.Count;
-                rinfo.regionSecret = userRegionHandle.ToString();
-                //m_log.Debug("XXX--- Here: handle = " + rinfo.regionSecret);
-                try
-                {
-                    rinfo.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)userhomeinternalport);
-                }
-                catch (Exception e)
-                {
-                    m_log.Warn("[HGrid]: Exception while constructing internal endpoint: " + e);
-                }
-                rinfo.RemotingAddress = rinfo.ExternalEndPoint.Address.ToString(); //userData.UserHomeAddress;
-
-                if (!IsComingHome(userData))
-                {
-                    // Change the user's home region here!!!
-                    userData.HomeRegion = rinfo.RegionHandle;
-                }
-
-                if (!m_knownRegions.ContainsKey(userData.ID))
-                    m_knownRegions.Add(userData.ID, rinfo);
-
-                // 3 - Send the reply
-                Hashtable respdata = new Hashtable();
-                respdata["success"] = "TRUE";
-                resp.Value = respdata;
-
-                DumpUserData(userData);
-                DumpRegionData(rinfo);
-                
-            }
-
-            return resp;
-        }
-
-        public bool SendUserInformation(RegionInfo regInfo, AgentCircuitData agentData)
-        {
-            CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID);
-
-            if ((IsLocalUser(uinfo) && IsHyperlinkRegion(regInfo.RegionHandle)) ||
-                (!IsLocalUser(uinfo) && !IsGoingHome(uinfo, regInfo)))
-            {
-                m_log.Info("[HGrid]: Local user is going to foreign region or foreign user is going elsewhere");
-                if (!InformRegionOfUser(regInfo, agentData))
-                {
-                    m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
-                    return false;
-                }
-            }
-            //if ((uinfo == null) || !IsGoingHome(uinfo, regInfo))
-            //{
-            //    m_log.Info("[HGrid]: User seems to be going to foreign region.");
-            //    if (!InformRegionOfUser(regInfo, agentData))
-            //    {
-            //        m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
-            //        return false;
-            //    }
-            //}
-            //else
-            //    m_log.Info("[HGrid]: User seems to be going home " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName);
-
-            // May need to change agent's name
-            if (IsLocalUser(uinfo) && IsHyperlinkRegion(regInfo.RegionHandle))
-            {
-                agentData.firstname = agentData.firstname + "." + agentData.lastname;
-                agentData.lastname = "@" + serversInfo.UserURL.Replace("http://", ""); ; //HGNetworkServersInfo.Singleton.LocalUserServerURI;
-            }
-
-            return true;
-        }
-
-
-        #region Methods triggered by calls from external instances
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="agentData"></param>
-        /// <returns></returns>
-        public void AdjustUserInformation(AgentCircuitData agentData)
-        {
-            CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID);
-            if ((uinfo != null) && (uinfo.UserProfile != null) &&
-                (IsLocalUser(uinfo) || !(uinfo.UserProfile is ForeignUserProfileData)))
-            {
-                //m_log.Debug("---------------> Local User!");
-                string[] parts = agentData.firstname.Split(new char[] { '.' });
-                if (parts.Length == 2)
-                {
-                    agentData.firstname = parts[0];
-                    agentData.lastname = parts[1];
-                }
-            }
-            //else
-            //    m_log.Debug("---------------> Foreign User!");
-        }
-        #endregion
-
-
-        #region IHyperGrid interface
-
-        public virtual bool IsHyperlinkRegion(ulong ihandle)
-        {
-            if (GetHyperlinkRegion(ihandle) == null)
-                return false;
-            else
-                return true;
-        }
-
-        public virtual RegionInfo GetHyperlinkRegion(ulong ihandle)
-        {
-            foreach (RegionInfo info in m_hyperlinkRegions)
-            {
-                if (info.RegionHandle == ihandle)
-                    return info;
-            }
-
-            foreach (RegionInfo info in m_knownRegions.Values)
-            {
-                if (info.RegionHandle == ihandle)
-                    return info;
-            }
-
-            return null;
-        }
-
-        public virtual ulong FindRegionHandle(ulong ihandle)
-        {
-            long ohandle = -1;
-            List<RegionInfo> rlist = new List<RegionInfo>(m_hyperlinkRegions);
-            rlist.AddRange(m_knownRegions.Values);
-            foreach (RegionInfo info in rlist)
-            {
-                if (info.RegionHandle == ihandle)
-                {
-                    try
-                    {
-                        ohandle = Convert.ToInt64(info.regionSecret);
-                        m_log.Info("[HGrid] remote region " + ohandle);
-                    }
-                    catch
-                    {
-                        m_log.Error("[HGrid] Could not convert secret for " + ihandle + " (" + info.regionSecret + ")");
-                    }
-                    break;
-                }
-            }
-            return ohandle < 0 ? ihandle : (ulong)ohandle;
-        }
-        #endregion
-
-        #region Misc
-
-        protected bool IsComingHome(ForeignUserProfileData userData)
-        {
-            return (userData.UserServerURI == HGNetworkServersInfo.Singleton.LocalUserServerURI);
-        }
-
-        protected bool IsGoingHome(CachedUserInfo uinfo, RegionInfo rinfo)
-        {
-            if (uinfo.UserProfile == null)
-                return false;
-
-            string userUserServerURI = String.Empty;
-            if (uinfo.UserProfile is ForeignUserProfileData)
-            {
-                userUserServerURI = HGNetworkServersInfo.ServerURI(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI);
-            }
-
-            return ((uinfo.UserProfile.HomeRegionID == rinfo.RegionID) &&
-                    (userUserServerURI != HGNetworkServersInfo.Singleton.LocalUserServerURI));
-        }
-
-        protected bool IsLocalUser(CachedUserInfo uinfo)
-        {
-            if (uinfo == null)
-                return true;
-
-            if (uinfo.UserProfile is ForeignUserProfileData)
-                return HGNetworkServersInfo.Singleton.IsLocalUser(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI);
-            else
-                return true;
-
-        }
-
-        protected bool IsLocalRegion(ulong handle)
-        {
-            foreach (RegionInfo reg in m_regionsOnInstance)
-                if (reg.RegionHandle == handle)
-                    return true;
-            return false;
-        }
-
-        private void DumpUserData(ForeignUserProfileData userData)
-        {
-            m_log.Info(" ------------ User Data Dump ----------");
-            m_log.Info(" >> Name: " + userData.FirstName + " " + userData.SurName);
-            m_log.Info(" >> HomeID: " + userData.HomeRegionID);
-            m_log.Info(" >> HomeHandle: " + userData.HomeRegion);
-            m_log.Info(" >> HomeX: " + userData.HomeRegionX);
-            m_log.Info(" >> HomeY: " + userData.HomeRegionY);
-            m_log.Info(" >> UserServer: " + userData.UserServerURI);
-            m_log.Info(" >> InvServer: " + userData.UserInventoryURI);
-            m_log.Info(" >> AssetServer: " + userData.UserAssetURI);
-            m_log.Info(" ------------ -------------- ----------");
-        }
-
-        private void DumpRegionData(RegionInfo rinfo)
-        {
-            m_log.Info(" ------------ Region Data Dump ----------");
-            m_log.Info(" >> handle: " + rinfo.RegionHandle);
-            m_log.Info(" >> coords: " + rinfo.RegionLocX + ", " + rinfo.RegionLocY);
-            m_log.Info(" >> secret: " + rinfo.regionSecret);
-            m_log.Info(" >> remoting address: " + rinfo.RemotingAddress);
-            m_log.Info(" >> remoting port: " + rinfo.RemotingPort);
-            m_log.Info(" >> external host name: " + rinfo.ExternalHostName);
-            m_log.Info(" >> http port: " + rinfo.HttpPort);
-            m_log.Info(" >> external EP address: " + rinfo.ExternalEndPoint.Address);
-            m_log.Info(" >> external EP port: " + rinfo.ExternalEndPoint.Port);
-            m_log.Info(" ------------ -------------- ----------");
-        }
-
-
-        #endregion
-
-
-    }
-}
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
deleted file mode 100644
index 5ce1e79..0000000
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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 System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Communications.OGS1;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.Communications.Hypergrid
-{
-    public class HGGridServicesGridMode : HGGridServices
-    {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// Encapsulate remote backend services for manipulation of grid regions
-        /// </summary>
-        private OGS1GridServices m_remoteBackend = null;
-
-        public OGS1GridServices RemoteBackend
-        {
-            get { return m_remoteBackend; }
-        }
-
-
-        public override string gdebugRegionName
-        {
-            get { return m_remoteBackend.gdebugRegionName; }
-            set { m_remoteBackend.gdebugRegionName = value; }
-        }
-
-        public override bool RegionLoginsEnabled
-        {
-            get { return m_remoteBackend.RegionLoginsEnabled; }
-            set { m_remoteBackend.RegionLoginsEnabled = value; }
-        }      
-
-        public HGGridServicesGridMode(NetworkServersInfo servers_info,
-            SceneManager sman, UserProfileCacheService userv)
-            : base(servers_info, sman)
-        {
-            m_remoteBackend = new OGS1GridServices(servers_info);
-            m_userProfileCache = userv;
-        }
-
-        #region IGridServices interface
-
-        public override RegionCommsListener RegisterRegion(RegionInfo regionInfo)
-        {
-            if (!regionInfo.RegionID.Equals(UUID.Zero))
-            {
-                m_regionsOnInstance.Add(regionInfo);
-                return m_remoteBackend.RegisterRegion(regionInfo);
-            }
-            else
-                return base.RegisterRegion(regionInfo);
-        }
-
-        public override bool DeregisterRegion(RegionInfo regionInfo)
-        {
-            bool success = base.DeregisterRegion(regionInfo); 
-            if (!success)
-                success = m_remoteBackend.DeregisterRegion(regionInfo);
-            return success;
-        }
-
-        public override List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
-        {
-            List<SimpleRegionInfo> neighbours = m_remoteBackend.RequestNeighbours(x, y);
-            //List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y);
-            //neighbours.AddRange(remotes);
-
-            return neighbours;
-        }
-
-        public override RegionInfo RequestNeighbourInfo(UUID Region_UUID)
-        {
-            RegionInfo info = m_remoteBackend.RequestNeighbourInfo(Region_UUID);
-            if (info == null)
-                info = base.RequestNeighbourInfo(Region_UUID);
-            return info;
-        }
-
-        public override RegionInfo RequestNeighbourInfo(ulong regionHandle)
-        {
-            RegionInfo info = base.RequestNeighbourInfo(regionHandle);
-            if (info == null)
-                info = m_remoteBackend.RequestNeighbourInfo(regionHandle);
-            return info;
-        }
-
-        public override RegionInfo RequestClosestRegion(string regionName)
-        {
-            RegionInfo info = m_remoteBackend.RequestClosestRegion(regionName);
-            if (info == null)
-                info = base.RequestClosestRegion(regionName);
-            return info;
-        }
-
-        public override List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            List<MapBlockData> neighbours = m_remoteBackend.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
-            List<MapBlockData> remotes = base.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
-            neighbours.AddRange(remotes);
-
-            return neighbours;
-        }
-
-        public override LandData RequestLandData(ulong regionHandle, uint x, uint y)
-        {
-            LandData land = m_remoteBackend.RequestLandData(regionHandle, x, y);
-            if (land == null)
-                land = base.RequestLandData(regionHandle, x, y);
-            return land;
-        }
-
-        public override List<RegionInfo> RequestNamedRegions(string name, int maxNumber)
-        {
-            List<RegionInfo> infos = m_remoteBackend.RequestNamedRegions(name, maxNumber);
-            List<RegionInfo> remotes = base.RequestNamedRegions(name, maxNumber);
-            infos.AddRange(remotes);
-            return infos;
-        }
-
-        #endregion
-
-
-    }
-}
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
deleted file mode 100644
index 94cfc49..0000000
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Tcp;
-using System.Security.Authentication;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Communications.Local;
-using OpenSim.Region.Communications.OGS1;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.Communications.Hypergrid
-{
-    public class HGGridServicesStandalone : HGGridServices
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// Encapsulate local backend services for manipulation of local regions
-        /// </summary>
-        protected LocalBackEndServices m_localBackend = new LocalBackEndServices();
-
-        //private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>();
-
-        public LocalBackEndServices LocalBackend
-        {
-            get { return m_localBackend; }
-        }
-
-        public override string gdebugRegionName
-        {
-            get { return m_localBackend.gdebugRegionName; }
-            set { m_localBackend.gdebugRegionName = value; }
-        }
-
-        public override bool RegionLoginsEnabled
-        {
-            get { return m_localBackend.RegionLoginsEnabled; }
-            set { m_localBackend.RegionLoginsEnabled = value; }
-        }      
-
-
-        public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, SceneManager sman)
-            : base(servers_info, sman)
-        {
-            //Respond to Grid Services requests
-            MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser);
-            MainServer.Instance.AddXmlRPCHandler("check", PingCheckReply);
-            MainServer.Instance.AddXmlRPCHandler("land_data", LandData);
-
-        }
-
-        #region IGridServices interface
-
-        public override RegionCommsListener RegisterRegion(RegionInfo regionInfo)
-        {
-            if (!regionInfo.RegionID.Equals(UUID.Zero))
-            {
-                m_regionsOnInstance.Add(regionInfo);
-                return m_localBackend.RegisterRegion(regionInfo);
-            }
-            else
-                return base.RegisterRegion(regionInfo);
-
-        }
-
-        public override bool DeregisterRegion(RegionInfo regionInfo)
-        {
-            bool success = m_localBackend.DeregisterRegion(regionInfo);
-            if (!success)
-                success = base.DeregisterRegion(regionInfo);
-            return success;
-        }
-
-        public override List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
-        {
-            List<SimpleRegionInfo> neighbours = m_localBackend.RequestNeighbours(x, y);
-            //List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y);
-            //neighbours.AddRange(remotes);
-    
-            return neighbours;
-        }
-
-        public override RegionInfo RequestNeighbourInfo(UUID Region_UUID)
-        {
-            RegionInfo info = m_localBackend.RequestNeighbourInfo(Region_UUID);
-            if (info == null)
-                info = base.RequestNeighbourInfo(Region_UUID);
-            return info;
-        }
-
-        public override RegionInfo RequestNeighbourInfo(ulong regionHandle)
-        {
-            RegionInfo info = m_localBackend.RequestNeighbourInfo(regionHandle);
-            //m_log.Info("[HGrid] Request neighbor info, local backend returned " + info);
-            if (info == null)
-                info = base.RequestNeighbourInfo(regionHandle);
-            return info;
-        }
-
-        public override RegionInfo RequestClosestRegion(string regionName)
-        {
-            RegionInfo info = m_localBackend.RequestClosestRegion(regionName);
-            if (info == null)
-                info = base.RequestClosestRegion(regionName);
-            return info;
-        }
-
-        public override List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            //m_log.Info("[HGrid] Request map blocks " + minX + "-" + minY + "-" + maxX + "-" + maxY);
-            List<MapBlockData> neighbours = m_localBackend.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
-            List<MapBlockData> remotes = base.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
-            neighbours.AddRange(remotes);
-
-            return neighbours;
-        }
-
-        public override LandData RequestLandData(ulong regionHandle, uint x, uint y)
-        {
-            LandData land = m_localBackend.RequestLandData(regionHandle, x, y);
-            if (land == null)
-                land = base.RequestLandData(regionHandle, x, y);
-            return land;
-        }
-
-        public override List<RegionInfo> RequestNamedRegions(string name, int maxNumber)
-        {
-            List<RegionInfo> infos = m_localBackend.RequestNamedRegions(name, maxNumber);
-            List<RegionInfo> remotes = base.RequestNamedRegions(name, maxNumber);
-            infos.AddRange(remotes);
-            return infos;
-        }
-
-        #endregion 
-
-        #region XML Request Handlers
-
-        /// <summary>
-        /// A ping / version check
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public virtual XmlRpcResponse PingCheckReply(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-
-            Hashtable respData = new Hashtable();
-            respData["online"] = "true";
-
-            m_localBackend.PingCheckReply(respData);
-
-            response.Value = respData;
-
-            return response;
-        }
-
-
-        // Grid Request Processing
-        /// <summary>
-        /// Ooops, our Agent must be dead if we're getting this request!
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse LogOffUser(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            m_log.Debug("[HGrid]: LogOff User Called");
-
-            Hashtable requestData = (Hashtable)request.Params[0];
-            string message = (string)requestData["message"];
-            UUID agentID = UUID.Zero;
-            UUID RegionSecret = UUID.Zero;
-            UUID.TryParse((string)requestData["agent_id"], out agentID);
-            UUID.TryParse((string)requestData["region_secret"], out RegionSecret);
-
-            ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
-
-            m_localBackend.TriggerLogOffUser(regionHandle, agentID, RegionSecret, message);
-
-            return new XmlRpcResponse();
-        }
-
-        /// <summary>
-        /// Someone asked us about parcel-information
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse LandData(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]);
-            uint x = Convert.ToUInt32(requestData["x"]);
-            uint y = Convert.ToUInt32(requestData["y"]);
-            m_log.DebugFormat("[HGrid]: Got XML reqeuest for land data at {0}, {1} in region {2}", x, y, regionHandle);
-
-            LandData landData = m_localBackend.RequestLandData(regionHandle, x, y);
-            Hashtable hash = new Hashtable();
-            if (landData != null)
-            {
-                // for now, only push out the data we need for answering a ParcelInfoReqeust
-                hash["AABBMax"] = landData.AABBMax.ToString();
-                hash["AABBMin"] = landData.AABBMin.ToString();
-                hash["Area"] = landData.Area.ToString();
-                hash["AuctionID"] = landData.AuctionID.ToString();
-                hash["Description"] = landData.Description;
-                hash["Flags"] = landData.Flags.ToString();
-                hash["GlobalID"] = landData.GlobalID.ToString();
-                hash["Name"] = landData.Name;
-                hash["OwnerID"] = landData.OwnerID.ToString();
-                hash["SalePrice"] = landData.SalePrice.ToString();
-                hash["SnapshotID"] = landData.SnapshotID.ToString();
-                hash["UserLocation"] = landData.UserLocation.ToString();
-            }
-
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = hash;
-            return response;
-        }
-
-        #endregion
-
-    }
-}
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index f1a56ef..49a2261 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Communications.Hypergrid
                 return m_localUserServices.AddUserAgent(agentdata);
 
             return base.AddUserAgent(agentdata);
-        }        
+        }
 
         public override UserAgentData GetAgentByUUID(UUID userId)
         {
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index a658416..eaf996d 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local
     public class CommunicationsLocal : CommunicationsManager
     {
         public CommunicationsLocal(
-            ConfigSettings configSettings,                                   
+            ConfigSettings configSettings,
             NetworkServersInfo serversInfo,
             LibraryRootFolder libraryRootFolder)
             : base(serversInfo, libraryRootFolder)
@@ -47,15 +47,13 @@ namespace OpenSim.Region.Communications.Local
                 = new LocalUserServices(
                     serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
             lus.AddPlugin(new TemporaryUserProfilePlugin());
-            lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource);            
+            lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource);
             m_userService = lus;
-            m_userAdminService = lus;            
+            m_userAdminService = lus;
             m_avatarService = lus;
             m_messageService = lus;
 
-            m_gridService = new LocalBackEndServices();
-
-            //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);                      
+            //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);
         }
     }
 }
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
deleted file mode 100644
index 0ab9374..0000000
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-
-namespace OpenSim.Region.Communications.Local
-{
-    public class LocalBackEndServices : IGridServices
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>();
-
-        protected Dictionary<ulong, RegionCommsListener> m_regionListeners =
-            new Dictionary<ulong, RegionCommsListener>();
-
-        // private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
-
-        private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
-
-        public string _gdebugRegionName = String.Empty;
-
-        public bool RegionLoginsEnabled
-        {
-            get { return m_regionLoginsEnabled; }
-            set { m_regionLoginsEnabled = value; }
-        }
-        private bool m_regionLoginsEnabled;
-
-        public bool CheckRegion(string address, uint port)
-        {
-            return true;
-        }
-
-        public string gdebugRegionName
-        {
-            get { return _gdebugRegionName; }
-            set { _gdebugRegionName = value; }
-        }
-
-        public string _rdebugRegionName = String.Empty;
-
-        public string rdebugRegionName
-        {
-            get { return _rdebugRegionName; }
-            set { _rdebugRegionName = value; }
-        }
-
-        /// <summary>
-        /// Register a region method with the BackEnd Services.
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
-        public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
-        {
-            //m_log.Debug("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
-            if (!m_regions.ContainsKey(regionInfo.RegionHandle))
-            {
-                //m_log.Debug("CommsManager - Adding Region " + regionInfo.RegionHandle);
-                m_regions.Add(regionInfo.RegionHandle, regionInfo);
-
-                RegionCommsListener regionHost = new RegionCommsListener();
-                if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
-                {
-                    m_log.Error("[INTERREGION STANDALONE]: " +
-                                "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region.  " +
-                                "In Standalone mode this will cause BIG issues.  In grid mode, it means a region went down and came back up.");
-                    m_regionListeners.Remove(regionInfo.RegionHandle);
-                }
-                m_regionListeners.Add(regionInfo.RegionHandle, regionHost);
-
-                return regionHost;
-            }
-            else
-            {
-                // Already in our list, so the region went dead and restarted.
-                // don't replace the old regioninfo..    this might be a locking issue..  however we need to
-                // remove it and let it add normally below or we get extremely strange and intermittant
-                // connectivity errors.
-                // Don't change this line below to 'm_regions[regionInfo.RegionHandle] = regionInfo' unless you
-                // *REALLY* know what you are doing here.
-                m_regions[regionInfo.RegionHandle] = regionInfo;
-
-                m_log.Warn("[INTERREGION STANDALONE]: Region registered twice. Region went down and came back up.");
-
-                RegionCommsListener regionHost = new RegionCommsListener();
-                if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
-                {
-                    m_regionListeners.Remove(regionInfo.RegionHandle);
-                }
-                m_regionListeners.Add(regionInfo.RegionHandle, regionHost);
-
-                return regionHost;
-            }
-        }
-
-        public bool DeregisterRegion(RegionInfo regionInfo)
-        {
-            if (m_regions.ContainsKey(regionInfo.RegionHandle))
-            {
-                m_regions.Remove(regionInfo.RegionHandle);
-                if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
-                {
-                    m_regionListeners.Remove(regionInfo.RegionHandle);
-                }
-                return true;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
-        public List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
-        {
-            // m_log.Debug("Finding Neighbours to " + regionInfo.RegionHandle);
-            List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
-
-            foreach (RegionInfo reg in m_regions.Values)
-            {
-                // m_log.Debug("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
-                if (reg.RegionLocX != x || reg.RegionLocY != y)
-                {
-                    //m_log.Debug("CommsManager- RequestNeighbours() - found a different region in list, checking location");
-                    if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2)))
-                    {
-                        if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2)))
-                        {
-                            neighbours.Add(reg);
-                        }
-                    }
-                }
-            }
-            return neighbours;
-        }
-
-        /// <summary>
-        /// Get information about a neighbouring region
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
-        {
-            if (m_regions.ContainsKey(regionHandle))
-            {
-                return m_regions[regionHandle];
-            }
-            
-            return null;
-        }
-
-        /// <summary>
-        /// Get information about a neighbouring region
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>        
-        public RegionInfo RequestNeighbourInfo(UUID regionID)
-        {
-            // TODO add a dictionary for faster lookup
-            foreach (RegionInfo info in m_regions.Values)
-            {
-                if (info.RegionID == regionID)
-                    return info;
-            }
-            
-            return null;
-        }
-
-        /// <summary>
-        /// Get information about a neighbouring region
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionInfo RequestNeighbourInfo(string name)
-        {
-            foreach (RegionInfo info in m_regions.Values)
-            {
-                if (info.RegionName == name)
-                    return info;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Get information about a neighbouring region
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionInfo RequestNeighbourInfo(string host, uint port)
-        {
-            foreach (RegionInfo info in m_regions.Values)
-            {
-                if ((info.ExternalHostName == host) && (info.HttpPort == port))
-                    return info;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Get information about the closet region given a region name.
-        /// </summary>
-        /// <param name="regionName"></param>
-        /// <returns></returns>
-        public RegionInfo RequestClosestRegion(string regionName)
-        {
-            foreach (RegionInfo regInfo in m_regions.Values)
-            {
-                if (regInfo.RegionName == regionName)
-                    return regInfo;
-            }
-            return null;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="minX"></param>
-        /// <param name="minY"></param>
-        /// <param name="maxX"></param>
-        /// <param name="maxY"></param>
-        /// <returns></returns>
-        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            List<MapBlockData> mapBlocks = new List<MapBlockData>();
-            foreach (RegionInfo regInfo in m_regions.Values)
-            {
-                if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) &&
-                    ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
-                {
-                    MapBlockData map = new MapBlockData();
-                    map.Name = regInfo.RegionName;
-                    map.X = (ushort) regInfo.RegionLocX;
-                    map.Y = (ushort) regInfo.RegionLocY;
-                    map.WaterHeight = (byte) regInfo.RegionSettings.WaterHeight;
-                    map.MapImageId = regInfo.RegionSettings.TerrainImageID;
-                    map.Agents = 1;
-                    map.RegionFlags = 72458694;
-                    map.Access = regInfo.AccessLevel;
-                    mapBlocks.Add(map);
-                }
-            }
-            return mapBlocks;
-        }
-
-        // This function is only here to keep this class in line with the Grid Interface.
-        // It never gets called.
-        public virtual Dictionary<string, string> GetGridSettings()
-        {
-            Dictionary<string, string> returnGridSettings = new Dictionary<string, string>();
-            lock (m_queuedGridSettings)
-            {
-                returnGridSettings = m_queuedGridSettings;
-                m_queuedGridSettings.Clear();
-            }
-
-            return returnGridSettings;
-        }
-
-        public virtual void SetForcefulBanlistsDisallowed()
-        {
-            m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE");
-        }
-
-
-        /// <summary>
-        /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="loginData"></param>
-        /// <returns></returns>
-        public void AddNewSession(ulong regionHandle, Login loginData)
-        {
-            AgentCircuitData agent = new AgentCircuitData();
-            agent.AgentID = loginData.Agent;
-            agent.firstname = loginData.First;
-            agent.lastname = loginData.Last;
-            agent.SessionID = loginData.Session;
-            agent.SecureSessionID = loginData.SecureSession;
-            agent.circuitcode = loginData.CircuitCode;
-            agent.BaseFolder = loginData.BaseFolder;
-            agent.InventoryFolder = loginData.InventoryFolder;
-            agent.startpos = loginData.StartPos;
-            agent.CapsPath = loginData.CapsPath;
-            if (loginData.Appearance != null)
-                agent.Appearance = loginData.Appearance;
-            else
-            {
-                m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
-                agent.Appearance = new AvatarAppearance(agent.AgentID);
-            }
-
-            TriggerExpectUser(regionHandle, agent);
-        }
-
-        public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
-        {
-            //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname);
-
-            if (m_regionListeners.ContainsKey(regionHandle))
-            {
-                //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname);
-
-                m_regionListeners[regionHandle].TriggerExpectUser(agent);
-            }
-        }
-
-        public void TriggerLogOffUser(ulong regionHandle, UUID agentID, UUID RegionSecret, string message)
-        {
-            if (m_regionListeners.ContainsKey(regionHandle))
-            {
-                //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname);
-
-                m_regionListeners[regionHandle].TriggerLogOffUser(agentID, RegionSecret, message);
-            }
-        }
-
-        public void PingCheckReply(Hashtable respData)
-        {
-            foreach (ulong region in m_regions.Keys)
-            {
-                Hashtable regData = new Hashtable();
-                RegionInfo reg = m_regions[region];
-                regData["status"] = "active";
-                regData["handle"] = region.ToString();
-
-                respData[reg.RegionID.ToString()] = regData;
-            }
-        }
-
-
-        public LandData RequestLandData (ulong regionHandle, uint x, uint y)
-        {
-            m_log.DebugFormat("[INTERREGION STANDALONE] requests land data in {0}, at {1}, {2}",
-                              regionHandle, x, y);
-
-            if (m_regionListeners.ContainsKey(regionHandle))
-            {
-                LandData land = m_regionListeners[regionHandle].TriggerGetLandData(x, y);
-                return land;
-            }
-
-            m_log.Debug("[INTERREGION STANDALONE] didn't find land data locally.");
-            return null;
-        }
-
-        public List<RegionInfo> RequestNamedRegions (string name, int maxNumber)
-        {
-            List<RegionInfo> lowercase_regions = new List<RegionInfo>();
-            List<RegionInfo> regions = new List<RegionInfo>();
-            foreach (RegionInfo info in m_regions.Values)
-            {
-                // Prioritizes exact match
-                if (info.RegionName.StartsWith(name))
-                {
-                    regions.Add(info);
-                    if (regions.Count >= maxNumber) break;
-                }
-                // But still saves lower case matches
-                else if (info.RegionName.ToLower().StartsWith(name))
-                {
-                    if (lowercase_regions.Count < maxNumber)
-                    {
-                        lowercase_regions.Add(info);
-                    }
-                }
-            }
-
-            // If no exact matches found, return lowercase matches (libOMV compatiblity)
-            if (regions.Count == 0 && lowercase_regions.Count != 0)
-            {
-                return lowercase_regions;
-            }
-            return regions;
-        }
-    }
-}
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index af4fb37..89b55c4 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -80,6 +80,21 @@ namespace OpenSim.Region.Communications.Local
                 throw new Exception("[LOCAL USER SERVICES]: Unknown master user UUID. Possible reason: UserServer is not running.");
             }
             return data;
-        }       
+        }
+
+        public override bool AuthenticateUserByPassword(UUID userID, string password)
+        {
+            UserProfileData userProfile = GetUserProfile(userID);
+
+            if (null == userProfile)
+                return false;
+      
+            string md5PasswordHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + userProfile.PasswordSalt);
+    
+            if (md5PasswordHash == userProfile.PasswordHash)
+                return true;
+            else
+                return false;
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 8b5779f..94e4ed2 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -39,10 +39,8 @@ namespace OpenSim.Region.Communications.OGS1
             LibraryRootFolder libraryRootFolder)
             : base(serversInfo, libraryRootFolder)
         {
-            OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo);
-            m_gridService = gridInterComms;
 
-            // This plugin arrangement could eventually be configurable rather than hardcoded here.           
+            // This plugin arrangement could eventually be configurable rather than hardcoded here.
             OGS1UserServices userServices = new OGS1UserServices(this);
             userServices.AddPlugin(new TemporaryUserProfilePlugin());
             userServices.AddPlugin(new OGS1UserDataPlugin(this));
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
deleted file mode 100644
index 47c7fe4..0000000
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ /dev/null
@@ -1,937 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Communications.Local;
-
-namespace OpenSim.Region.Communications.OGS1
-{
-    public class OGS1GridServices : IGridServices
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private bool m_useRemoteRegionCache = true;
-        /// <summary>
-        /// Encapsulate local backend services for manipulation of local regions
-        /// </summary>
-        private LocalBackEndServices m_localBackend = new LocalBackEndServices();
-        
-        private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
-        // private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>();
-        private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>();
-        private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
-        private List<RegionInfo> m_regionsOnInstance = new List<RegionInfo>();
-
-        public BaseHttpServer httpListener;
-        public NetworkServersInfo serversInfo;
-        
-        public string gdebugRegionName
-        {
-            get { return m_localBackend.gdebugRegionName; }
-            set { m_localBackend.gdebugRegionName = value; }
-        }  
-
-        public string rdebugRegionName
-        {
-            get { return _rdebugRegionName; }
-            set { _rdebugRegionName = value; }
-        }
-        private string _rdebugRegionName = String.Empty;
-        
-        public bool RegionLoginsEnabled
-        {
-            get { return m_localBackend.RegionLoginsEnabled; }
-            set { m_localBackend.RegionLoginsEnabled = value; }
-        }      
-
-        /// <summary>
-        /// Contructor.  Adds "expect_user" and "check" xmlrpc method handlers
-        /// </summary>
-        /// <param name="servers_info"></param>
-        /// <param name="httpServe"></param>
-        public OGS1GridServices(NetworkServersInfo servers_info)
-        {
-            serversInfo = servers_info;
-
-            //Respond to Grid Services requests
-            MainServer.Instance.AddXmlRPCHandler("check", PingCheckReply);
-        }
-
-        // see IGridServices
-        public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
-        {
-            if (m_regionsOnInstance.Contains(regionInfo))
-            {
-                m_log.Error("[OGS1 GRID SERVICES]: Foobar! Caller is confused, region already registered " + regionInfo.RegionName);
-                Exception e = new Exception(String.Format("Unable to register region"));
-
-                throw e;
-            }
-
-            m_log.InfoFormat(
-                "[OGS1 GRID SERVICES]: Registering region {0} with grid at {1}",
-                regionInfo.RegionName, serversInfo.GridURL);
-            
-            m_regionsOnInstance.Add(regionInfo);
-
-            Hashtable GridParams = new Hashtable();
-            // Login / Authentication
-
-            GridParams["authkey"] = serversInfo.GridSendKey;
-            GridParams["recvkey"] = serversInfo.GridRecvKey;
-            GridParams["UUID"] = regionInfo.RegionID.ToString();
-            GridParams["sim_ip"] = regionInfo.ExternalHostName;
-            GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString();
-            GridParams["region_locx"] = regionInfo.RegionLocX.ToString();
-            GridParams["region_locy"] = regionInfo.RegionLocY.ToString();
-            GridParams["sim_name"] = regionInfo.RegionName;
-            GridParams["http_port"] = serversInfo.HttpListenerPort.ToString();
-            GridParams["remoting_port"] = ConfigSettings.DefaultRegionRemotingPort.ToString();
-            GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString();
-            GridParams["originUUID"] = regionInfo.originRegionID.ToString();
-            GridParams["server_uri"] = regionInfo.ServerURI;
-            GridParams["region_secret"] = regionInfo.regionSecret;
-            GridParams["major_interface_version"] = VersionInfo.MajorInterfaceVersion.ToString();
-
-            if (regionInfo.MasterAvatarAssignedUUID != UUID.Zero)
-                GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
-            else
-                GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
-
-            GridParams["maturity"] = regionInfo.RegionSettings.Maturity.ToString();
-
-            // Package into an XMLRPC Request
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(GridParams);
-
-            // Send Request
-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
-            XmlRpcResponse GridResp;
-            
-            try
-            {                
-                // The timeout should always be significantly larger than the timeout for the grid server to request
-                // the initial status of the region before confirming registration.
-                GridResp = GridReq.Send(serversInfo.GridURL, 9999999);
-            }
-            catch (Exception e)
-            {
-                Exception e2
-                    = new Exception(
-                        String.Format(
-                            "Unable to register region with grid at {0}. Grid service not running?", 
-                            serversInfo.GridURL),
-                        e);
-
-                throw e2;
-            }
-
-            Hashtable GridRespData = (Hashtable)GridResp.Value;
-            // Hashtable griddatahash = GridRespData;
-
-            // Process Response
-            if (GridRespData.ContainsKey("error"))
-            {
-                string errorstring = (string) GridRespData["error"];
-
-                Exception e = new Exception(
-                    String.Format("Unable to connect to grid at {0}: {1}", serversInfo.GridURL, errorstring));
-
-                throw e;
-            }
-            else
-            {
-                // m_knownRegions = RequestNeighbours(regionInfo.RegionLocX, regionInfo.RegionLocY);
-                if (GridRespData.ContainsKey("allow_forceful_banlines"))
-                {
-                    if ((string) GridRespData["allow_forceful_banlines"] != "TRUE")
-                    {
-                        //m_localBackend.SetForcefulBanlistsDisallowed(regionInfo.RegionHandle);
-                        if (!m_queuedGridSettings.ContainsKey("allow_forceful_banlines"))
-                            m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE");
-                    }
-                }
-
-                m_log.InfoFormat(
-                    "[OGS1 GRID SERVICES]: Region {0} successfully registered with grid at {1}",
-                    regionInfo.RegionName, serversInfo.GridURL);
-            }
-            
-            return m_localBackend.RegisterRegion(regionInfo);
-        }
-
-        // see IGridServices
-        public bool DeregisterRegion(RegionInfo regionInfo)
-        {
-            Hashtable GridParams = new Hashtable();
-
-            GridParams["UUID"] = regionInfo.RegionID.ToString();
-
-            // Package into an XMLRPC Request
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(GridParams);
-
-            // Send Request
-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_after_region_moved", SendParams);
-            XmlRpcResponse GridResp = null;
-            
-            try
-            {            
-                GridResp = GridReq.Send(serversInfo.GridURL, 10000);
-            }
-            catch (Exception e)
-            {
-                Exception e2
-                    = new Exception(
-                        String.Format(
-                            "Unable to deregister region with grid at {0}. Grid service not running?", 
-                            serversInfo.GridURL),
-                        e);
-
-                throw e2;
-            }
-        
-            Hashtable GridRespData = (Hashtable) GridResp.Value;
-
-            // Hashtable griddatahash = GridRespData;
-
-            // Process Response
-            if (GridRespData != null && GridRespData.ContainsKey("error"))
-            {
-                string errorstring = (string)GridRespData["error"];
-                m_log.Error("Unable to connect to grid: " + errorstring);
-                return false;
-            }
-
-            return m_localBackend.DeregisterRegion(regionInfo);
-        }
-
-        public virtual Dictionary<string, string> GetGridSettings()
-        {
-            Dictionary<string, string> returnGridSettings = new Dictionary<string, string>();
-            lock (m_queuedGridSettings)
-            {
-                foreach (string Dictkey in m_queuedGridSettings.Keys)
-                {
-                    returnGridSettings.Add(Dictkey, m_queuedGridSettings[Dictkey]);
-                }
-
-                m_queuedGridSettings.Clear();
-            }
-
-            return returnGridSettings;
-        }
-
-        // see IGridServices
-        public List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
-        {
-            Hashtable respData = MapBlockQuery((int) x - 1, (int) y - 1, (int) x + 1, (int) y + 1);
-
-            List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
-
-            foreach (ArrayList neighboursList in respData.Values)
-            {
-                foreach (Hashtable neighbourData in neighboursList)
-                {
-                    uint regX = Convert.ToUInt32(neighbourData["x"]);
-                    uint regY = Convert.ToUInt32(neighbourData["y"]);
-                    if ((x != regX) || (y != regY))
-                    {
-                        string simIp = (string) neighbourData["sim_ip"];
-
-                        uint port = Convert.ToUInt32(neighbourData["sim_port"]);
-                        // string externalUri = (string) neighbourData["sim_uri"];
-
-                        // string externalIpStr = String.Empty;
-                        try
-                        {
-                            // externalIpStr = Util.GetHostFromDNS(simIp).ToString();
-                            Util.GetHostFromDNS(simIp).ToString();
-                        }
-                        catch (SocketException e)
-                        {
-                            m_log.WarnFormat(
-                                "[OGS1 GRID SERVICES]: RequestNeighbours(): Lookup of neighbour {0} failed!  Not including in neighbours list.  {1}",
-                                simIp, e);
-
-                            continue;
-                        }
-
-                        SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port);
-
-                        sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]);
-
-                        if (neighbourData.ContainsKey("http_port"))
-                        {
-                            sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]);
-                        }
-                        else
-                        {
-                            m_log.Error("[OGS1 GRID SERVICES]: Couldn't find httpPort, using default 9000; please upgrade your grid-server to r7621 or later");
-                            sri.HttpPort = 9000; // that's the default and will probably be wrong
-                        }
-
-                        sri.RegionID = new UUID((string) neighbourData["uuid"]);
-
-                        neighbours.Add(sri);
-                    }
-                }
-            }
-
-            return neighbours;
-        }
-
-        /// <summary>
-        /// Request information about a region.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns>
-        /// null on a failure to contact or get a response from the grid server
-        /// FIXME: Might be nicer to return a proper exception here since we could inform the client more about the
-        /// nature of the faiulre.
-        /// </returns>
-        public RegionInfo RequestNeighbourInfo(UUID Region_UUID)
-        {
-            // don't ask the gridserver about regions on this instance...
-            foreach (RegionInfo info in m_regionsOnInstance)
-            {
-                if (info.RegionID == Region_UUID) return info;
-            }
-
-            // didn't find it so far, we have to go the long way
-            RegionInfo regionInfo;
-            Hashtable requestData = new Hashtable();
-            requestData["region_UUID"] = Region_UUID.ToString();
-            requestData["authkey"] = serversInfo.GridSendKey;
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(requestData);
-            XmlRpcRequest gridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-            XmlRpcResponse gridResp = null;
-
-            try
-            {
-                gridResp = gridReq.Send(serversInfo.GridURL, 3000);
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat(
-                    "[OGS1 GRID SERVICES]: Communication with the grid server at {0} failed, {1}",
-                    serversInfo.GridURL, e);
-
-                return null;
-            }
-
-            Hashtable responseData = (Hashtable)gridResp.Value;
-
-            if (responseData.ContainsKey("error"))
-            {
-                m_log.WarnFormat("[OGS1 GRID SERVICES]: Error received from grid server: {0}", responseData["error"]);
-                return null;
-            }
-
-            regionInfo = buildRegionInfo(responseData, String.Empty);
-            if ((m_useRemoteRegionCache) && (requestData.ContainsKey("regionHandle")))
-            {
-                m_remoteRegionInfoCache.Add(Convert.ToUInt64((string) requestData["regionHandle"]), regionInfo);
-            }
-
-            return regionInfo;
-        }
-
-        /// <summary>
-        /// Request information about a region.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
-        {
-            RegionInfo regionInfo = m_localBackend.RequestNeighbourInfo(regionHandle);
-
-            if (regionInfo != null)
-            {
-                return regionInfo;
-            }
-
-            if ((!m_useRemoteRegionCache) || (!m_remoteRegionInfoCache.TryGetValue(regionHandle, out regionInfo)))
-            {
-                try
-                {
-                    Hashtable requestData = new Hashtable();
-                    requestData["region_handle"] = regionHandle.ToString();
-                    requestData["authkey"] = serversInfo.GridSendKey;
-                    ArrayList SendParams = new ArrayList();
-                    SendParams.Add(requestData);
-                    XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-                    XmlRpcResponse GridResp = GridReq.Send(serversInfo.GridURL, 3000);
-
-                    Hashtable responseData = (Hashtable) GridResp.Value;
-
-                    if (responseData.ContainsKey("error"))
-                    {
-                        m_log.Error("[OGS1 GRID SERVICES]: Error received from grid server: " + responseData["error"]);
-                        return null;
-                    }
-
-                    uint regX = Convert.ToUInt32((string) responseData["region_locx"]);
-                    uint regY = Convert.ToUInt32((string) responseData["region_locy"]);
-                    string externalHostName = (string) responseData["sim_ip"];
-                    uint simPort = Convert.ToUInt32(responseData["sim_port"]);
-                    string regionName = (string)responseData["region_name"];
-                    UUID regionID = new UUID((string)responseData["region_UUID"]);
-                    uint remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
-                    
-                    uint httpPort = 9000;
-                    if (responseData.ContainsKey("http_port"))
-                    {
-                        httpPort = Convert.ToUInt32((string)responseData["http_port"]);
-                    }
-
-                    // Ok, so this is definitively the wrong place to do this, way too hard coded, but it doesn't seem we GET this info?
-
-                    string simURI = "http://" + externalHostName + ":" + simPort;
-
-                    // string externalUri = (string) responseData["sim_uri"];
-
-                    //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
-                    regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI);
-
-                    if (m_useRemoteRegionCache)
-                    {
-                        lock (m_remoteRegionInfoCache)
-                        {
-                            if (!m_remoteRegionInfoCache.ContainsKey(regionHandle))
-                            {
-                                m_remoteRegionInfoCache.Add(regionHandle, regionInfo);
-                            }
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[OGS1 GRID SERVICES]: " +
-                                "Region lookup failed for: " + regionHandle.ToString() +
-                                " - Is the GridServer down?" + e.ToString());
-                    return null;
-                }
-            }
-
-            return regionInfo;
-        }
-
-        /// <summary>
-        /// Get information about a neighbouring region
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionInfo RequestNeighbourInfo(string name)
-        {
-            // Not implemented yet
-            return null;
-        }
-
-        /// <summary>
-        /// Get information about a neighbouring region
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionInfo RequestNeighbourInfo(string host, uint port)
-        {
-            // Not implemented yet
-            return null;
-        }
-
-        public RegionInfo RequestClosestRegion(string regionName)
-        {
-            if (m_useRemoteRegionCache)
-            {
-                foreach (RegionInfo ri in m_remoteRegionInfoCache.Values)
-                {
-                    if (ri.RegionName == regionName)
-                        return ri;
-                }
-            }
-
-            RegionInfo regionInfo = null;
-            try
-            {
-                Hashtable requestData = new Hashtable();
-                requestData["region_name_search"] = regionName;
-                requestData["authkey"] = serversInfo.GridSendKey;
-                ArrayList SendParams = new ArrayList();
-                SendParams.Add(requestData);
-                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-                XmlRpcResponse GridResp = GridReq.Send(serversInfo.GridURL, 3000);
-
-                Hashtable responseData = (Hashtable) GridResp.Value;
-
-                if (responseData.ContainsKey("error"))
-                {
-                    m_log.ErrorFormat("[OGS1 GRID SERVICES]: Error received from grid server: ", responseData["error"]);
-                    return null;
-                }
-
-                regionInfo = buildRegionInfo(responseData, "");
-
-                if ((m_useRemoteRegionCache) && (!m_remoteRegionInfoCache.ContainsKey(regionInfo.RegionHandle)))
-                    m_remoteRegionInfoCache.Add(regionInfo.RegionHandle, regionInfo);
-            }
-            catch
-            {
-                m_log.Error("[OGS1 GRID SERVICES]: " +
-                            "Region lookup failed for: " + regionName +
-                            " - Is the GridServer down?");
-            }
-
-            return regionInfo;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="minX"></param>
-        /// <param name="minY"></param>
-        /// <param name="maxX"></param>
-        /// <param name="maxY"></param>
-        /// <returns></returns>
-        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            int temp = 0;
-
-            if (minX > maxX)
-            {
-                temp = minX;
-                minX = maxX;
-                maxX = temp;
-            }
-            if (minY > maxY)
-            {
-                temp = minY;
-                minY = maxY;
-                maxY = temp;
-            }
-
-            Hashtable respData = MapBlockQuery(minX, minY, maxX, maxY);
-
-            List<MapBlockData> neighbours = new List<MapBlockData>();
-
-            foreach (ArrayList a in respData.Values)
-            {
-                foreach (Hashtable n in a)
-                {
-                    MapBlockData neighbour = new MapBlockData();
-
-                    neighbour.X = Convert.ToUInt16(n["x"]);
-                    neighbour.Y = Convert.ToUInt16(n["y"]);
-
-                    neighbour.Name = (string) n["name"];
-                    neighbour.Access = Convert.ToByte(n["access"]);
-                    neighbour.RegionFlags = Convert.ToUInt32(n["region-flags"]);
-                    neighbour.WaterHeight = Convert.ToByte(n["water-height"]);
-                    neighbour.MapImageId = new UUID((string) n["map-image-id"]);
-
-                    neighbours.Add(neighbour);
-                }
-            }
-
-            return neighbours;
-        }
-
-        /// <summary>
-        /// Performs a XML-RPC query against the grid server returning mapblock information in the specified coordinates
-        /// </summary>
-        /// <remarks>REDUNDANT - OGS1 is to be phased out in favour of OGS2</remarks>
-        /// <param name="minX">Minimum X value</param>
-        /// <param name="minY">Minimum Y value</param>
-        /// <param name="maxX">Maximum X value</param>
-        /// <param name="maxY">Maximum Y value</param>
-        /// <returns>Hashtable of hashtables containing map data elements</returns>
-        private Hashtable MapBlockQuery(int minX, int minY, int maxX, int maxY)
-        {
-            Hashtable param = new Hashtable();
-            param["xmin"] = minX;
-            param["ymin"] = minY;
-            param["xmax"] = maxX;
-            param["ymax"] = maxY;
-            IList parameters = new ArrayList();
-            parameters.Add(param);
-            
-            try
-            {
-                XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);
-                XmlRpcResponse resp = req.Send(serversInfo.GridURL, 10000);
-                Hashtable respData = (Hashtable) resp.Value;
-                return respData;
-            }
-            catch (Exception e)
-            {
-                m_log.Error("MapBlockQuery XMLRPC failure: " + e);
-                return new Hashtable();
-            }
-        }
-
-        /// <summary>
-        /// A ping / version check
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse PingCheckReply(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-
-            Hashtable respData = new Hashtable();
-            respData["online"] = "true";
-
-            m_localBackend.PingCheckReply(respData);
-
-            response.Value = respData;
-
-            return response;
-        }
-
-        /// <summary>
-        /// Received from the user server when a user starts logging in.  This call allows
-        /// the region to prepare for direct communication from the client.  Sends back an empty
-        /// xmlrpc response on completion.
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse ExpectUser(XmlRpcRequest request)
-        {            
-            Hashtable requestData = (Hashtable) request.Params[0];
-            AgentCircuitData agentData = new AgentCircuitData();
-            agentData.SessionID = new UUID((string) requestData["session_id"]);
-            agentData.SecureSessionID = new UUID((string) requestData["secure_session_id"]);
-            agentData.firstname = (string) requestData["firstname"];
-            agentData.lastname = (string) requestData["lastname"];
-            agentData.AgentID = new UUID((string) requestData["agent_id"]);
-            agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-            agentData.CapsPath = (string)requestData["caps_path"];
-            ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]);
-
-            // Appearance
-            if (requestData["appearance"] != null)
-                agentData.Appearance = new AvatarAppearance((Hashtable)requestData["appearance"]);
-
-            m_log.DebugFormat(
-                "[CLIENT]: Told by user service to prepare for a connection from {0} {1} {2}, circuit {3}",
-                agentData.firstname, agentData.lastname, agentData.AgentID, agentData.circuitcode);            
-
-            if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
-            {
-                //m_log.Debug("[CLIENT]: Child agent detected");
-                agentData.child = true;
-            }
-            else
-            {
-                //m_log.Debug("[CLIENT]: Main agent detected");
-                agentData.startpos =
-                    new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
-                                  (float)Convert.ToDecimal((string)requestData["startpos_y"]),
-                                  (float)Convert.ToDecimal((string)requestData["startpos_z"]));
-                agentData.child = false;
-            }
-
-            XmlRpcResponse resp = new XmlRpcResponse();
-                        
-            if (!RegionLoginsEnabled)
-            {
-                m_log.InfoFormat(
-                    "[CLIENT]: Denying access for user {0} {1} because region login is currently disabled",
-                    agentData.firstname, agentData.lastname);
-
-                Hashtable respdata = new Hashtable();
-                respdata["success"] = "FALSE";
-                respdata["reason"] = "region login currently disabled";
-                resp.Value = respdata;                
-            }
-            else
-            {
-                RegionInfo[] regions = m_regionsOnInstance.ToArray();
-                bool banned = false;
-
-                for (int i = 0; i < regions.Length; i++)
-                {
-                    if (regions[i] != null)
-                    {
-                        if (regions[i].RegionHandle == regionHandle)
-                        {
-                            if (regions[i].EstateSettings.IsBanned(agentData.AgentID))
-                            {
-                                banned = true;
-                                break;
-                            }
-                        }
-                    }
-                }                
-            
-                if (banned)
-                {
-                    m_log.InfoFormat(
-                        "[CLIENT]: Denying access for user {0} {1} because user is banned",
-                        agentData.firstname, agentData.lastname);
-
-                    Hashtable respdata = new Hashtable();
-                    respdata["success"] = "FALSE";
-                    respdata["reason"] = "banned";
-                    resp.Value = respdata;
-                }
-                else
-                {
-                    m_localBackend.TriggerExpectUser(regionHandle, agentData);
-                    Hashtable respdata = new Hashtable();
-                    respdata["success"] = "TRUE";
-                    resp.Value = respdata;
-                }
-            }
-
-            return resp;
-        }
-        
-        // Grid Request Processing
-        /// <summary>
-        /// Ooops, our Agent must be dead if we're getting this request!
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse LogOffUser(XmlRpcRequest request)
-        {
-            m_log.Debug("[CONNECTION DEBUGGING]: LogOff User Called");
-            
-            Hashtable requestData = (Hashtable)request.Params[0];
-            string message = (string)requestData["message"];
-            UUID agentID = UUID.Zero;
-            UUID RegionSecret = UUID.Zero;
-            UUID.TryParse((string)requestData["agent_id"], out agentID);
-            UUID.TryParse((string)requestData["region_secret"], out RegionSecret);
-
-            ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
-
-            m_localBackend.TriggerLogOffUser(regionHandle, agentID, RegionSecret,message);
-
-            return new XmlRpcResponse();
-        }
-
-        public void NoteDeadRegion(ulong regionhandle)
-        {
-            lock (m_deadRegionCache)
-            {
-                if (m_deadRegionCache.ContainsKey(regionhandle))
-                {
-                    m_deadRegionCache[regionhandle] = m_deadRegionCache[regionhandle] + 1;
-                }
-                else
-                {
-                    m_deadRegionCache.Add(regionhandle, 1);
-                }
-            }
-        }
-
-        public LandData RequestLandData (ulong regionHandle, uint x, uint y)
-        {
-            m_log.DebugFormat("[OGS1 GRID SERVICES] requests land data in {0}, at {1}, {2}",
-                              regionHandle, x, y);
-            LandData landData = m_localBackend.RequestLandData(regionHandle, x, y);
-            if (landData == null)
-            {
-                Hashtable hash = new Hashtable();
-                hash["region_handle"] = regionHandle.ToString();
-                hash["x"] = x.ToString();
-                hash["y"] = y.ToString();
-
-                IList paramList = new ArrayList();
-                paramList.Add(hash);
-
-                try
-                {
-                    // this might be cached, as we probably requested it just a moment ago...
-                    RegionInfo info = RequestNeighbourInfo(regionHandle);
-                    if (info != null) // just to be sure
-                    {
-                        XmlRpcRequest request = new XmlRpcRequest("land_data", paramList);
-                        string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
-                        XmlRpcResponse response = request.Send(uri, 10000);
-                        if (response.IsFault)
-                        {
-                            m_log.ErrorFormat("[OGS1 GRID SERVICES] remote call returned an error: {0}", response.FaultString);
-                        }
-                        else
-                        {
-                            hash = (Hashtable)response.Value;
-                            try
-                            {
-                                landData = new LandData();
-                                landData.AABBMax = Vector3.Parse((string)hash["AABBMax"]);
-                                landData.AABBMin = Vector3.Parse((string)hash["AABBMin"]);
-                                landData.Area = Convert.ToInt32(hash["Area"]);
-                                landData.AuctionID = Convert.ToUInt32(hash["AuctionID"]);
-                                landData.Description = (string)hash["Description"];
-                                landData.Flags = Convert.ToUInt32(hash["Flags"]);
-                                landData.GlobalID = new UUID((string)hash["GlobalID"]);
-                                landData.Name = (string)hash["Name"];
-                                landData.OwnerID = new UUID((string)hash["OwnerID"]);
-                                landData.SalePrice = Convert.ToInt32(hash["SalePrice"]);
-                                landData.SnapshotID = new UUID((string)hash["SnapshotID"]);
-                                landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]);
-                                m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name);
-                            }
-                            catch (Exception e)
-                            {
-                                m_log.Error("[OGS1 GRID SERVICES] Got exception while parsing land-data:", e);
-                            }
-                        }
-                    }
-                    else m_log.WarnFormat("[OGS1 GRID SERVICES] Couldn't find region with handle {0}", regionHandle);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[OGS1 GRID SERVICES] Couldn't contact region {0}: {1}", regionHandle, e);
-                }
-            }
-            return landData;
-        }
-
-        // Grid Request Processing
-        /// <summary>
-        /// Someone asked us about parcel-information
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse LandData(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]);
-            uint x = Convert.ToUInt32(requestData["x"]);
-            uint y = Convert.ToUInt32(requestData["y"]);
-            m_log.DebugFormat("[OGS1 GRID SERVICES]: Got XML reqeuest for land data at {0}, {1} in region {2}", x, y, regionHandle);
-
-            LandData landData = m_localBackend.RequestLandData(regionHandle, x, y);
-            Hashtable hash = new Hashtable();
-            if (landData != null)
-            {
-                // for now, only push out the data we need for answering a ParcelInfoReqeust
-                hash["AABBMax"] = landData.AABBMax.ToString();
-                hash["AABBMin"] = landData.AABBMin.ToString();
-                hash["Area"] = landData.Area.ToString();
-                hash["AuctionID"] = landData.AuctionID.ToString();
-                hash["Description"] = landData.Description;
-                hash["Flags"] = landData.Flags.ToString();
-                hash["GlobalID"] = landData.GlobalID.ToString();
-                hash["Name"] = landData.Name;
-                hash["OwnerID"] = landData.OwnerID.ToString();
-                hash["SalePrice"] = landData.SalePrice.ToString();
-                hash["SnapshotID"] = landData.SnapshotID.ToString();
-                hash["UserLocation"] = landData.UserLocation.ToString();
-            }
-
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = hash;
-            return response;
-        }
-
-        public List<RegionInfo> RequestNamedRegions (string name, int maxNumber)
-        {
-            // no asking of the local backend first, here, as we have to ask the gridserver anyway.
-            Hashtable hash = new Hashtable();
-            hash["name"] = name;
-            hash["maxNumber"] = maxNumber.ToString();
-
-            IList paramList = new ArrayList();
-            paramList.Add(hash);
-
-            Hashtable result = XmlRpcSearchForRegionByName(paramList);
-            if (result == null) return null;
-
-            uint numberFound = Convert.ToUInt32(result["numFound"]);
-            List<RegionInfo> infos = new List<RegionInfo>();
-            for (int i = 0; i < numberFound; ++i)
-            {
-                string prefix = "region" + i + ".";
-                RegionInfo info = buildRegionInfo(result, prefix);
-                infos.Add(info);
-            }
-            return infos;
-        }
-
-        private RegionInfo buildRegionInfo(Hashtable responseData, string prefix)
-        {
-            uint regX = Convert.ToUInt32((string) responseData[prefix + "region_locx"]);
-            uint regY = Convert.ToUInt32((string) responseData[prefix + "region_locy"]);
-            string internalIpStr = (string) responseData[prefix + "sim_ip"];
-            uint port = Convert.ToUInt32(responseData[prefix + "sim_port"]);
-
-            IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(internalIpStr), (int) port);
-
-            RegionInfo regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
-            regionInfo.RemotingPort = Convert.ToUInt32((string) responseData[prefix + "remoting_port"]);
-            regionInfo.RemotingAddress = internalIpStr;
-
-            if (responseData.ContainsKey(prefix + "http_port"))
-            {
-                regionInfo.HttpPort = Convert.ToUInt32((string) responseData[prefix + "http_port"]);
-            }
-
-            regionInfo.RegionID = new UUID((string) responseData[prefix + "region_UUID"]);
-            regionInfo.RegionName = (string) responseData[prefix + "region_name"];
-
-            regionInfo.RegionSettings.TerrainImageID = new UUID((string) responseData[prefix + "map_UUID"]);
-            return regionInfo;
-        }
-
-        private Hashtable XmlRpcSearchForRegionByName(IList parameters)
-        {
-            try
-            {
-                XmlRpcRequest request = new XmlRpcRequest("search_for_region_by_name", parameters);
-                XmlRpcResponse resp = request.Send(serversInfo.GridURL, 10000);
-                Hashtable respData = (Hashtable) resp.Value;
-                if (respData != null && respData.Contains("faultCode"))
-                {
-                    m_log.WarnFormat("[OGS1 GRID SERVICES]: Got an error while contacting GridServer: {0}", respData["faultString"]);
-                    return null;
-                }
-
-                return respData;
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[OGS1 GRID SERVICES]: MapBlockQuery XMLRPC failure: ", e);
-                return null;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
index 01d6ec8..2f9a45f 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Communications.OGS1
         public virtual void AddTemporaryUserProfile(UserProfileData userProfile)
         {
             // Not interested
-        }        
+        }
         
         public UserProfileData GetUserByUri(Uri uri)
         {
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Communications.OGS1
                 userData.Partner = UUID.Zero;
 
             return userData;
-        }            
+        }
 
         protected AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data)
         {
@@ -766,6 +766,6 @@ namespace OpenSim.Region.Communications.OGS1
             }
 
             return buddylist;
-        }        
+        }
     }
 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index dff8305..ed3526d 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -41,7 +41,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Clients;
 
 namespace OpenSim.Region.Communications.OGS1
-{        
+{
     public class OGS1UserServices : UserManagerBase
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.OGS1
             catch (WebException)
             {
                 m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff");
-            }   
+            }
         }
             
         /// <summary>
@@ -140,6 +140,37 @@ namespace OpenSim.Region.Communications.OGS1
         {
             m_log.DebugFormat("[OGS1 USER SERVICES]: Verifying user session for " + userID);
             return AuthClient.VerifySession(GetUserServerURL(userID), userID, sessionID);
-        }  
+        }
+
+        public override bool AuthenticateUserByPassword(UUID userID, string password)
+        {
+            Hashtable param = new Hashtable();
+            param["user_uuid"] = userID.ToString();
+            param["password"] = password;
+            IList parameters = new ArrayList();
+            parameters.Add(param);
+            XmlRpcRequest req = new XmlRpcRequest("authenticate_user_by_password", parameters);
+            XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
+
+            // Temporary measure to deal with older services
+            if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD)
+            {
+                throw new Exception(
+                    String.Format(
+                        "XMLRPC method 'authenticate_user_by_password' not yet implemented by user service at {0}",
+                        m_commsManager.NetworkServersInfo.UserURL));
+            }
+
+            Hashtable respData = (Hashtable)resp.Value;
+
+            if ((string)respData["auth_user"] == "TRUE")
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index addc36b..9c646b6 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
 
             transactions.RequestUpdateTaskInventoryItem(remoteClient, part, transactionID, item);
-        }               
+        }
 
         /// <summary>
         /// Request that a client (agent) begin an asset transfer.
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 0c6900d..2a1355b 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -49,9 +49,9 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
         /// </summary>
         protected Dictionary<UUID, Caps> m_capsHandlers = new Dictionary<UUID, Caps>();
         
-        protected Dictionary<UUID, string> capsPaths = new Dictionary<UUID, string>();               
+        protected Dictionary<UUID, string> capsPaths = new Dictionary<UUID, string>();
         protected Dictionary<UUID, Dictionary<ulong, string>> childrenSeeds 
-            = new Dictionary<UUID, Dictionary<ulong, string>>();        
+            = new Dictionary<UUID, Dictionary<ulong, string>>();
         
         public void Initialise(IConfigSource source)
         {
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
                         agentId, m_scene.RegionInfo.RegionName);
                 }
             }
-        }        
+        }
         
         public Caps GetCapsHandlerForUser(UUID agentId)
         {
@@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
             }
 
             return null;
-        }        
+        }
         
         public Dictionary<ulong, string> GetChildrenSeeds(UUID agentID)
         {
@@ -225,6 +225,6 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
                 y = y / Constants.RegionSize;
                 m_log.Info(" >> "+x+", "+y+": "+kvp.Value);
             }
-        }        
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs
index 394b1bb..8502006 100644
--- a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs
+++ b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
         {
             // Only need to run through all this if there are entries in the ban list
             if (bans.Count > 0)
-            {                
+            {
                 IClientIPEndpoint ipEndpoint;
                 if (client.TryGet(out ipEndpoint))
                 {
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index a1e27f1..5a5ad7e 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Asset
     /// <para>
     /// Cache is enabled by setting "AssetCaching" configuration to value "CenomeMemoryAssetCache". 
     /// When cache is successfully enable log should have message 
-    /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)".    
+    /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)".
     /// </para>
     /// <para>
     /// Cache's size is limited by two parameters:
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
         /// <summary>
         /// Asset's default expiration time in the cache.
-        /// </summary>        
+        /// </summary>
         public static readonly TimeSpan DefaultExpirationTime = TimeSpan.FromMinutes(30.0);
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index d85d3df..817e0d4 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -142,7 +142,7 @@ namespace Flotsam.RegionModules.AssetCache
                     m_CacheDirectory = assetConfig.GetString("CacheDirectory", m_DefaultCacheDirectory);
                     m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Cache Directory", m_DefaultCacheDirectory);
 
-                    m_MemoryCacheEnabled = assetConfig.GetBoolean("MemoryCacheEnabled", true);
+                    m_MemoryCacheEnabled = assetConfig.GetBoolean("MemoryCacheEnabled", false);
                     m_MemoryExpiration = TimeSpan.FromHours(assetConfig.GetDouble("MemoryCacheTimeout", m_DefaultMemoryExpiration));
 
 #if WAIT_ON_INPROGRESS_REQUESTS
@@ -150,7 +150,7 @@ namespace Flotsam.RegionModules.AssetCache
 #endif
 
                     m_LogLevel = assetConfig.GetInt("LogLevel", 1);
-                    m_HitRateDisplay = (ulong)assetConfig.GetInt("HitRateDisplay", 1);
+                    m_HitRateDisplay = (ulong)assetConfig.GetInt("HitRateDisplay", 1000);
 
                     m_FileExpiration = TimeSpan.FromHours(assetConfig.GetDouble("FileCacheTimeout", m_DefaultFileExpiration));
                     m_FileExpirationCleanupTimer = TimeSpan.FromHours(assetConfig.GetDouble("FileCleanupTimer", m_DefaultFileExpiration));
@@ -470,7 +470,7 @@ namespace Flotsam.RegionModules.AssetCache
             else if (dirSize >= m_CacheWarnAt)
             {
                 m_log.WarnFormat("[FLOTSAM ASSET CACHE]: Cache folder exceeded CacheWarnAt limit {0} {1}.  Suggest increasing tiers, tier length, or reducing cache expiration", dir, dirSize);
-            }            
+            }
         }
 
         private string GetFileName(string id)
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index fcc2673..66a9b5a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                     scene.EventManager.OnChatBroadcast -= OnChatBroadcast;
                     m_scenes.Remove(scene);
                 }
-            }            
+            }
         }
         
         public virtual void Close()
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 046fc4a..ebebaf9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                 this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand);
 
             m_scene.AddCommand(
-                this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);            
+                this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);
         }
         
         public void PostInitialise() {}
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         public void SendAlertToUser(IClientAPI client, string message)
         {
             SendAlertToUser(client, message, false);
-        }          
+        }
         
         public void SendAlertToUser(IClientAPI client, string message, bool modal)
         {
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         public void SendAlertToUser(UUID agentID, string message)
         {
             SendAlertToUser(agentID, message, false);
-        }          
+        }
         
         public void SendAlertToUser(UUID agentID, string message, bool modal)
         {
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             
             if (sp != null)
                 sp.ControllingClient.SendAgentAlertMessage(message, modal);
-        }           
+        }
         
         public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
         {
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                     break;
                 }
             }
-        }     
+        }
         
         public void SendGeneralAlert(string message)
         {
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                 if (!presence.IsChildAgent)
                     presence.ControllingClient.SendAlertMessage(message);
             }
-        }    
+        }
 
         public void SendDialogToUser(
             UUID avatarID, string objectName, UUID objectID, UUID ownerID,
@@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         {
             ScenePresence sp = m_scene.GetScenePresence(avatarID);
             
-            if (sp != null)            
+            if (sp != null)
                 sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
-        }        
+        }
         
         public void SendNotificationToUsersInEstate(
             UUID fromAvatarID, string fromAvatarName, string message)
@@ -145,11 +145,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             // TODO: This does not yet do what it says on the tin - it only sends the message to users in the same
             // region as the sending avatar.
             SendNotificationToUsersInRegion(fromAvatarID, fromAvatarName, message);
-        }        
+        }
         
         public void SendNotificationToUsersInRegion(
             UUID fromAvatarID, string fromAvatarName, string message)
-        {        
+        {
             List<ScenePresence> presenceList = m_scene.GetScenePresences();
 
             foreach (ScenePresence presence in presenceList)
@@ -185,7 +185,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                 
                 m_log.InfoFormat(
                     "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", 
-                    m_scene.RegionInfo.RegionName, firstName, lastName, message);  
+                    m_scene.RegionInfo.RegionName, firstName, lastName, message);
                 SendAlertToUser(firstName, lastName, message, false);
             }
         }
@@ -199,6 +199,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             }
             
             return result;
-        }        
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 49b2b5c..fc7d63a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
@@ -108,7 +109,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         private Dictionary<ulong, Scene> m_scenes = new Dictionary<ulong,Scene>();
         private IMessageTransferModule m_TransferModule = null;
 
-        private IGridServices m_gridServices = null;
+        private IGridService m_gridServices = null;
 
         #region IRegionModule Members
 
@@ -142,7 +143,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             if (m_scenes.Count > 0)
             {
                 m_TransferModule = m_initialScene.RequestModuleInterface<IMessageTransferModule>();
-                m_gridServices = m_initialScene.CommsManager.GridService;
+                m_gridServices = m_initialScene.GridService;
             }
             if (m_TransferModule == null)
                 m_log.Error("[FRIENDS]: Unable to find a message transfer module, friendship offers will not work");
@@ -171,7 +172,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             List<UUID> tpdAway = new List<UUID>();
 
             // destRegionHandle is a region on another server
-            RegionInfo info = m_gridServices.RequestNeighbourInfo(destRegionHandle);
+            uint x = 0, y = 0;
+            Utils.LongToUInts(destRegionHandle, out x, out y);
+            GridRegion info = m_gridServices.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID, (int)x, (int)y);
             if (info != null)
             {
                 string httpServer = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/presence_update_bulk";
@@ -223,7 +226,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         public bool TriggerTerminateFriend(ulong destRegionHandle, UUID agentID, UUID exFriendID)
         {
             // destRegionHandle is a region on another server
-            RegionInfo info = m_gridServices.RequestNeighbourInfo(destRegionHandle);
+            uint x = 0, y = 0;
+            Utils.LongToUInts(destRegionHandle, out x, out y);
+            GridRegion info = m_gridServices.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID, (int)x, (int)y);
             if (info == null)
             {
                 m_log.WarnFormat("[OGS1 GRID SERVICES]: Couldn't find region {0}", destRegionHandle);
@@ -492,7 +497,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             {
                 m_log.ErrorFormat("[FRIENDS]: No user found for id {0} in OfferFriendship()", fromUserId);
             }
-        }        
+        }
 
         #region FriendRequestHandling
 
@@ -503,7 +508,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             if (im.dialog == (byte)InstantMessageDialog.FriendshipOffered) // 38
             {
-                // fromAgentName is the *destination* name (the friend we offer friendship to)                
+                // fromAgentName is the *destination* name (the friend we offer friendship to)
                 ScenePresence initiator = GetAnyPresenceFromAgentID(new UUID(im.fromAgentID));
                 im.fromAgentName = initiator != null ? initiator.Name : "(hippo)";
                 
@@ -523,13 +528,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         /// Invoked when a user offers a friendship.
         /// </summary>
         /// 
-        /// <param name="im"></param>    
+        /// <param name="im"></param>
         /// <param name="client"></param>
         private void FriendshipOffered(GridInstantMessage im)
         {
             // this is triggered by the initiating agent:
             // A local agent offers friendship to some possibly remote friend.
-            // A IM is triggered, processed here and sent to the friend (possibly in a remote region).           
+            // A IM is triggered, processed here and sent to the friend (possibly in a remote region).
 
             m_log.DebugFormat("[FRIEND]: Offer(38) - From: {0}, FromName: {1} To: {2}, Session: {3}, Message: {4}, Offline {5}",
                        im.fromAgentID, im.fromAgentName, im.toAgentID, im.imSessionID, im.message, im.offline);
@@ -554,7 +559,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                         m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
                     }
                 );
-            }            
+            }
         }
         
         /// <summary>
@@ -565,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         private void FriendshipAccepted(IClientAPI client, GridInstantMessage im)
         {
             m_log.DebugFormat("[FRIEND]: 39 - from client {0}, agent {2} {3}, imsession {4} to {5}: {6} (dialog {7})",
-              client.AgentId, im.fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog);            
+              client.AgentId, im.fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog);
         }
         
         /// <summary>
@@ -597,7 +602,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 delegate(bool success) {
                     m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
                 }
-            );            
+            );
         }
 
         private void OnGridInstantMessage(GridInstantMessage msg)
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index ff12361..8ce5092 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -91,6 +91,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
             else 
                 m_log.ErrorFormat(
                     "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name);
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 8926527..f941728 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
         {
             m_scene = scene;
             m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
-            m_scene.RegisterModuleInterface<IGodsModule>(this);           
+            m_scene.RegisterModuleInterface<IGodsModule>(this);
         }
         
         public void PostInitialise() {}
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
                         m_dialogModule.SendAlertToUser(agentID, "Request for god powers denied");
                 }
             }
-        }        
+        }
         
         /// <summary>
         /// Kicks User specified from the simulator. This logs them off of the grid
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
                     }
                 }
                 else
-                {                  
+                {
                     m_dialogModule.SendAlertToUser(godID, "Kick request denied");
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 66f1e14..9a68749 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
     public class InstantMessageModule : IRegionModule
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <value>
         /// Is this module enabled?
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 4495303..e5159b3 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -36,6 +36,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
@@ -497,7 +498,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             {
                 if (upd.AgentOnline)
                 {
-                    RegionInfo reginfo = m_Scenes[0].SceneGridService.RequestNeighbouringRegionInfo(upd.Handle);
+                    uint x = 0, y = 0;
+                    Utils.LongToUInts(upd.Handle, out x, out y);
+                    GridRegion reginfo = m_Scenes[0].GridService.GetRegionByPosition(m_Scenes[0].RegionInfo.ScopeID,
+                        (int)x, (int)y);
                     if (reginfo != null)
                     {
                         Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im);
@@ -559,7 +563,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         /// <param name="reginfo">RegionInfo we pull the data out of to send the request to</param>
         /// <param name="xmlrpcdata">The Instant Message data Hashtable</param>
         /// <returns>Bool if the message was successfully delivered at the other side.</returns>
-        protected virtual bool doIMSending(RegionInfo reginfo, Hashtable xmlrpcdata)
+        protected virtual bool doIMSending(GridRegion reginfo, Hashtable xmlrpcdata)
         {
 
             ArrayList SendParams = new ArrayList();
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index ebd9a72..ad05bab 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -35,6 +35,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
@@ -171,7 +172,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                             {
                                 // TODO this is the old messaging-server protocol; only the regionHandle is available.
                                 // Fetch region-info to get the id
-                                RegionInfo regionInfo = m_initialScene.RequestNeighbouringRegionInfo(info.regionHandle);
+                                uint x = 0, y = 0;
+                                Utils.LongToUInts(info.regionHandle, out x, out y);
+                                GridRegion regionInfo = m_initialScene.GridService.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID,
+                                    (int)x, (int)y);
                                 regionID = regionInfo.RegionID;
                             }
                             result[indices[i]] = new PresenceInfo(uuids[i], regionID);
@@ -349,6 +353,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void NotifyMessageServerOfShutdown(Scene scene)
         {
+            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
+                return;
+            
             Hashtable xmlrpcdata = new Hashtable();
             xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString();
             ArrayList SendParams = new ArrayList();
@@ -372,6 +379,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void NotifyMessageServerOfAgentLocation(UUID agentID, UUID region, ulong regionHandle)
         {
+            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
+                return;
+
             Hashtable xmlrpcdata = new Hashtable();
             xmlrpcdata["AgentID"] = agentID.ToString();
             xmlrpcdata["RegionUUID"] = region.ToString();
@@ -397,6 +407,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void NotifyMessageServerOfAgentLeaving(UUID agentID, UUID region, ulong regionHandle)
         {
+            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
+                return;
+
             Hashtable xmlrpcdata = new Hashtable();
             xmlrpcdata["AgentID"] = agentID.ToString();
             xmlrpcdata["RegionUUID"] = region.ToString();
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 907e2d4..f761bf0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <value>
         /// We only use this to request modules
         /// </value>
-        protected Scene m_scene;        
+        protected Scene m_scene;
 
         /// <value>
         /// The stream from which the inventory archive will be loaded.
@@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         item.Folder = foundFolder.ID;
 
                         //m_userInfo.AddItem(item);
-                        m_scene.InventoryService.AddItem(item);                        
+                        m_scene.InventoryService.AddItem(item);
                         successfulItemRestores++;
 
                         // If we're loading an item directly into the given destination folder then we need to record
@@ -299,14 +299,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     = new InventoryFolderBase(
                         newFolderId, newFolderName, m_userInfo.UserProfile.ID, 
                         (short)AssetType.Unknown, destFolder.ID, 1);
-                m_scene.InventoryService.AddFolder(destFolder);               
+                m_scene.InventoryService.AddFolder(destFolder);
                 
 //                UUID newFolderId = UUID.Random();
 //                m_scene.InventoryService.AddFolder(
 //                m_userInfo.CreateFolder(
 //                    folderName, newFolderId, (ushort)AssetType.Folder, foundFolder.ID);
 
-//                m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName);                
+//                m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName);
 //                foundFolder = foundFolder.GetChildFolder(newFolderId);
 //                m_log.DebugFormat(
 //                    "[INVENTORY ARCHIVER]: Retrieved newly created folder {0} with ID {1}", 
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     nodesLoaded.Add(destFolder);
 
                 i++;
-            }         
+            }
             
             return destFolder;
             
@@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     rawFolders[i++], newFolderId, (ushort)AssetType.Folder, foundFolder.ID);
                 foundFolder = foundFolder.GetChildFolder(newFolderId);
             }
-            */            
+            */
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
index 5ebf2fa..a822d10 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         /// <summary>
         /// Find a folder given a PATH_DELIMITER delimited path starting from a user's root folder
-        /// </summary>        
+        /// </summary>
         ///
         /// This method does not handle paths that contain multiple delimitors
         ///
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// User id to search
         /// </param>
         /// <param name="path">
-        /// The path to the required folder.  
+        /// The path to the required folder.
         /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
         /// </param>
         /// <returns>null if the folder is not found</returns>
@@ -71,11 +71,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 return null;
 
             return FindFolderByPath(inventoryService, rootFolder, path);
-        }        
+        }
         
         /// <summary>
         /// Find a folder given a PATH_DELIMITER delimited path starting from this folder
-        /// </summary>        
+        /// </summary>
         ///
         /// This method does not handle paths that contain multiple delimitors
         ///
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// The folder from which the path starts
         /// </param>
         /// <param name="path">
-        /// The path to the required folder.  
+        /// The path to the required folder.
         /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
         /// </param>
         /// <returns>null if the folder is not found</returns>
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 return null;
 
             return FindItemByPath(inventoryService, rootFolder, path);
-        }        
+        }
         
         /// <summary>
         /// Find an item given a PATH_DELIMITOR delimited path starting from this folder.
@@ -194,7 +194,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
             else
             {
-                InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);                
+                InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);
                 
                 foreach (InventoryFolderBase folder in contents.Folders)
                 {
@@ -205,6 +205,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             // We didn't find an item or intermediate folder with the given name
             return null;
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 7b4a9eb..499c552 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         private InventoryArchiverModule m_module;
         private CachedUserInfo m_userInfo;
-        private string m_invPath;        
+        private string m_invPath;
         protected TarArchiveWriter m_archiveWriter;
         protected UuidGatherer m_assetGatherer;
 
@@ -118,6 +118,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)
         {
+            // We're almost done.  Just need to write out the control file now
+            m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p1ControlFile());
+            m_log.InfoFormat("[ARCHIVER]: Added control file to archive.");
+            
             Exception reportedException = null;
             bool succeeded = true;
 
@@ -164,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             {
                 path += CreateArchiveFolderName(inventoryFolder);
 
-                // We need to make sure that we record empty folders            
+                // We need to make sure that we record empty folders
                 m_archiveWriter.WriteDir(path);
             }
 
@@ -258,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD)
             {
                 foundStar = true;
-                maxComponentIndex--;                
+                maxComponentIndex--;
             }
 
             m_invPath = String.Empty;
@@ -320,7 +324,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH, !foundStar);
             }
 
-            SaveUsers();
+            // Don't put all this profile information into the archive right now.
+            //SaveUsers();
+            
             new AssetsRequest(
                 new AssetsArchiver(m_archiveWriter), m_assetUuids.Keys, 
                 m_scene.AssetService, ReceivedAllAssets).Execute();
@@ -363,8 +369,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <returns></returns>
         public static string CreateArchiveFolderName(InventoryFolderBase folder)
         {
-            return CreateArchiveFolderName(folder.Name, folder.ID);          
-        }        
+            return CreateArchiveFolderName(folder.Name, folder.ID);
+        }
 
         /// <summary>
         /// Create the archive name for a particular item.
@@ -377,7 +383,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <returns></returns>
         public static string CreateArchiveItemName(InventoryItemBase item)
         {
-            return CreateArchiveItemName(item.Name, item.ID);          
+            return CreateArchiveItemName(item.Name, item.ID);
         }
 
         /// <summary>
@@ -392,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 "{0}{1}{2}/",
                 name,
                 ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR,
-                id);            
+                id);
         }
 
         /// <summary>
@@ -400,14 +406,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// </summary>
         /// <param name="name"></param>
         /// <param name="id"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public static string CreateArchiveItemName(string name, UUID id)
         {
             return string.Format(
                 "{0}{1}{2}.xml",
                 name,
                 ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR,
-                id);            
+                id);
+        }
+
+        /// <summary>
+        /// Create the control file for a 0.1 version archive
+        /// </summary>
+        /// <returns></returns>
+        public static string Create0p1ControlFile()
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter xtw = new XmlTextWriter(sw);
+            xtw.Formatting = Formatting.Indented;
+            xtw.WriteStartDocument();
+            xtw.WriteStartElement("archive");
+            xtw.WriteAttributeString("major_version", "0");
+            xtw.WriteAttributeString("minor_version", "1");
+            xtw.WriteEndElement();
+
+            xtw.Flush();
+            xtw.Close();
+
+            String s = sw.ToString();
+            sw.Close();
+
+            return s;
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 9f49da9..1228eb1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -40,12 +40,12 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
-{          
+{
     /// <summary>
     /// This module loads and saves OpenSimulator inventory archives
-    /// </summary>    
+    /// </summary>
     public class InventoryArchiverModule : IRegionModule, IInventoryArchiverModule
-    {    
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         public string Name { get { return "Inventory Archiver Module"; } }
@@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// </value>
         public bool DisablePresenceChecks { get; set; }
         
-        public event InventoryArchiveSaved OnInventoryArchiveSaved;        
+        public event InventoryArchiveSaved OnInventoryArchiveSaved;
         
         /// <summary>
         /// The file to load and save inventory if no filename has been specified
@@ -83,7 +83,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         public void Initialise(Scene scene, IConfigSource source)
-        {            
+        {
             if (m_scenes.Count == 0)
             {
                 scene.RegisterModuleInterface<IInventoryArchiverModule>(this);
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 m_aScene = scene;
             }
                         
-            m_scenes[scene.RegionInfo.RegionID] = scene;            
+            m_scenes[scene.RegionInfo.RegionID] = scene;
         }
 
         public void PostInitialise() {}
@@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved;
             if (handlerInventoryArchiveSaved != null)
                 handlerInventoryArchiveSaved(id, succeeded, userInfo, invPath, saveStream, reportedException);
-        }       
+        }
 
         public bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream)
         {
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream)
         {
             if (m_scenes.Count > 0)
-            {            
+            {
                 CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass);
                         
                 if (userInfo != null)
@@ -182,7 +182,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     if (CheckPresence(userInfo.UserProfile.ID))
                     {
                         InventoryArchiveReadRequest request = 
-                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream);                
+                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream);
                         UpdateClientWithLoadedNodes(userInfo, request.Execute());
 
                         return true;
@@ -197,12 +197,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
 
             return false;
-        }         
+        }
         
         public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, string loadPath)
         {
             if (m_scenes.Count > 0)
-            {   
+            {
                 CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass);
                 
                 if (userInfo != null)
@@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     if (CheckPresence(userInfo.UserProfile.ID))
                     {
                         InventoryArchiveReadRequest request = 
-                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath);                
+                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath);
                         UpdateClientWithLoadedNodes(userInfo, request.Execute());
 
                         return true;
@@ -221,11 +221,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                             "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator",
                             userInfo.UserProfile.Name, userInfo.UserProfile.ID);
                     }
-                }                                         
+                }
             }
 
             return false;
-        }           
+        }
         
         /// <summary>
         /// Load inventory from an inventory file archive
@@ -252,7 +252,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}",
                 loadPath, invPath, firstName, lastName);
             
-            if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath))                 
+            if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath))
                 m_log.InfoFormat(
                     "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}",
                     loadPath, firstName, lastName);
@@ -264,7 +264,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <param name="cmdparams"></param>
         protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams)
         {
-            if (cmdparams.Length < 5)
+            if (cmdparams.Length < 6)
             {
                 m_log.Error(
                     "[INVENTORY ARCHIVER]: usage is save iar <first name> <last name> <inventory path> <user password> [<save file path>]");
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             lock (m_pendingConsoleSaves)
                 m_pendingConsoleSaves.Add(id);
-        }        
+        }
         
         private void SaveInvConsoleCommandCompleted(
             Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, 
@@ -324,6 +324,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass)
         {
             CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
+            //m_aScene.CommsManager.UserService.GetUserProfile(firstName, lastName);
             if (null == userInfo)
             {
                 m_log.ErrorFormat(
@@ -332,16 +333,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 return null;
             }
 
-            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(pass) + ":" + userInfo.UserProfile.PasswordSalt);
-            if (userInfo.UserProfile.PasswordHash != md5PasswdHash)
+            try
             {
-                m_log.ErrorFormat(
-                    "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect.  Please try again.", 
-                    firstName, lastName);
+                if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass))
+                {
+                    return userInfo;
+                }
+                else
+                {
+                    m_log.ErrorFormat(
+                        "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect.  Please try again.", 
+                        firstName, lastName);
+                    return null;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message);
                 return null;
             }
-            
-            return userInfo;
         }
         
         /// <summary>
@@ -349,7 +359,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// </summary>
         /// <param name="loadedNodes">Can be empty.  In which case, nothing happens</param>
         private void UpdateClientWithLoadedNodes(CachedUserInfo userInfo, List<InventoryNodeBase> loadedNodes)
-        {               
+        {
             if (loadedNodes.Count == 0)
                 return;
                    
@@ -358,19 +368,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 ScenePresence user = scene.GetScenePresence(userInfo.UserProfile.ID);
                 
                 if (user != null && !user.IsChildAgent)
-                {        
+                {
                     foreach (InventoryNodeBase node in loadedNodes)
                     {
-                        m_log.DebugFormat(
-                            "[INVENTORY ARCHIVER]: Notifying {0} of loaded inventory node {1}", 
-                            user.Name, node.Name);
+//                        m_log.DebugFormat(
+//                            "[INVENTORY ARCHIVER]: Notifying {0} of loaded inventory node {1}", 
+//                            user.Name, node.Name);
                         
                         user.ControllingClient.SendBulkUpdateInventory(node);
                     }
                     
                     break;
-                }        
-            }            
+                }
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index ed293cd..b0fdcd6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -37,7 +37,7 @@ using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Serialization;
-using OpenSim.Framework.Serialization.External;    
+using OpenSim.Framework.Serialization.External;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Osp;
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             Exception reportedException)
         {
             mre.Set();
-        }        
+        }
 
         /// <summary>
         /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
@@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string expectedObject1FilePath = string.Format(
                 "{0}{1}{2}",
                 ArchiveConstants.INVENTORY_PATH,
-                InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder),                                  
+                InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder),
                 expectedObject1FileName);
 
             string filePath;
@@ -195,7 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             Assert.That(gotObject1File, Is.True, "No item1 file in archive");
 //            Assert.That(gotObject2File, Is.True, "No object2 file in archive");
 
-            // TODO: Test presence of more files and contents of files.            
+            // TODO: Test presence of more files and contents of files.
         }
         
         /// <summary>
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         /// This test also does some deeper probing of loading into nested inventory structures
         [Test]
         public void TestLoadIarV0_1ExistingUsers()
-        {   
+        {
             TestHelper.InMethod();
             
             //log4net.Config.XmlConfigurator.Configure();
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
             tar.Close();
 
-            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());            
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
             
@@ -271,9 +271,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             Assert.That(foundItem1.Owner, Is.EqualTo(userUuid),
                 "Loaded item owner doesn't match inventory reciever");
 
-            // Now try loading to a root child folder            
+            // Now try loading to a root child folder
             UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA");
-            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());            
+            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
             archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream);
 
             InventoryItemBase foundItem2
@@ -282,12 +282,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             // Now try loading to a more deeply nested folder
             UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC");
-            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());            
+            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
             archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream);
 
             InventoryItemBase foundItem3
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + itemName);
-            Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");                        
+            Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
         }
 
         /// <summary>
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         /// (as tested in the a later commented out test)
         [Test]
         public void TestLoadIarV0_1AbsentUsers()
-        {   
+        {
             TestHelper.InMethod();
             
             log4net.Config.XmlConfigurator.Configure();
@@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
             tar.Close();
 
-            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());            
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
             
@@ -357,8 +357,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //                "Loaded item non-uuid creator doesn't match that of the loading user");
             Assert.That(
                 foundItem1.CreatorIdAsUuid, Is.EqualTo(userUuid), 
-                "Loaded item uuid creator doesn't match that of the loading user");                  
-        }        
+                "Loaded item uuid creator doesn't match that of the loading user");
+        }
 
         /// <summary>
         /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
@@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         /// Disabled since temporary profiles have not yet been implemented.
         //[Test]
         public void TestLoadIarV0_1TempProfiles()
-        {   
+        {
             TestHelper.InMethod();
             
             log4net.Config.XmlConfigurator.Configure();
@@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
             tar.Close();
 
-            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());            
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
             
@@ -436,7 +436,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             Assert.That(foundItem.Owner, Is.EqualTo(userUuid));
             
             Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod());
-        }        
+        }
         
         /// <summary>
         /// Test replication of an archive path to the user's inventory.
@@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string itemArchivePath
                 = string.Format(
                     "{0}{1}{2}{3}", 
-                    ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName);            
+                    ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName);
 
             //Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 75976e2..d9a021f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -169,12 +169,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     byte[] copyIDBytes = copyID.GetBytes();
                     im.binaryBucket = new byte[1 + copyIDBytes.Length];
                     im.binaryBucket[0] = (byte)AssetType.Folder;
-                    Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length);  
+                    Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length);
                     
                     if (user != null && !user.IsChildAgent)
-                    {        
+                    {
                         user.ControllingClient.SendBulkUpdateInventory(folderCopy);
-                    }                    
+                    }
                 }
                 else
                 {
@@ -199,10 +199,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     }
                     
                     copyID = itemCopy.ID;
-                    Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16);                                       
+                    Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16);
                     
                     if (user != null && !user.IsChildAgent)
-                    {        
+                    {
                         user.ControllingClient.SendBulkUpdateInventory(itemCopy);
                     }
                 }
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 }
             }
             else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
-            {                                           
+            {
                 // Here, the recipient is local and we can assume that the
                 // inventory is loaded. Courtesy of the above bulk update,
                 // It will have been pushed to the client, too
@@ -284,7 +284,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 }
                 
                 if ((null == item && null == folder) | null == trashFolder)
-                {                        
+                {
                     string reason = String.Empty;
                     
                     if (trashFolder == null)
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index 34d46a0..1b23d92 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -316,7 +316,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             
             // This will persist this beyond the expiry of the caps handlers
             MainServer.Instance.AddPollServiceHTTPHandler(
-                capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2, new PollServiceEventArgs(HasEvents, GetEvents, NoEvents, agentID));
+                capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePoll, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID));
 
             Random rnd = new Random(Environment.TickCount);
             lock (m_ids)
@@ -326,7 +326,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             }
         }
 
-        public bool HasEvents(UUID agentID)
+        public bool HasEvents(UUID requestID, UUID agentID)
         {
             // Don't use this, because of race conditions at agent closing time
             //Queue<OSD> queue = TryGetQueue(agentID);
@@ -343,14 +343,14 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             return false;
         }
 
-        public Hashtable GetEvents(UUID pAgentId, string request)
+        public Hashtable GetEvents(UUID requestID, UUID pAgentId, string request)
         {
             Queue<OSD> queue = TryGetQueue(pAgentId);
             OSD element;
             lock (queue)
             {
                 if (queue.Count == 0)
-                    return NoEvents();
+                    return NoEvents(requestID, pAgentId);
                 element = queue.Dequeue(); // 15s timeout
             }
 
@@ -398,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]);
         }
 
-        public Hashtable NoEvents()
+        public Hashtable NoEvents(UUID requestID, UUID agentID)
         {
             Hashtable responsedata = new Hashtable();
             responsedata["int_response_code"] = 502;
@@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
                 responsedata["error_status_text"] = "Upstream error:";
                 responsedata["http_protocol_version"] = "HTTP/1.0";
                 return responsedata;
-            }            
+            }
 
             OSDArray array = new OSDArray();
             if (element == null) // didn't have an event in 15s
@@ -491,6 +491,11 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             return responsedata;
         }
 
+        public Hashtable EventQueuePoll(Hashtable request)
+        {
+            return new Hashtable();
+        }
+
         public Hashtable EventQueuePath2(Hashtable request)
         {
             string capuuid = (string)request["uri"]; //path.Replace("/CAPS/EQG/","");
diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
deleted file mode 100644
index 8c92727..0000000
--- a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-using Nwc.XmlRpc;
-
-
-namespace OpenSim.Region.CoreModules.Framework.Services
-{
-    public class RegionMapService : IRegionModule
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private static bool initialized = false;
-        private static bool enabled = false;
-
-        Scene m_scene;
-        //AssetService m_assetService;
-
-        #region IRegionModule interface
-
-        public void Initialise(Scene scene, IConfigSource config)
-        {
-            if (!initialized)
-            {
-                initialized = true;
-                m_scene = scene;
-
-                // This module is only on for hypergrid mode
-                enabled = config.Configs["Startup"].GetBoolean("hypergrid", false);
-            }
-        }
-
-        public void PostInitialise()
-        {
-            if (enabled)
-            {
-                m_log.Info("[RegionMapService]: Starting...");
-
-                //m_assetService = new AssetService(m_scene);
-                new GridService(m_scene);
-            }
-        }
-
-        public void Close()
-        {
-        }
-
-        public string Name
-        {
-            get { return "RegionMapService"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-
-        #endregion
-
-    }
-
-    public class GridService
-    {
-//        private IUserService m_userService;
-        private IGridServices m_gridService;
-        private bool m_doLookup = false;
-
-        public bool DoLookup
-        {
-            get { return m_doLookup; }
-            set { m_doLookup = value; }
-        }
-        private static readonly ILog m_log
-            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public GridService(Scene m_scene)
-        {
-            AddHandlers(m_scene);
-//            m_userService = m_scene.CommsManager.UserService;
-            m_gridService = m_scene.CommsManager.GridService;
-        }
-
-        protected void AddHandlers(Scene m_scene)
-        {
-//            IAssetDataPlugin m_assetProvider 
-//                = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin;
-
-            IHttpServer httpServer = MainServer.Instance;
-            httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod);
-            //m_httpServer.AddXmlRPCHandler("map_block", XmlRpcMapBlockMethod);
-            //m_httpServer.AddXmlRPCHandler("search_for_region_by_name", XmlRpcSearchForRegionMethod);
-
-        }
-
-        /// <summary>
-        /// Returns an XML RPC response to a simulator profile request
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable responseData = new Hashtable();
-            RegionInfo simData = null;
-            if (requestData.ContainsKey("region_UUID"))
-            {
-                UUID regionID = new UUID((string)requestData["region_UUID"]);
-                simData = m_gridService.RequestNeighbourInfo(regionID); //.GetRegion(regionID);
-                if (simData == null)
-                {
-                    m_log.WarnFormat("[HGGridService] didn't find region for regionID {0} from {1}",
-                                     regionID, request.Params.Count > 1 ? request.Params[1] : "unknwon source");
-                }
-            }
-            else if (requestData.ContainsKey("region_handle"))
-            {
-                //CFK: The if/else below this makes this message redundant.
-                //CFK: m_log.Info("requesting data for region " + (string) requestData["region_handle"]);
-                ulong regionHandle = Convert.ToUInt64((string)requestData["region_handle"]);
-                simData = m_gridService.RequestNeighbourInfo(regionHandle); //m_gridDBService.GetRegion(regionHandle);
-                if (simData == null)
-                {
-                    m_log.WarnFormat("[HGGridService] didn't find region for regionHandle {0} from {1}",
-                                     regionHandle, request.Params.Count > 1 ? request.Params[1] : "unknwon source");
-                }
-            }
-            else if (requestData.ContainsKey("region_name_search"))
-            {
-                string regionName = (string)requestData["region_name_search"];
-                List<RegionInfo> regInfos = m_gridService.RequestNamedRegions(regionName, 1);//m_gridDBService.GetRegion(regionName);
-                if (regInfos != null)
-                    simData = regInfos[0];
-
-                if (simData == null)
-                {
-                    m_log.WarnFormat("[HGGridService] didn't find region for regionName {0} from {1}",
-                                     regionName, request.Params.Count > 1 ? request.Params[1] : "unknwon source");
-                }
-            }
-            else m_log.Warn("[HGGridService] regionlookup without regionID, regionHandle or regionHame");
-
-            if (simData == null)
-            {
-                //Sim does not exist
-                responseData["error"] = "Sim does not exist";
-            }
-            else
-            {
-                m_log.Debug("[HGGridService]: found " + (string)simData.RegionName + " regionHandle = " +
-                           (string)requestData["region_handle"]);
-                responseData["sim_ip"] = simData.ExternalEndPoint.Address.ToString();
-                responseData["sim_port"] = simData.ExternalEndPoint.Port.ToString();
-                //responseData["server_uri"] = simData.serverURI;
-                responseData["http_port"] = simData.HttpPort.ToString();
-                //responseData["remoting_port"] = simData.remotingPort.ToString();
-                responseData["region_locx"] = simData.RegionLocX.ToString();
-                responseData["region_locy"] = simData.RegionLocY.ToString();
-                responseData["region_UUID"] = simData.RegionID.ToString();
-                responseData["region_name"] = simData.RegionName;
-                responseData["region_secret"] = simData.regionSecret;
-            }
-
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = responseData;
-            return response;
-        }
-
-    }
-}
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
index 613dbe9..4199c98 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             {
                 if (m_firstScene != null)
                 {
-                    return m_firstScene.CommsManager.GridService.RegionLoginsEnabled;
+                    return m_firstScene.SceneGridService.RegionLoginsEnabled;
                 }
                 else
                 {
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 6774060..a0ccdc7 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework;
 using OpenSim.Region.CoreModules.World.WorldMap;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Hypergrid
 {
@@ -59,7 +60,17 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         protected override void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            List<MapBlockData> mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, maxX + 4, maxY + 4);
+            List<MapBlockData> mapBlocks = new List<MapBlockData>();
+            List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+                (minX - 4) * (int)Constants.RegionSize, (maxX + 4) * (int)Constants.RegionSize, 
+                (minY - 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize);
+
+            foreach (GridRegion r in regions)
+            {
+                MapBlockData block = new MapBlockData();
+                MapBlockFromGridRegion(block, r);
+                mapBlocks.Add(block);
+            }
 
             // Different from super
             FillInMap(mapBlocks, minX, minY, maxX, maxY);
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index e9c1e9d..7d6f150 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -353,11 +353,11 @@ namespace OpenSim.Region.CoreModules.InterGrid
             return responseMap;
         }
 
-        // Using OpenSim.Framework.Capabilities.Caps here one time..   
+        // Using OpenSim.Framework.Capabilities.Caps here one time..
         // so the long name is probably better then a using statement
         public void OnRegisterCaps(UUID agentID, Caps caps)
         {
-            /* If we ever want to register our own caps here....    
+            /* If we ever want to register our own caps here....
              * 
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
             caps.RegisterHandler("CAPNAME",
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index f9e61aa..8f82718 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -38,11 +38,15 @@
         <RegionModule id="RemoteLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" />
         <RegionModule id="LocalInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.LocalInterregionComms" />
         <RegionModule id="RESTInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.RESTInterregionComms" />
+        <RegionModule id="LocalGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.LocalGridServicesConnector" />
+        <RegionModule id="RemoteGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RemoteGridServicesConnector" />
+        <RegionModule id="HGGridConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.HGGridConnector" />
       <!-- Service connectors IN modules -->
         <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" />
         <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
         <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
         <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" />    \
+        <RegionModule id="HypergridServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.HypergridServiceInConnectorModule" />    \
 
     </Extension>
 
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 6a2a6c8..b885420 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -55,14 +55,19 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public UUID requestID;
         public Dictionary<string, string> headers;
         public string body;
+        public int responseCode;
+        public string responseBody;
         public ManualResetEvent ev;
+        public bool requestDone;
+        public int startTime;
+        public string uri;
     }
 
     public class UrlModule : ISharedRegionModule, IUrlModule
     {
-//        private static readonly ILog m_log =
-//                LogManager.GetLogger(
-//                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
 
         private Dictionary<UUID, UrlData> m_RequestMap =
                 new Dictionary<UUID, UrlData>();
@@ -70,15 +75,23 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         private Dictionary<string, UrlData> m_UrlMap =
                 new Dictionary<string, UrlData>();
 
+
         private int m_TotalUrls = 100;
 
         private IHttpServer m_HttpServer = null;
 
+        private string m_ExternalHostNameForLSL = "";
+
         public Type ReplaceableInterface 
         {
             get { return null; }
         }
 
+        private Hashtable HandleHttpPoll(Hashtable request)
+        {
+            return new Hashtable();
+        }
+
         public string Name
         {
             get { return "UrlModule"; }
@@ -86,6 +99,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public void Initialise(IConfigSource config)
         {
+            m_ExternalHostNameForLSL = config.Configs["Network"].GetString("ExternalHostNameForLSL", System.Environment.MachineName);
         }
 
         public void PostInitialise()
@@ -117,7 +131,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public void Close()
         {
         }
-
         public UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID)
         {
             UUID urlcode = UUID.Random();
@@ -129,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
                     return urlcode;
                 }
-                string url = "http://"+System.Environment.MachineName+":"+m_HttpServer.Port.ToString()+"/lslhttp/"+urlcode.ToString()+"/";
+                string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/";
 
                 UrlData urlData = new UrlData();
                 urlData.hostID = host.UUID;
@@ -139,9 +152,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.urlcode = urlcode;
                 urlData.requests = new Dictionary<UUID, RequestData>();
 
+                
                 m_UrlMap[url] = urlData;
-
-                m_HttpServer.AddHTTPHandler("/lslhttp/"+urlcode.ToString()+"/", HttpRequestHandler);
+                
+                string uri = "/lslhttp/" + urlcode.ToString() + "/";
+               
+                m_HttpServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll,
+                        new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents,
+                            urlcode));
 
                 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
             }
@@ -165,7 +183,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 UrlData data;
 
                 if (!m_UrlMap.TryGetValue(url, out data))
+                {
                     return;
+                }
 
                 foreach (UUID req in data.requests.Keys)
                     m_RequestMap.Remove(req);
@@ -174,13 +194,36 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 m_UrlMap.Remove(url);
             }
         }
-
+        
         public void HttpResponse(UUID request, int status, string body)
         {
+            if (m_RequestMap.ContainsKey(request))
+            {
+                UrlData urlData = m_RequestMap[request];
+                urlData.requests[request].responseCode = status;
+                urlData.requests[request].responseBody = body;
+                //urlData.requests[request].ev.Set();
+                urlData.requests[request].requestDone =true;
+            }
+            else
+            {
+                m_log.Info("[HttpRequestHandler] There is no http-in request with id " + request.ToString());
+            }
         }
 
-        public string GetHttpHeader(UUID request, string header)
+        public string GetHttpHeader(UUID requestId, string header)
         {
+            if (m_RequestMap.ContainsKey(requestId))
+            {
+                UrlData urlData=m_RequestMap[requestId];
+                string value;
+                if (urlData.requests[requestId].headers.TryGetValue(header,out value))
+                    return value;
+            }
+            else
+            {
+                m_log.Warn("[HttpRequestHandler] There was no http-in request with id " + requestId);
+            }
             return String.Empty;
         }
 
@@ -233,26 +276,214 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             }
         }
 
+
         private void RemoveUrl(UrlData data)
         {
             m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/");
         }
 
-        private Hashtable HttpRequestHandler(Hashtable request)
+        private Hashtable NoEvents(UUID requestID, UUID sessionID)
         {
-            string uri = request["uri"].ToString();
-            //A solution to this ugly mess would be to use only the /lslhttp/<UUID>/ part of the URI as the key.
-            UrlData url = m_UrlMap["http://"+System.Environment.MachineName+":"+m_HttpServer.Port.ToString()+uri]; 
+            Hashtable response = new Hashtable();
+            UrlData url;
+            lock (m_RequestMap)
+            {
+                if (!m_RequestMap.ContainsKey(requestID))
+                    return response;
+                url = m_RequestMap[requestID];
+            }
+
+            if (System.Environment.TickCount - url.requests[requestID].startTime > 25000)
+            {
+                response["int_response_code"] = 500;
+                response["str_response_string"] = "Script timeout";
+                response["content_type"] = "text/plain";
+                response["keepalive"] = false;
+                response["reusecontext"] = false;
+
+                //remove from map
+                lock (url)
+                {
+                    url.requests.Remove(requestID);
+                    m_RequestMap.Remove(requestID);
+                }
+
+                return response;
+            }
+
+            
+            return response;
+        }
+
+        private bool HasEvents(UUID requestID, UUID sessionID)
+        {
+            UrlData url=null;
             
-            //UUID.Random() below is a hack! Eventually we will do HTTP requests and responses properly.
-            url.engine.PostScriptEvent(url.itemID, "http_request", new Object[] { UUID.Random().ToString(), request["http-method"].ToString(), request["body"].ToString() });
+            lock (m_RequestMap)
+            {
+                if (!m_RequestMap.ContainsKey(requestID))
+                {
+                    return false;
+                }
+                url = m_RequestMap[requestID];
+                if (!url.requests.ContainsKey(requestID))
+                {
+                    return false;
+                }
+            }
 
+            if (System.Environment.TickCount-url.requests[requestID].startTime>25000)
+            {
+                return true;
+            }
+
+            if (url.requests[requestID].requestDone)
+                return true;
+            else
+                return false;
+
+        }
+        private Hashtable GetEvents(UUID requestID, UUID sessionID, string request)
+        {
+            UrlData url = null;
+            RequestData requestData = null;
+
+            lock (m_RequestMap)
+            {
+                if (!m_RequestMap.ContainsKey(requestID))
+                    return NoEvents(requestID,sessionID);
+                url = m_RequestMap[requestID];
+                requestData = url.requests[requestID];
+            }
+
+            if (!requestData.requestDone)
+                return NoEvents(requestID,sessionID);
+            
             Hashtable response = new Hashtable();
-            response["int_response_code"] = 200;
-            response["str_response_string"] = "This is a generic response as OpenSim does not yet support proper responses. Your request has been passed to the object.";
+
+            if (System.Environment.TickCount - requestData.startTime > 25000)
+            {
+                response["int_response_code"] = 500;
+                response["str_response_string"] = "Script timeout";
+                response["content_type"] = "text/plain";
+                response["keepalive"] = false;
+                response["reusecontext"] = false;
+                return response;
+            }
+            //put response
+            response["int_response_code"] = requestData.responseCode;
+            response["str_response_string"] = requestData.responseBody;
+            response["content_type"] = "text/plain";
+            response["keepalive"] = false;
+            response["reusecontext"] = false;
+            
+            //remove from map
+            lock (url)
+            {
+                url.requests.Remove(requestID);
+                m_RequestMap.Remove(requestID);
+            }
 
             return response;
         }
+        public void HttpRequestHandler(UUID requestID, Hashtable request)
+        {
+            lock (request)
+            {
+                string uri = request["uri"].ToString();
+                
+                try
+                {
+                    Hashtable headers = (Hashtable)request["headers"];
+                    
+//                    string uri_full = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/";
+
+                    int pos1 = uri.IndexOf("/");// /lslhttp
+                    int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
+                    int pos3 = uri.IndexOf("/", pos2 + 1);// /lslhttp/<UUID>/
+                    string uri_tmp = uri.Substring(0, pos3 + 1);
+                    //HTTP server code doesn't provide us with QueryStrings
+                    string pathInfo;
+                    string queryString;
+                    queryString = "";
+
+                    pathInfo = uri.Substring(pos3);
+
+                    UrlData url = m_UrlMap["http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri_tmp];
+
+                    //for llGetHttpHeader support we need to store original URI here
+                    //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers 
+                    //as per http://wiki.secondlife.com/wiki/LlGetHTTPHeader
+
+                    RequestData requestData = new RequestData();
+                    requestData.requestID = requestID;
+                    requestData.requestDone = false;
+                    requestData.startTime = System.Environment.TickCount;
+                    requestData.uri = uri;
+                    if (requestData.headers == null)
+                        requestData.headers = new Dictionary<string, string>();
+
+                    foreach (DictionaryEntry header in headers)
+                    {
+                        string key = (string)header.Key;
+                        string value = (string)header.Value;
+                        requestData.headers.Add(key, value);
+                    }
+                    foreach (DictionaryEntry de in request)
+                    {
+                        if (de.Key.ToString() == "querystringkeys")
+                        {
+                            System.String[] keys = (System.String[])de.Value;
+                            foreach (String key in keys)
+                            {
+                                if (request.ContainsKey(key))
+                                {
+                                    string val = (String)request[key];
+                                    queryString = queryString + key + "=" + val + "&";
+                                }
+                            }
+                            if (queryString.Length > 1)
+                                queryString = queryString.Substring(0, queryString.Length - 1);
+
+                        }
+
+                    }
+
+                    //if this machine is behind DNAT/port forwarding, currently this is being
+                    //set to address of port forwarding router
+                    requestData.headers["x-remote-ip"] = requestData.headers["remote_addr"];
+                    requestData.headers["x-path-info"] = pathInfo;
+                    requestData.headers["x-query-string"] = queryString;
+                    requestData.headers["x-script-url"] = url.url;
+
+                    requestData.ev = new ManualResetEvent(false);
+                    lock (url.requests)
+                    {
+                        url.requests.Add(requestID, requestData);
+                    }
+                    lock (m_RequestMap)
+                    {
+                        //add to request map
+                        m_RequestMap.Add(requestID, url);
+                    }
+
+                    url.engine.PostScriptEvent(url.itemID, "http_request", new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() });
+
+                    //send initial response?
+//                    Hashtable response = new Hashtable();
+
+                    return;
+
+                }
+                catch (Exception we)
+                {
+                    //Hashtable response = new Hashtable();
+                    m_log.Warn("[HttpRequestHandler]: http-in request failed");
+                    m_log.Warn(we.Message);
+                    m_log.Warn(we.StackTrace);
+                }
+            }
+        }
 
         private void OnScriptReset(uint localID, UUID itemID)
         {
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index bea6222..d57a8e5 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                 string value = "";
                 
                 if (nvp[0] != null)
-                {    
+                {
                     name = nvp[0].Trim();
                 }
                 
@@ -291,10 +291,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                                      temp = 128;
                                   
                                  width = temp;
-                                 height = temp;   
+                                 height = temp;
                              }
                          }
-                     break;   
+                     break;
                 }
             }
 
@@ -410,7 +410,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             Font myFont = new Font(fontName, fontSize);
             SolidBrush myBrush = new SolidBrush(Color.Black);
             
-            char[] lineDelimiter = {dataDelim};            
+            char[] lineDelimiter = {dataDelim};
             char[] partsDelimiter = {','};
             string[] lines = data.Split(lineDelimiter);
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
new file mode 100644
index 0000000..92db15b
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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.Reflection;
+using System.Collections.Generic;
+using log4net;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Server.Base;
+using OpenSim.Server.Handlers.Base;
+using OpenSim.Server.Handlers.Grid;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
+{
+    public class HypergridServiceInConnectorModule : ISharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static bool m_Enabled = false;
+        
+        private IConfigSource m_Config;
+        bool m_Registered = false;
+        HypergridServiceInConnector m_HypergridHandler;
+
+        #region IRegionModule interface
+
+        public void Initialise(IConfigSource config)
+        {
+            //// This module is only on for standalones in hypergrid mode
+            //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
+            //    config.Configs["Startup"].GetBoolean("hypergrid", true);
+            //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
+            m_Config = config;
+            IConfig moduleConfig = config.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                m_Enabled = moduleConfig.GetBoolean("HypergridServiceInConnector", false);
+                if (m_Enabled)
+                {
+                    m_log.Info("[HGGRID IN CONNECTOR]: Hypergrid Service In Connector enabled");
+                }
+
+            }
+
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public Type ReplaceableInterface 
+        {
+            get { return null; }
+        }
+
+        public string Name
+        {
+            get { return "HypergridService"; }
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            GridRegion rinfo = new GridRegion(scene.RegionInfo);
+            m_HypergridHandler.RemoveRegion(rinfo);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            if (!m_Registered)
+            {
+                m_Registered = true;
+
+                m_log.Info("[HypergridService]: Starting...");
+
+                Object[] args = new Object[] { m_Config, MainServer.Instance };
+
+                m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface<IHyperlinkService>());
+                //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args);
+            }
+
+            GridRegion rinfo = new GridRegion(scene.RegionInfo);
+            m_HypergridHandler.AddRegion(rinfo);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index a31ce8e..8a90370 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
 
         #region INeighbourService
 
-        public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
+        public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
         {
             m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
                 thisRegion.RegionName, regionHandle, m_Scenes.Count);
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
                 }
             }
             m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: region handle {0} not found", regionHandle);
-            return false;
+            return null;
         }
 
         #endregion INeighbourService
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
index e69613a..85a1ac3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
 
         public bool IsAuthorizedForRegion(string userID, string regionID, out string message)
         {
-            return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message);   
+            return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message);
         }
 
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
index a672f4f..fca2df2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
             else
             {
                 m_log.ErrorFormat("[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0} ",regionID);
-            }   
+            }
             
             
             return isAuthorized;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
new file mode 100644
index 0000000..0974372
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 System.Reflection;
+using System.Xml;
+using log4net;
+using Nini.Config;
+using OpenSim.Framework;
+//using OpenSim.Framework.Communications;
+using OpenSim.Framework.Console;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Hypergrid;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
+{
+    public class HGCommands
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private HGGridConnector m_HGGridConnector;
+        private Scene m_scene;
+
+        private static uint m_autoMappingX = 0;
+        private static uint m_autoMappingY = 0;
+        private static bool m_enableAutoMapping = false;
+
+        public HGCommands(HGGridConnector hgConnector, Scene scene)
+        {
+            m_HGGridConnector = hgConnector;
+            m_scene = scene;
+        }
+
+        //public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, CommunicationsManager m_commsManager,
+        //    StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version)
+        //{
+        //    HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(m_commsManager, HGServices);
+
+        //    return
+        //        new HGScene(
+        //            regionInfo, circuitManager, m_commsManager, sceneGridService, storageManager,
+        //            m_moduleLoader, false, m_configSettings.PhysicalPrim,
+        //            m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
+        //}
+
+        public void RunCommand(string module, string[] cmdparams)
+        {
+            List<string> args = new List<string>(cmdparams);
+            if (args.Count < 1)
+                return;
+
+            string command = args[0];
+            args.RemoveAt(0);
+
+            cmdparams = args.ToArray();
+
+            RunHGCommand(command, cmdparams);
+            
+        }
+
+        private void RunHGCommand(string command, string[] cmdparams)
+        {
+            if (command.Equals("link-mapping"))
+            {
+                if (cmdparams.Length == 2)
+                {
+                    try
+                    {
+                        m_autoMappingX = Convert.ToUInt32(cmdparams[0]);
+                        m_autoMappingY = Convert.ToUInt32(cmdparams[1]);
+                        m_enableAutoMapping = true;
+                    }
+                    catch (Exception)
+                    {
+                        m_autoMappingX = 0;
+                        m_autoMappingY = 0;
+                        m_enableAutoMapping = false;
+                    }
+                }
+            }
+            else if (command.Equals("link-region"))
+            {
+                if (cmdparams.Length < 3)
+                {
+                    if ((cmdparams.Length == 1) || (cmdparams.Length == 2))
+                    {
+                        LoadXmlLinkFile(cmdparams);
+                    }
+                    else
+                    {
+                        LinkRegionCmdUsage();
+                    }
+                    return;
+                }
+
+                if (cmdparams[2].Contains(":"))
+                {
+                    // New format
+                    int xloc, yloc;
+                    string mapName;
+                    try
+                    {
+                        xloc = Convert.ToInt32(cmdparams[0]);
+                        yloc = Convert.ToInt32(cmdparams[1]);
+                        mapName = cmdparams[2];
+                        if (cmdparams.Length > 3)
+                            for (int i = 3; i < cmdparams.Length; i++)
+                                mapName += " " + cmdparams[i];
+
+                        m_log.Info(">> MapName: " + mapName);
+                        //internalPort = Convert.ToUInt32(cmdparams[4]);
+                        //remotingPort = Convert.ToUInt32(cmdparams[5]);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Warn("[HGrid] Wrong format for link-region command: " + e.Message);
+                        LinkRegionCmdUsage();
+                        return;
+                    }
+
+                    // Convert cell coordinates given by the user to meters
+                    xloc = xloc * (int)Constants.RegionSize;
+                    yloc = yloc * (int)Constants.RegionSize;
+                    m_HGGridConnector.TryLinkRegionToCoords(m_scene, null, mapName, xloc, yloc);
+                }
+                else
+                {
+                    // old format
+                    GridRegion regInfo;
+                    int xloc, yloc;
+                    uint externalPort;
+                    string externalHostName;
+                    try
+                    {
+                        xloc = Convert.ToInt32(cmdparams[0]);
+                        yloc = Convert.ToInt32(cmdparams[1]);
+                        externalPort = Convert.ToUInt32(cmdparams[3]);
+                        externalHostName = cmdparams[2];
+                        //internalPort = Convert.ToUInt32(cmdparams[4]);
+                        //remotingPort = Convert.ToUInt32(cmdparams[5]);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Warn("[HGrid] Wrong format for link-region command: " + e.Message);
+                        LinkRegionCmdUsage();
+                        return;
+                    }
+
+                    // Convert cell coordinates given by the user to meters
+                    xloc = xloc * (int)Constants.RegionSize;
+                    yloc = yloc * (int)Constants.RegionSize;
+                    if (m_HGGridConnector.TryCreateLink(m_scene, null, xloc, yloc, "", externalPort, externalHostName, out regInfo))
+                    {
+                        if (cmdparams.Length >= 5)
+                        {
+                            regInfo.RegionName = "";
+                            for (int i = 4; i < cmdparams.Length; i++)
+                                regInfo.RegionName += cmdparams[i] + " ";
+                        }
+                    }
+                }
+                return;
+            }
+            else if (command.Equals("unlink-region"))
+            {
+                if (cmdparams.Length < 1)
+                {
+                    UnlinkRegionCmdUsage();
+                    return;
+                }
+                if (m_HGGridConnector.TryUnlinkRegion(m_scene, cmdparams[0]))
+                    m_log.InfoFormat("[HGrid]: Successfully unlinked {0}", cmdparams[0]);
+                else
+                    m_log.InfoFormat("[HGrid]: Unable to unlink {0}, region not found", cmdparams[0]);
+            }
+        }
+
+        private void LoadXmlLinkFile(string[] cmdparams)
+        {
+            //use http://www.hgurl.com/hypergrid.xml for test
+            try
+            {
+                XmlReader r = XmlReader.Create(cmdparams[0]);
+                XmlConfigSource cs = new XmlConfigSource(r);
+                string[] excludeSections = null;
+
+                if (cmdparams.Length == 2)
+                {
+                    if (cmdparams[1].ToLower().StartsWith("excludelist:"))
+                    {
+                        string excludeString = cmdparams[1].ToLower();
+                        excludeString = excludeString.Remove(0, 12);
+                        char[] splitter = { ';' };
+
+                        excludeSections = excludeString.Split(splitter);
+                    }
+                }
+
+                for (int i = 0; i < cs.Configs.Count; i++)
+                {
+                    bool skip = false;
+                    if ((excludeSections != null) && (excludeSections.Length > 0))
+                    {
+                        for (int n = 0; n < excludeSections.Length; n++)
+                        {
+                            if (excludeSections[n] == cs.Configs[i].Name.ToLower())
+                            {
+                                skip = true;
+                                break;
+                            }
+                        }
+                    }
+                    if (!skip)
+                    {
+                        ReadLinkFromConfig(cs.Configs[i]);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error(e.ToString());
+            }
+        }
+
+
+        private void ReadLinkFromConfig(IConfig config)
+        {
+            GridRegion regInfo;
+            int xloc, yloc;
+            uint externalPort;
+            string externalHostName;
+            uint realXLoc, realYLoc;
+
+            xloc = Convert.ToInt32(config.GetString("xloc", "0"));
+            yloc = Convert.ToInt32(config.GetString("yloc", "0"));
+            externalPort = Convert.ToUInt32(config.GetString("externalPort", "0"));
+            externalHostName = config.GetString("externalHostName", "");
+            realXLoc = Convert.ToUInt32(config.GetString("real-xloc", "0"));
+            realYLoc = Convert.ToUInt32(config.GetString("real-yloc", "0"));
+
+            if (m_enableAutoMapping)
+            {
+                xloc = (int)((xloc % 100) + m_autoMappingX);
+                yloc = (int)((yloc % 100) + m_autoMappingY);
+            }
+
+            if (((realXLoc == 0) && (realYLoc == 0)) ||
+                (((realXLoc - xloc < 3896) || (xloc - realXLoc < 3896)) &&
+                 ((realYLoc - yloc < 3896) || (yloc - realYLoc < 3896))))
+            {
+                xloc = xloc * (int)Constants.RegionSize;
+                yloc = yloc * (int)Constants.RegionSize;
+                if (
+                    m_HGGridConnector.TryCreateLink(m_scene, null, xloc, yloc, "", externalPort,
+                                              externalHostName, out regInfo))
+                {
+                    regInfo.RegionName = config.GetString("localName", "");
+                }
+            }
+        }
+
+
+        private void LinkRegionCmdUsage()
+        {
+            m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>]");
+            m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]");
+            m_log.Info("Usage: link-region <URI_of_xml> [<exclude>]");
+        }
+
+        private void UnlinkRegionCmdUsage()
+        {
+            m_log.Info("Usage: unlink-region <HostName>:<HttpPort>");
+            m_log.Info("Usage: unlink-region <LocalName>");
+        }
+
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
new file mode 100644
index 0000000..148331b
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -0,0 +1,795 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 System.Net;
+using System.Reflection;
+using System.Xml;
+
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Hypergrid;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Server.Base;
+using OpenSim.Services.Connectors.Grid;
+using OpenSim.Framework.Console;
+
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
+{
+    public class HGGridConnector : ISharedRegionModule, IGridService, IHyperlinkService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        private static string LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI;
+
+        private bool m_Enabled = false;
+        private bool m_Initialized = false;
+
+        private Scene m_aScene;
+        private Dictionary<ulong, Scene> m_LocalScenes = new Dictionary<ulong, Scene>();
+
+        private IGridService m_GridServiceConnector;
+        private HypergridServiceConnector m_HypergridServiceConnector;
+
+        // Hyperlink regions are hyperlinks on the map
+        protected Dictionary<UUID, GridRegion> m_HyperlinkRegions = new Dictionary<UUID, GridRegion>();
+
+        // Known regions are home regions of visiting foreign users.
+        // They are not on the map as static hyperlinks. They are dynamic hyperlinks, they go away when
+        // the visitor goes away. They are mapped to X=0 on the map.
+        // This is key-ed on agent ID
+        protected Dictionary<UUID, GridRegion> m_knownRegions = new Dictionary<UUID, GridRegion>();
+
+        protected Dictionary<UUID, ulong> m_HyperlinkHandles = new Dictionary<UUID, ulong>();
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public string Name
+        {
+            get { return "HGGridServicesConnector"; }
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("GridServices", "");
+                if (name == Name)
+                {
+                    IConfig gridConfig = source.Configs["GridService"];
+                    if (gridConfig == null)
+                    {
+                        m_log.Error("[HGGRID CONNECTOR]: GridService missing from OpenSim.ini");
+                        return;
+                    }
+
+
+                    InitialiseConnectorModule(source);
+                    
+                    m_Enabled = true;
+                    m_log.Info("[HGGRID CONNECTOR]: HG grid enabled");
+                }
+            }
+        }
+
+        private void InitialiseConnectorModule(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["GridService"];
+            if (gridConfig == null)
+            {
+                m_log.Error("[HGGRID CONNECTOR]: GridService missing from OpenSim.ini");
+                throw new Exception("Grid connector init error");
+            }
+
+            string module = gridConfig.GetString("GridServiceConnectorModule", String.Empty);
+            if (module == String.Empty)
+            {
+                m_log.Error("[HGGRID CONNECTOR]: No GridServiceConnectorModule named in section GridService");
+                //return;
+                throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
+            }
+
+            Object[] args = new Object[] { source };
+            m_GridServiceConnector = ServerUtils.LoadPlugin<IGridService>(module, args);
+
+        }
+
+        public void PostInitialise()
+        {
+            if (m_Enabled)
+                ((ISharedRegionModule)m_GridServiceConnector).PostInitialise();
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_LocalScenes[scene.RegionInfo.RegionHandle] = scene;
+            scene.RegisterModuleInterface<IGridService>(this);
+            scene.RegisterModuleInterface<IHyperlinkService>(this);
+
+            ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene);
+
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                m_LocalScenes.Remove(scene.RegionInfo.RegionHandle);
+                ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene);
+            }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            if (!m_Initialized)
+            {
+                m_aScene = scene;
+                LocalAssetServerURI = m_aScene.CommsManager.NetworkServersInfo.UserURL;
+                LocalInventoryServerURI = m_aScene.CommsManager.NetworkServersInfo.InventoryURL;
+                LocalUserServerURI = m_aScene.CommsManager.NetworkServersInfo.UserURL;
+
+                m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService);
+
+                HGCommands hgCommands = new HGCommands(this, scene);
+                MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-region",
+                    "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
+                    "Link a hypergrid region", hgCommands.RunCommand);
+                MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "unlink-region",
+                    "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
+                    "Unlink a hypergrid region", hgCommands.RunCommand);
+                MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
+                    "Set local coordinate to map HG regions to", hgCommands.RunCommand);
+
+                // Yikes!! Remove this as soon as user services get refactored
+                HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI);
+
+                m_Initialized = true;
+            }
+        }
+
+        #endregion
+
+        #region IGridService
+
+        public bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
+        {
+            // Region doesn't exist here. Trying to link remote region
+            if (regionInfo.RegionID.Equals(UUID.Zero))
+            {
+                m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort);
+                ulong regionHandle = 0;
+                regionInfo.RegionID = m_HypergridServiceConnector.LinkRegion(regionInfo, out regionHandle); 
+                if (!regionInfo.RegionID.Equals(UUID.Zero))
+                {
+                    AddHyperlinkRegion(regionInfo, regionHandle);
+                    m_log.Info("[HGrid]: Successfully linked to region_uuid " + regionInfo.RegionID);
+
+                    // Try get the map image
+                    m_HypergridServiceConnector.GetMapImage(regionInfo);
+                    return true;
+                }
+                else
+                {
+                    m_log.Info("[HGrid]: No such region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "(" + regionInfo.InternalEndPoint.Port + ")");
+                    return false;
+                }
+                // Note that these remote regions aren't registered in localBackend, so return null, no local listeners
+            }
+            else // normal grid
+                return m_GridServiceConnector.RegisterRegion(scopeID, regionInfo);
+        }
+
+        public bool DeregisterRegion(UUID regionID)
+        {
+            // Try the hyperlink collection
+            if (m_HyperlinkRegions.ContainsKey(regionID))
+            {
+                RemoveHyperlinkRegion(regionID);
+                return true;
+            }
+            // Try the foreign users home collection
+
+            foreach (GridRegion r in m_knownRegions.Values)
+                if (r.RegionID == regionID)
+                {
+                    RemoveHyperlinkHomeRegion(regionID);
+                    return true;
+                }
+
+            // Finally, try the normal route
+            return m_GridServiceConnector.DeregisterRegion(regionID);
+        }
+
+        public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
+        {
+            // No serving neighbours on hyperliked regions.
+            // Just the regular regions.
+            return m_GridServiceConnector.GetNeighbours(scopeID, regionID);
+        }
+
+        public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
+        {
+            // Try the hyperlink collection
+            if (m_HyperlinkRegions.ContainsKey(regionID))
+                return m_HyperlinkRegions[regionID];
+            
+            // Try the foreign users home collection
+            foreach (GridRegion r in m_knownRegions.Values)
+                if (r.RegionID == regionID)
+                    return r;
+
+            // Finally, try the normal route
+            return m_GridServiceConnector.GetRegionByUUID(scopeID, regionID);
+        }
+
+        public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
+        {
+            int snapX = (int) (x / Constants.RegionSize) * (int)Constants.RegionSize;
+            int snapY = (int) (y / Constants.RegionSize) * (int)Constants.RegionSize;
+            // Try the hyperlink collection
+            foreach (GridRegion r in m_HyperlinkRegions.Values)
+            {
+                if ((r.RegionLocX == snapX) && (r.RegionLocY == snapY))
+                    return r;
+            }
+
+            // Try the foreign users home collection
+            foreach (GridRegion r in m_knownRegions.Values)
+            {
+                if ((r.RegionLocX == snapX) && (r.RegionLocY == snapY))
+                {
+                    return r;
+                }
+            }
+
+            // Finally, try the normal route
+            return m_GridServiceConnector.GetRegionByPosition(scopeID, x, y);
+        }
+
+        public GridRegion GetRegionByName(UUID scopeID, string regionName)
+        {
+            // Try normal grid first
+            GridRegion region = m_GridServiceConnector.GetRegionByName(scopeID, regionName);
+            if (region != null)
+                return region;
+
+            // Try the hyperlink collection
+            foreach (GridRegion r in m_HyperlinkRegions.Values)
+            {
+                if (r.RegionName == regionName)
+                    return r;
+            }
+
+            // Try the foreign users home collection
+            foreach (GridRegion r in m_knownRegions.Values)
+            {
+                if (r.RegionName == regionName)
+                    return r;
+            }
+            return null;
+        }
+
+        public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
+        {
+            List<GridRegion> rinfos = new List<GridRegion>();
+
+            // Commenting until regionname exists
+            //foreach (SimpleRegionInfo r in m_HyperlinkRegions.Values)
+            //    if ((r.RegionName != null) && r.RegionName.StartsWith(name))
+            //        rinfos.Add(r);
+
+            rinfos.AddRange(m_GridServiceConnector.GetRegionsByName(scopeID, name, maxNumber));
+            return rinfos;
+        }
+
+        public List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
+        {
+            int snapXmin = (int)(xmin / Constants.RegionSize) * (int)Constants.RegionSize;
+            int snapXmax = (int)(xmax / Constants.RegionSize) * (int)Constants.RegionSize;
+            int snapYmin = (int)(ymin / Constants.RegionSize) * (int)Constants.RegionSize;
+            int snapYmax = (int)(ymax / Constants.RegionSize) * (int)Constants.RegionSize;
+
+            List<GridRegion> rinfos = new List<GridRegion>();
+            foreach (GridRegion r in m_HyperlinkRegions.Values)
+                if ((r.RegionLocX > snapXmin) && (r.RegionLocX < snapYmax) &&
+                    (r.RegionLocY > snapYmin) && (r.RegionLocY < snapYmax))
+                    rinfos.Add(r);
+
+            rinfos.AddRange(m_GridServiceConnector.GetRegionRange(scopeID, xmin, xmax, ymin, ymax));
+
+            return rinfos;
+        }
+
+        #endregion
+
+        #region Auxiliary
+
+        private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle)
+        {
+            m_HyperlinkRegions[regionInfo.RegionID] = regionInfo;
+            m_HyperlinkHandles[regionInfo.RegionID] = regionHandle;
+        }
+
+        private void RemoveHyperlinkRegion(UUID regionID)
+        {
+            m_HyperlinkRegions.Remove(regionID);
+            m_HyperlinkHandles.Remove(regionID);
+        }
+
+        private void AddHyperlinkHomeRegion(UUID userID, GridRegion regionInfo, ulong regionHandle)
+        {
+            m_knownRegions[userID] = regionInfo;
+            m_HyperlinkHandles[regionInfo.RegionID] = regionHandle;
+        }
+
+        private void RemoveHyperlinkHomeRegion(UUID regionID)
+        {
+            foreach (KeyValuePair<UUID, GridRegion> kvp in m_knownRegions)
+            {
+                if (kvp.Value.RegionID == regionID)
+                {
+                    m_knownRegions.Remove(kvp.Key);
+                }
+            }
+            m_HyperlinkHandles.Remove(regionID);
+        }
+        #endregion
+
+        #region IHyperlinkService
+
+        private static Random random = new Random();
+
+
+        public GridRegion TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, int xloc, int yloc)
+        {
+            string host = "127.0.0.1";
+            string portstr;
+            string regionName = "";
+            uint port = 9000;
+            string[] parts = mapName.Split(new char[] { ':' });
+            if (parts.Length >= 1)
+            {
+                host = parts[0];
+            }
+            if (parts.Length >= 2)
+            {
+                portstr = parts[1];
+                if (!UInt32.TryParse(portstr, out port))
+                    regionName = parts[1];
+            }
+            // always take the last one
+            if (parts.Length >= 3)
+            {
+                regionName = parts[2];
+            }
+
+            // Sanity check. Don't ever link to this sim.
+            IPAddress ipaddr = null;
+            try
+            {
+                ipaddr = Util.GetHostFromDNS(host);
+            }
+            catch { }
+
+            if ((ipaddr != null) &&
+                !((m_scene.RegionInfo.ExternalEndPoint.Address.Equals(ipaddr)) && (m_scene.RegionInfo.HttpPort == port)))
+            {
+                GridRegion regInfo;
+                bool success = TryCreateLink(m_scene, client, xloc, yloc, regionName, port, host, out regInfo);
+                if (success)
+                {
+                    regInfo.RegionName = mapName;
+                    return regInfo;
+                }
+            }
+
+            return null;
+        }
+
+
+        // From the map search and secondlife://blah
+        public GridRegion TryLinkRegion(Scene m_scene, IClientAPI client, string mapName)
+        {
+            int xloc = random.Next(0, Int16.MaxValue) * (int) Constants.RegionSize;
+            return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0);
+        }
+
+        public bool TryCreateLink(Scene m_scene, IClientAPI client, int xloc, int yloc,
+            string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo)
+        {
+            m_log.DebugFormat("[HGrid]: Link to {0}:{1}, in {2}-{3}", externalHostName, externalPort, xloc, yloc);
+
+            regInfo = new GridRegion();
+            regInfo.RegionName = externalRegionName;
+            regInfo.HttpPort = externalPort;
+            regInfo.ExternalHostName = externalHostName;
+            regInfo.RegionLocX = xloc;
+            regInfo.RegionLocY = yloc;
+
+            try
+            {
+                regInfo.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)0);
+            }
+            catch (Exception e)
+            {
+                m_log.Warn("[HGrid]: Wrong format for link-region: " + e.Message);
+                return false;
+            }
+
+            // Finally, link it
+                if (!RegisterRegion(UUID.Zero, regInfo))
+                {
+                    m_log.Warn("[HGrid]: Unable to link region");
+                    return false;
+                }
+
+            int x, y;
+            if (!Check4096(m_scene, regInfo, out x, out y))
+            {
+                DeregisterRegion(regInfo.RegionID);
+                if (client != null)
+                    client.SendAlertMessage("Region is too far (" + x + ", " + y + ")");
+                m_log.Info("[HGrid]: Unable to link, region is too far (" + x + ", " + y + ")");
+                return false;
+            }
+
+            if (!CheckCoords(m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, x, y))
+            {
+                DeregisterRegion(regInfo.RegionID);
+                if (client != null)
+                    client.SendAlertMessage("Region has incompatible coordinates (" + x + ", " + y + ")");
+                m_log.Info("[HGrid]: Unable to link, region has incompatible coordinates (" + x + ", " + y + ")");
+                return false;
+            }
+
+            m_log.Debug("[HGrid]: link region succeeded");
+            return true;
+        }
+
+        public bool TryUnlinkRegion(Scene m_scene, string mapName)
+        {
+            GridRegion regInfo = null;
+            if (mapName.Contains(":"))
+            {
+                string host = "127.0.0.1";
+                //string portstr;
+                //string regionName = "";
+                uint port = 9000;
+                string[] parts = mapName.Split(new char[] { ':' });
+                if (parts.Length >= 1)
+                {
+                    host = parts[0];
+                }
+                //                if (parts.Length >= 2)
+                //                {
+                //                    portstr = parts[1];
+                //                    if (!UInt32.TryParse(portstr, out port))
+                //                        regionName = parts[1];
+                //                }
+                // always take the last one
+                //                if (parts.Length >= 3)
+                //                {
+                //                    regionName = parts[2];
+                //                }
+                foreach (GridRegion r in m_HyperlinkRegions.Values)
+                    if (host.Equals(r.ExternalHostName) && (port == r.HttpPort))
+                        regInfo = r;
+            }
+            else
+            {
+                foreach (GridRegion r in m_HyperlinkRegions.Values)
+                    if (r.RegionName.Equals(mapName))
+                        regInfo = r;
+            }
+            if (regInfo != null)
+            {
+                return DeregisterRegion(regInfo.RegionID);
+            }
+            else
+            {
+                m_log.InfoFormat("[HGrid]: Region {0} not found", mapName);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Cope with this viewer limitation.
+        /// </summary>
+        /// <param name="regInfo"></param>
+        /// <returns></returns>
+        public bool Check4096(Scene m_scene, GridRegion regInfo, out int x, out int y)
+        {
+            ulong realHandle = m_HyperlinkHandles[regInfo.RegionID];
+            uint ux = 0, uy = 0;
+            Utils.LongToUInts(realHandle, out ux, out uy);
+            x = (int)(ux / Constants.RegionSize);
+            y = (int)(uy / Constants.RegionSize);
+
+            if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - x) >= 4096) ||
+                (Math.Abs((int)m_scene.RegionInfo.RegionLocY - y) >= 4096))
+            {
+                return false;
+            }
+            return true;
+        }
+
+        public bool CheckCoords(uint thisx, uint thisy, int x, int y)
+        {
+            if ((thisx == x) && (thisy == y))
+                return false;
+            return true;
+        }
+
+        public GridRegion TryLinkRegion(IClientAPI client, string regionDescriptor)
+        {
+            return TryLinkRegion((Scene)client.Scene, client, regionDescriptor);
+        }
+
+        public GridRegion GetHyperlinkRegion(ulong handle)
+        {
+            foreach (GridRegion r in m_HyperlinkRegions.Values)
+                if (r.RegionHandle == handle)
+                    return r;
+            foreach (GridRegion r in m_knownRegions.Values)
+                if (r.RegionHandle == handle)
+                    return r;
+            return null;
+        }
+
+        public ulong FindRegionHandle(ulong handle)
+        {
+            foreach (GridRegion r in m_HyperlinkRegions.Values)
+                if ((r.RegionHandle == handle) && (m_HyperlinkHandles.ContainsKey(r.RegionID)))
+                    return m_HyperlinkHandles[r.RegionID];
+
+            foreach (GridRegion r in m_knownRegions.Values)
+                if ((r.RegionHandle == handle) && (m_HyperlinkHandles.ContainsKey(r.RegionID)))
+                    return m_HyperlinkHandles[r.RegionID];
+
+            return handle;
+        }
+
+        public bool SendUserInformation(GridRegion regInfo, AgentCircuitData agentData)
+        {
+            CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID);
+
+            if ((IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null)) ||
+                (!IsLocalUser(uinfo) && !IsGoingHome(uinfo, regInfo)))
+            {
+                m_log.Info("[HGrid]: Local user is going to foreign region or foreign user is going elsewhere");
+
+                // Set the position of the region on the remote grid
+                ulong realHandle = FindRegionHandle(regInfo.RegionHandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regInfo.RegionHandle, out x, out y);
+                GridRegion clonedRegion = new GridRegion(regInfo);
+                clonedRegion.RegionLocX = (int)x;
+                clonedRegion.RegionLocY = (int)y;
+
+                // Get the user's home region information
+                GridRegion home = m_aScene.GridService.GetRegionByUUID(m_aScene.RegionInfo.ScopeID, uinfo.UserProfile.HomeRegionID);
+
+                // Get the user's service URLs
+                string serverURI = "";
+                if (uinfo.UserProfile is ForeignUserProfileData)
+                    serverURI = Util.ServerURI(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI);
+                string userServer = (serverURI == "") || (serverURI == null) ? LocalUserServerURI : serverURI;
+
+                string assetServer = Util.ServerURI(uinfo.UserProfile.UserAssetURI);
+                if ((assetServer == null) || (assetServer == ""))
+                    assetServer = LocalAssetServerURI;
+
+                string inventoryServer = Util.ServerURI(uinfo.UserProfile.UserInventoryURI);
+                if ((inventoryServer == null) || (inventoryServer == ""))
+                    inventoryServer = LocalInventoryServerURI;
+
+                if (!m_HypergridServiceConnector.InformRegionOfUser(clonedRegion, agentData, home, userServer, assetServer, inventoryServer))
+                {
+                    m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
+                    return false;
+                }
+            }
+            //if ((uinfo == null) || !IsGoingHome(uinfo, regInfo))
+            //{
+            //    m_log.Info("[HGrid]: User seems to be going to foreign region.");
+            //    if (!InformRegionOfUser(regInfo, agentData))
+            //    {
+            //        m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
+            //        return false;
+            //    }
+            //}
+            //else
+            //    m_log.Info("[HGrid]: User seems to be going home " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName);
+
+            // May need to change agent's name
+            if (IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null))
+            {
+                agentData.firstname = agentData.firstname + "." + agentData.lastname;
+                agentData.lastname = "@" + LocalUserServerURI.Replace("http://", ""); ; //HGNetworkServersInfo.Singleton.LocalUserServerURI;
+            }
+
+            return true;
+        }
+
+        public void AdjustUserInformation(AgentCircuitData agentData)
+        {
+            CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID);
+            if ((uinfo != null) && (uinfo.UserProfile != null) &&
+                (IsLocalUser(uinfo) || !(uinfo.UserProfile is ForeignUserProfileData)))
+            {
+                //m_log.Debug("---------------> Local User!");
+                string[] parts = agentData.firstname.Split(new char[] { '.' });
+                if (parts.Length == 2)
+                {
+                    agentData.firstname = parts[0];
+                    agentData.lastname = parts[1];
+                }
+            }
+            //else
+            //    m_log.Debug("---------------> Foreign User!");
+        }
+
+        // Check if a local user exists with the same UUID as the incoming foreign user
+        public bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome)
+        {
+            comingHome = false;
+            if (!m_aScene.SceneGridService.RegionLoginsEnabled)
+                return false;
+
+            CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
+            if (uinfo != null) 
+            {
+                // uh-oh we have a potential intruder
+                if (uinfo.SessionID != sessionID)
+                    // can't have a foreigner with a local UUID
+                    return false;
+                else
+                    // oh, so it's you! welcome back
+                    comingHome = true;
+            }
+
+            // OK, user can come in
+            return true;
+        }
+
+        public void AcceptUser(ForeignUserProfileData user, GridRegion home)
+        {
+            m_aScene.CommsManager.UserProfileCacheService.PreloadUserCache(user);
+            ulong realHandle = home.RegionHandle;
+            // Change the local coordinates
+            // X=0 on the map
+            home.RegionLocX = 0;
+            home.RegionLocY = random.Next(0, 10000) * (int)Constants.RegionSize;
+            
+            AddHyperlinkHomeRegion(user.ID, home, realHandle);
+
+            DumpUserData(user);
+            DumpRegionData(home);
+
+        }
+
+        public bool IsLocalUser(UUID userID)
+        {
+            CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
+            return IsLocalUser(uinfo);
+        }
+
+        #endregion
+
+        #region IHyperlink Misc
+
+        protected bool IsComingHome(ForeignUserProfileData userData)
+        {
+            return (userData.UserServerURI == LocalUserServerURI);
+        }
+
+        // Is the user going back to the home region or the home grid?
+        protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo)
+        {
+            if (uinfo.UserProfile == null)
+                return false;
+
+            if (!(uinfo.UserProfile is ForeignUserProfileData))
+                // it's a home user, can't be outside to return home
+                return false;
+
+            // OK, it's a foreign user with a ForeignUserProfileData
+            // and is going back to exactly the home region.
+            // We can't check if it's going back to a non-home region
+            // of the home grid. That will be dealt with in the
+            // receiving end
+            return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID);
+        }
+
+        protected bool IsLocalUser(CachedUserInfo uinfo)
+        {
+            if (uinfo == null)
+                return false;
+
+            return !(uinfo.UserProfile is ForeignUserProfileData);
+
+        }
+
+        protected bool IsLocalRegion(ulong handle)
+        {
+            return m_LocalScenes.ContainsKey(handle);
+        }
+
+        private void DumpUserData(ForeignUserProfileData userData)
+        {
+            m_log.Info(" ------------ User Data Dump ----------");
+            m_log.Info(" >> Name: " + userData.FirstName + " " + userData.SurName);
+            m_log.Info(" >> HomeID: " + userData.HomeRegionID);
+            m_log.Info(" >> UserServer: " + userData.UserServerURI);
+            m_log.Info(" >> InvServer: " + userData.UserInventoryURI);
+            m_log.Info(" >> AssetServer: " + userData.UserAssetURI);
+            m_log.Info(" ------------ -------------- ----------");
+        }
+
+        private void DumpRegionData(GridRegion rinfo)
+        {
+            m_log.Info(" ------------ Region Data Dump ----------");
+            m_log.Info(" >> handle: " + rinfo.RegionHandle);
+            m_log.Info(" >> coords: " + rinfo.RegionLocX + ", " + rinfo.RegionLocY);
+            m_log.Info(" >> external host name: " + rinfo.ExternalHostName);
+            m_log.Info(" >> http port: " + rinfo.HttpPort);
+            m_log.Info(" >> external EP address: " + rinfo.ExternalEndPoint.Address);
+            m_log.Info(" >> external EP port: " + rinfo.ExternalEndPoint.Port);
+            m_log.Info(" ------------ -------------- ----------");
+        }
+
+
+        #endregion
+
+
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
new file mode 100644
index 0000000..3ca4882
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 log4net;
+using Nini.Config;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Server.Base;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenMetaverse;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
+{
+    public class LocalGridServicesConnector :
+            ISharedRegionModule, IGridService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private static LocalGridServicesConnector m_MainInstance;
+
+        private IGridService m_GridService;
+        private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>();
+
+        private bool m_Enabled = false;
+
+        public LocalGridServicesConnector()
+        {
+        }
+
+        public LocalGridServicesConnector(IConfigSource source)
+        {
+            m_log.Debug("[LOCAL GRID CONNECTOR]: LocalGridServicesConnector instantiated");
+            m_MainInstance = this;
+            InitialiseService(source);
+        }
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface 
+        {
+            get { return null; }
+        }
+
+        public string Name
+        {
+            get { return "LocalGridServicesConnector"; }
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("GridServices", "");
+                if (name == Name)
+                {
+                    InitialiseService(source);
+                    m_MainInstance = this;
+                    m_Enabled = true;
+                    m_log.Info("[LOCAL GRID CONNECTOR]: Local grid connector enabled");
+                }
+            }
+        }
+
+        private void InitialiseService(IConfigSource source)
+        {
+            IConfig assetConfig = source.Configs["GridService"];
+            if (assetConfig == null)
+            {
+                m_log.Error("[LOCAL GRID CONNECTOR]: GridService missing from OpenSim.ini");
+                return;
+            }
+
+            string serviceDll = assetConfig.GetString("LocalServiceModule",
+                    String.Empty);
+
+            if (serviceDll == String.Empty)
+            {
+                m_log.Error("[LOCAL GRID CONNECTOR]: No LocalServiceModule named in section GridService");
+                return;
+            }
+
+            Object[] args = new Object[] { source };
+            m_GridService =
+                    ServerUtils.LoadPlugin<IGridService>(serviceDll,
+                    args);
+
+            if (m_GridService == null)
+            {
+                m_log.Error("[LOCAL GRID CONNECTOR]: Can't load grid service");
+                return;
+            }
+        }
+
+        public void PostInitialise()
+        {
+            if (m_MainInstance == this)
+            {
+                MainConsole.Instance.Commands.AddCommand("LocalGridConnector", false, "show neighbours",
+                    "show neighbours",
+                    "Shows the local regions' neighbours", NeighboursCommand);
+            }
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_Enabled)
+                scene.RegisterModuleInterface<IGridService>(this);
+
+            if (m_MainInstance == this)
+            {
+                if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID))
+                    m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
+                else
+                    m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene));
+            }
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_MainInstance == this)
+            {
+                m_LocalCache[scene.RegionInfo.RegionID].Clear();
+                m_LocalCache.Remove(scene.RegionInfo.RegionID);
+            }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        #endregion
+
+        #region IGridService
+
+        public bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
+        {
+            return m_GridService.RegisterRegion(scopeID, regionInfo);
+        }
+
+        public bool DeregisterRegion(UUID regionID)
+        {
+            return m_GridService.DeregisterRegion(regionID);
+        }
+
+        public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
+        {
+            if (m_LocalCache.ContainsKey(regionID))
+            {
+                List<GridRegion> neighbours = m_LocalCache[regionID].GetNeighbours();
+                if (neighbours.Count == 0)
+                    // try the DB
+                    neighbours = m_GridService.GetNeighbours(scopeID, regionID);
+                return neighbours;
+            }
+            else
+            {
+                m_log.WarnFormat("[LOCAL GRID CONNECTOR]: GetNeighbours: Requested region {0} is not on this sim", regionID);
+                return new List<GridRegion>();
+            }
+
+            // Don't go to the DB
+            //return m_GridService.GetNeighbours(scopeID, regionID);
+        }
+
+        public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
+        {
+            return m_GridService.GetRegionByUUID(scopeID, regionID);
+        }
+
+        public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
+        {
+            return m_GridService.GetRegionByPosition(scopeID, x, y);
+        }
+
+        public GridRegion GetRegionByName(UUID scopeID, string regionName)
+        {
+            return m_GridService.GetRegionByName(scopeID, regionName);
+        }
+
+        public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
+        {
+            return m_GridService.GetRegionsByName(scopeID, name, maxNumber);
+        }
+
+        public List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
+        {
+            return m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax);
+        }
+
+        #endregion
+
+        public void NeighboursCommand(string module, string[] cmdparams)
+        {
+            foreach (KeyValuePair<UUID, RegionCache> kvp in m_LocalCache)
+            {
+                m_log.InfoFormat("*** Neighbours of {0} {1} ***", kvp.Key, kvp.Value.RegionName);
+                List<GridRegion> regions = kvp.Value.GetNeighbours();
+                foreach (GridRegion r in regions)
+                    m_log.InfoFormat("    {0} @ {1}={2}", r.RegionName, r.RegionLocX / Constants.RegionSize, r.RegionLocY / Constants.RegionSize);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
new file mode 100644
index 0000000..2b336bb
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 System.Reflection;
+
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+using log4net;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
+{
+    public class RegionCache
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Scene m_scene;
+        private Dictionary<ulong, GridRegion> m_neighbours = new Dictionary<ulong, GridRegion>();
+
+        public string RegionName
+        {
+            get { return m_scene.RegionInfo.RegionName; }
+        }
+
+        public RegionCache(Scene s)
+        {
+            m_scene = s;
+            m_scene.EventManager.OnRegionUp += OnRegionUp;
+        }
+
+        private void OnRegionUp(GridRegion otherRegion)
+        {
+            m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}",
+                m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY);
+
+            m_neighbours[otherRegion.RegionHandle] = otherRegion;
+        }
+
+        public void Clear()
+        {
+            m_scene.EventManager.OnRegionUp -= OnRegionUp;
+            m_neighbours.Clear();
+        }
+
+        public List<GridRegion> GetNeighbours()
+        {
+            return new List<GridRegion>(m_neighbours.Values);
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
new file mode 100644
index 0000000..72c00fc
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 log4net;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Nini.Config;
+using OpenMetaverse;
+
+using OpenSim.Framework;
+using OpenSim.Services.Connectors;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
+{
+    public class RemoteGridServicesConnector :
+            GridServicesConnector, ISharedRegionModule, IGridService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private bool m_Enabled = false;
+
+        private IGridService m_LocalGridService;
+
+        public RemoteGridServicesConnector()
+        {
+        }
+
+        public RemoteGridServicesConnector(IConfigSource source)
+        {
+            InitialiseServices(source);
+        }
+
+        #region ISharedRegionmodule
+
+        public Type ReplaceableInterface 
+        {
+            get { return null; }
+        }
+
+        public string Name
+        {
+            get { return "RemoteGridServicesConnector"; }
+        }
+
+        public override void Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("GridServices", "");
+                if (name == Name)
+                {
+                    InitialiseServices(source);
+                    m_Enabled = true;
+                    m_log.Info("[REMOTE GRID CONNECTOR]: Remote grid enabled");
+                }
+            }
+        }
+
+        private void InitialiseServices(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["GridService"];
+            if (gridConfig == null)
+            {
+                m_log.Error("[REMOTE GRID CONNECTOR]: GridService missing from OpenSim.ini");
+                return;
+            }
+
+            base.Initialise(source);
+
+            m_LocalGridService = new LocalGridServicesConnector(source);
+        }
+
+        public void PostInitialise()
+        {
+            if (m_LocalGridService != null)
+                ((ISharedRegionModule)m_LocalGridService).PostInitialise();
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_Enabled)
+                scene.RegisterModuleInterface<IGridService>(this);
+
+            if (m_LocalGridService != null)
+                ((ISharedRegionModule)m_LocalGridService).AddRegion(scene);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_LocalGridService != null)
+                ((ISharedRegionModule)m_LocalGridService).RemoveRegion(scene);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        #endregion
+
+        #region IGridService
+
+        public override bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
+        {
+            if (m_LocalGridService.RegisterRegion(scopeID, regionInfo))
+                return base.RegisterRegion(scopeID, regionInfo);
+
+            return false;
+        }
+
+        public override bool DeregisterRegion(UUID regionID)
+        {
+            if (m_LocalGridService.DeregisterRegion(regionID))
+                return base.DeregisterRegion(regionID);
+
+            return false;
+        }
+
+        // Let's override GetNeighbours completely -- never go to the grid server
+        // Neighbours are/should be cached locally
+        // For retrieval from the DB, caller should call GetRegionByPosition
+        public override List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
+        {
+            return m_LocalGridService.GetNeighbours(scopeID, regionID);
+        }
+
+        public override GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
+        {
+            GridRegion rinfo = m_LocalGridService.GetRegionByUUID(scopeID, regionID);
+            if (rinfo == null)
+                rinfo = base.GetRegionByUUID(scopeID, regionID);
+
+            return rinfo;
+        }
+
+        public override GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
+        {
+            GridRegion rinfo = m_LocalGridService.GetRegionByPosition(scopeID, x, y);
+            if (rinfo == null)
+                rinfo = base.GetRegionByPosition(scopeID, x, y);
+
+            return rinfo;
+        }
+
+        public override GridRegion GetRegionByName(UUID scopeID, string regionName)
+        {
+            GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, regionName);
+            if (rinfo == null)
+                rinfo = base.GetRegionByName(scopeID, regionName);
+
+            return rinfo;
+        }
+
+        // Let's not override GetRegionsByName -- let's get them all from the grid server
+        // Let's not override GetRegionRange -- let's get them all from the grid server
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
new file mode 100644
index 0000000..2ca90f8
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 System.IO;
+using System.Reflection;
+using System.Threading;
+using log4net.Config;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Nini.Config;
+
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid;
+using OpenSim.Region.Framework.Scenes;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Setup;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
+{
+    [TestFixture]
+    public class GridConnectorsTests
+    {
+        LocalGridServicesConnector m_LocalConnector;
+        private void SetUp()
+        {
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.AddConfig("GridService");
+            config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
+            config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
+            config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
+
+            m_LocalConnector = new LocalGridServicesConnector(config);
+        }
+
+        /// <summary>
+        /// Test saving a V0.2 OpenSim Region Archive.
+        /// </summary>
+        [Test]
+        public void TestRegisterRegionV0_2()
+        {
+            SetUp();
+
+            // Create 3 regions
+            GridRegion r1 = new GridRegion();
+            r1.RegionName = "Test Region 1";
+            r1.RegionID = new UUID(1);
+            r1.RegionLocX = 1000 * (int)Constants.RegionSize;
+            r1.RegionLocY = 1000 * (int)Constants.RegionSize;
+            r1.ExternalHostName = "127.0.0.1";
+            r1.HttpPort = 9001;
+            r1.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
+            Scene s = new Scene(new RegionInfo());
+            s.RegionInfo.RegionID = r1.RegionID;
+            m_LocalConnector.AddRegion(s);
+            
+
+            GridRegion r2 = new GridRegion();
+            r2.RegionName = "Test Region 2";
+            r2.RegionID = new UUID(2);
+            r2.RegionLocX = 1001 * (int)Constants.RegionSize;
+            r2.RegionLocY = 1000 * (int)Constants.RegionSize;
+            r2.ExternalHostName = "127.0.0.1";
+            r2.HttpPort = 9002;
+            r2.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
+            s = new Scene(new RegionInfo());
+            s.RegionInfo.RegionID = r1.RegionID;
+            m_LocalConnector.AddRegion(s);
+
+            GridRegion r3 = new GridRegion();
+            r3.RegionName = "Test Region 3";
+            r3.RegionID = new UUID(3);
+            r3.RegionLocX = 1005 * (int)Constants.RegionSize;
+            r3.RegionLocY = 1000 * (int)Constants.RegionSize;
+            r3.ExternalHostName = "127.0.0.1";
+            r3.HttpPort = 9003;
+            r3.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
+            s = new Scene(new RegionInfo());
+            s.RegionInfo.RegionID = r1.RegionID;
+            m_LocalConnector.AddRegion(s);
+
+            m_LocalConnector.RegisterRegion(UUID.Zero, r1);
+            GridRegion result = m_LocalConnector.GetRegionByName(UUID.Zero, "Test");
+            Assert.IsNotNull(result, "Retrieved GetRegionByName is null");
+            Assert.That(result.RegionName, Is.EqualTo("Test Region 1"), "Retrieved region's name does not match");
+
+            result = m_LocalConnector.GetRegionByUUID(UUID.Zero, new UUID(1));
+            Assert.IsNotNull(result, "Retrieved GetRegionByUUID is null");
+            Assert.That(result.RegionID, Is.EqualTo(new UUID(1)), "Retrieved region's UUID does not match");
+
+            result = m_LocalConnector.GetRegionByPosition(UUID.Zero, 1000 * (int)Constants.RegionSize, 1000 * (int)Constants.RegionSize);
+            Assert.IsNotNull(result, "Retrieved GetRegionByPosition is null");
+            Assert.That(result.RegionLocX, Is.EqualTo(1000 * (int)Constants.RegionSize), "Retrieved region's position does not match");
+
+            m_LocalConnector.RegisterRegion(UUID.Zero, r2);
+            m_LocalConnector.RegisterRegion(UUID.Zero, r3);
+
+            List<GridRegion> results = m_LocalConnector.GetNeighbours(UUID.Zero, new UUID(1));
+            Assert.IsNotNull(results, "Retrieved neighbours list is null");
+            Assert.That(results.Count, Is.EqualTo(1), "Retrieved neighbour collection is greater than expected");
+            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved region's UUID does not match");
+
+            results = m_LocalConnector.GetRegionsByName(UUID.Zero, "Test", 10);
+            Assert.IsNotNull(results, "Retrieved GetRegionsByName list is null");
+            Assert.That(results.Count, Is.EqualTo(3), "Retrieved neighbour collection is less than expected");
+
+            results = m_LocalConnector.GetRegionRange(UUID.Zero, 900 * (int)Constants.RegionSize, 1002 * (int)Constants.RegionSize,
+                900 * (int)Constants.RegionSize, 1100 * (int)Constants.RegionSize);
+            Assert.IsNotNull(results, "Retrieved GetRegionRange list is null");
+            Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected");
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
index 9519e23..696225c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
@@ -42,6 +42,8 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Hypergrid;
 using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
 {
@@ -59,6 +61,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
 
         protected RegionToRegionClient m_regionClient;
 
+        protected IHyperlinkService m_hyperlinkService;
+
         protected bool m_safemode;
         protected IPAddress m_thisIP;
 
@@ -134,7 +138,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             m_localBackend = new LocalInterregionComms();
             m_commsManager = scene.CommsManager;
             m_aScene = scene;
-            m_regionClient = new RegionToRegionClient(m_aScene);
+            m_hyperlinkService = m_aScene.RequestModuleInterface<IHyperlinkService>();
+            m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService);
             m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName);
         }
 
@@ -161,7 +166,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(regionHandle))
             {
-                RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regionHandle, out x, out y);
+                GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
                 if (regInfo != null)
                 {
                     m_regionClient.SendUserInformation(regInfo, aCircuit);
@@ -183,7 +190,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(regionHandle))
             {
-                RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regionHandle, out x, out y);
+                GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
                 if (regInfo != null)
                 {
                     return m_regionClient.DoChildAgentUpdateCall(regInfo, cAgentData);
@@ -204,7 +213,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(regionHandle))
             {
-                RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regionHandle, out x, out y);
+                GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
                 if (regInfo != null)
                 {
                     return m_regionClient.DoChildAgentUpdateCall(regInfo, cAgentData);
@@ -225,7 +236,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(regionHandle))
             {
-                RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regionHandle, out x, out y);
+                GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
                 if (regInfo != null)
                 {
                     return m_regionClient.DoRetrieveRootAgentCall(regInfo, id, out agent);
@@ -257,7 +270,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(regionHandle))
             {
-                RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regionHandle, out x, out y);
+                GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
                 if (regInfo != null)
                 {
                     return m_regionClient.DoCloseAgentCall(regInfo, id);
@@ -284,7 +299,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(regionHandle))
             {
-                RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regionHandle, out x, out y);
+                GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
                 if (regInfo != null)
                 {
                     return m_regionClient.DoCreateObjectCall(
@@ -776,16 +793,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
         protected class RegionToRegionClient : RegionClient
         {
             Scene m_aScene = null;
+            IHyperlinkService m_hyperlinkService;
 
-            public RegionToRegionClient(Scene s)
+            public RegionToRegionClient(Scene s, IHyperlinkService hyperService)
             {
                 m_aScene = s;
+                m_hyperlinkService = hyperService;
             }
 
             public override ulong GetRegionHandle(ulong handle)
             {
                 if (m_aScene.SceneGridService is HGSceneCommunicationService)
-                    return ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.FindRegionHandle(handle);
+                {
+                    if (m_hyperlinkService != null)
+                        return m_hyperlinkService.FindRegionHandle(handle);
+                }
 
                 return handle;
             }
@@ -793,29 +815,24 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             public override bool IsHyperlink(ulong handle)
             {
                 if (m_aScene.SceneGridService is HGSceneCommunicationService)
-                    return ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.IsHyperlinkRegion(handle);
-
+                {
+                    if ((m_hyperlinkService != null) && (m_hyperlinkService.GetHyperlinkRegion(handle) != null))
+                        return true;
+                }
                 return false;
             }
 
-            public override void SendUserInformation(RegionInfo regInfo, AgentCircuitData aCircuit)
+            public override void SendUserInformation(GridRegion regInfo, AgentCircuitData aCircuit)
             {
-                try
-                {
-                    if (m_aScene.SceneGridService is HGSceneCommunicationService)
-                    {
-                        ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.SendUserInformation(regInfo, aCircuit);
-                    }
-                }
-                catch // Bad cast
-                { }
+                if (m_hyperlinkService != null)
+                    m_hyperlinkService.SendUserInformation(regInfo, aCircuit);
 
             }
 
             public override void AdjustUserInformation(AgentCircuitData aCircuit)
             {
-                if (m_aScene.SceneGridService is HGSceneCommunicationService)
-                    ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.AdjustUserInformation(aCircuit);
+                if (m_hyperlinkService != null)
+                    m_hyperlinkService.AdjustUserInformation(aCircuit);
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 1c66254..fd1a759 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -525,7 +525,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 return true;
             }
 
-            string userInventoryServerURI = HGNetworkServersInfo.ServerURI(uinfo.UserProfile.UserInventoryURI);
+            if ((uinfo.UserProfile.UserInventoryURI == null) || (uinfo.UserProfile.UserInventoryURI == ""))
+                // this happens in standalone profiles, apparently
+                return true;
+            
+            string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI);
+
             string uri = m_LocalGridInventoryURI.TrimEnd('/');
 
             if ((userInventoryServerURI == uri) || (userInventoryServerURI == ""))
@@ -544,7 +549,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if ((uinfo == null) || (uinfo.UserProfile == null))
                 return invURI;
 
-            string userInventoryServerURI = HGNetworkServersInfo.ServerURI(uinfo.UserProfile.UserInventoryURI);
+            string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI);
 
             if ((userInventoryServerURI != null) &&
                 (userInventoryServerURI != ""))
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 0d32c77..69504df 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         public void AddRegion(Scene scene)
         {
             m_Scene = scene;
-            m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
+            //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
 
             if (!m_Enabled)
                 return;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
index a52c70b..b0ace39 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
@@ -37,6 +37,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Server.Base;
 
+
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
 {
     public class RemoteLandServicesConnector :
@@ -89,7 +90,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
             if (!m_Enabled)
                 return;
 
-            m_MapService = scene.CommsManager.GridService;
+            m_GridService = scene.GridService;
             m_LocalService.AddRegion(scene);
             scene.RegisterModuleInterface<ILandService>(this);
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index 61bf481..daba0b3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
 
         #region INeighbourService
 
-        public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
+        public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
         {
             m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
                 thisRegion.RegionName, regionHandle, m_Scenes.Count);
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
                 }
             }
             m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle);
-            return false;
+            return null;
         }
 
         #endregion INeighbourService
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
index c5bc03b..c6fc2a1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
@@ -118,7 +118,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
             if (!m_Enabled)
                 return;
 
-            m_MapService = scene.CommsManager.GridService;
             m_LocalService.AddRegion(scene);
             scene.RegisterModuleInterface<INeighbourService>(this);
         }
@@ -134,16 +133,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
             if (!m_Enabled)
                 return;
 
+            m_GridService = scene.GridService;
+
             m_log.InfoFormat("[NEIGHBOUR CONNECTOR]: Enabled remote neighbours for region {0}", scene.RegionInfo.RegionName);
 
         }
 
         #region INeighbourService
 
-        public override bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
+        public override GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
         {
-            if (m_LocalService.HelloNeighbour(regionHandle, thisRegion))
-                return true;
+            GridRegion region = m_LocalService.HelloNeighbour(regionHandle, thisRegion);
+            if (region != null)
+                return region;
 
             return base.HelloNeighbour(regionHandle, thisRegion);
         }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 376ea8a..65f83fd 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -110,12 +110,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 TarArchiveReader.TarEntryType entryType;
 
                 while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
-                {                    
+                {
                     //m_log.DebugFormat(
                     //    "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length);
                     
                     if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
-                        continue;                    
+                        continue;
 
                     if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
                     {
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects.  Please wait.", serialisedSceneObjects.Count);
 
             IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface<IRegionSerialiserModule>();
-            int sceneObjectsLoadedCount = 0;            
+            int sceneObjectsLoadedCount = 0;
 
             foreach (string serialisedSceneObject in serialisedSceneObjects)
             {
@@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
 
             XmlTextReader xtr 
-                = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context);            
+                = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context);
 
             RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings;
 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 63608a8..9e4fbbe 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -74,14 +74,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_scene = scene;
             m_saveStream = saveStream;
             m_requestId = requestId;
-        }        
+        }
 
         /// <summary>
         /// Archive the region requested.
         /// </summary>
         /// <exception cref="System.IO.IOException">if there was an io problem with creating the file</exception>
         public void ArchiveRegion()
-        {            
+        {
             Dictionary<UUID, int> assetUuids = new Dictionary<UUID, int>();
 
             List<EntityBase> entities = m_scene.GetEntities();
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     m_scene.RequestModuleInterface<IRegionSerialiserModule>(),
                     m_scene,
                     archiveWriter,
-                    m_requestId);           
+                    m_requestId);
             
             new AssetsRequest(
                 new AssetsArchiver(archiveWriter), assetUuids.Keys, 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 5c58b69..8d4f91b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         public void Close()
         {
-        }                
+        }
 
         public void ArchiveRegion(string savePath)
         {
@@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_log.InfoFormat(
                 "[ARCHIVER]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath);
             
-            new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion();            
+            new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion();
         }
         
         public void ArchiveRegion(Stream saveStream)
@@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         public void ArchiveRegion(Stream saveStream, Guid requestId)
         {
             new ArchiveWriteRequestPreparation(m_scene, saveStream, requestId).ArchiveRegion();
-        }        
+        }
 
         public void DearchiveRegion(string loadPath)
         {
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath);
             
             new ArchiveReadRequest(m_scene, loadPath, merge, requestId).DearchiveRegion();
-        }        
+        }
         
         public void DearchiveRegion(Stream loadStream)
         {
@@ -124,6 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         public void DearchiveRegion(Stream loadStream, bool merge, Guid requestId)
         {
             new ArchiveReadRequest(m_scene, loadStream, merge, requestId).DearchiveRegion();
-        }        
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index 330fa3f..95d109c 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         /// <param name="archive"></param>
         public void WriteAsset(AssetBase asset)
-        {            
+        {
             //WriteMetadata(archive);
             WriteData(asset);
         }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 82803bf..fe9c8d9 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT);
             m_requestCallbackTimer.AutoReset = false;
-            m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout);        
+            m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout);
         }
 
         protected internal void Execute()
@@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args)
         {
             try
-            {            
+            {
                 lock (this)
                 {
                     // Take care of the possibilty that this thread started but was paused just outside the lock before
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
 
                 // Calculate which uuids were not found.  This is an expensive way of doing it, but this is a failure
-                // case anyway.                
+                // case anyway.
                 List<UUID> uuids = new List<UUID>();
                 foreach (UUID uuid in m_uuids)
                 {
@@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     m_log.ErrorFormat(
                         "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT);
 
-                m_log.Error("[ARCHIVER]: OAR save aborted.");        
+                m_log.Error("[ARCHIVER]: OAR save aborted.");
             }
             catch (Exception e)
             {
@@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id);
                     
-                    m_requestCallbackTimer.Stop();                     
+                    m_requestCallbackTimer.Stop();
                     
                     if (m_requestState == RequestState.Aborted)
                     {
@@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e);                
+                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e);
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 5c42e94..edac4a4 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_lastErrorMessage = errorMessage;
                 Console.WriteLine("About to pulse ArchiverTests on LoadCompleted");
                                 
-                Monitor.PulseAll(this);                
+                Monitor.PulseAll(this);
             }
         }
         
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 archiverModule.ArchiveRegion(archiveWriteStream, requestId);
                 //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
                 //while (assetServer.HasWaitingRequests())
-                //    assetServer.ProcessNextRequest();     
+                //    assetServer.ProcessNextRequest();
                 
                 Monitor.Wait(this, 60000);
             }
@@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             
             // Also check that direct entries which will also have a file entry containing that directory doesn't 
             // upset load
-            tar.WriteDir(ArchiveConstants.TERRAINS_PATH);            
+            tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
 
             tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile());
 
@@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             {
                 scene.EventManager.OnOarFileLoaded += LoadCompleted;
                 archiverModule.DearchiveRegion(archiveReadStream);
-            }            
+            }
             
             Assert.That(m_lastErrorMessage, Is.Null);
 
@@ -271,7 +271,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
         /// <summary>
         /// Test merging a V0.2 OpenSim Region Archive into an existing scene
-        /// </summary>        
+        /// </summary>
         //[Test]
         public void TestMergeOarV0_2()
         {
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 75b3fe6..4896edf 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -33,7 +33,6 @@ using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -47,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private Scene m_scene;
 
-        private EstateTerrainXferHandler TerrainUploader = null;
+        private EstateTerrainXferHandler TerrainUploader;
 
         #region Packet Data Responders
 
@@ -155,6 +154,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     break;
             }
             m_scene.RegionInfo.RegionSettings.Save();
+            sendRegionInfoPacketToAll();
         }
 
         public void setEstateTerrainTextureHeights(IClientAPI client, int corner, float lowValue, float highValue)
@@ -179,6 +179,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     break;
             }
             m_scene.RegionInfo.RegionSettings.Save();
+            sendRegionInfoPacketToAll();
         }
 
         private void handleCommitEstateTerrainTextureRequest(IClientAPI remoteClient)
@@ -668,7 +669,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 LookupUUID(uuidNameLookupList);
         }
 
-        private void LookupUUIDSCompleted(IAsyncResult iar)
+        private static void LookupUUIDSCompleted(IAsyncResult iar)
         {
             LookupUUIDS icon = (LookupUUIDS)iar.AsyncState;
             icon.EndInvoke(iar);
@@ -683,7 +684,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         }
         private void LookupUUIDsAsync(List<UUID> uuidLst)
         {
-            UUID[] uuidarr = new UUID[0];
+            UUID[] uuidarr;
 
             lock (uuidLst)
             {
@@ -707,7 +708,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             for (int i = 0; i < avatars.Count; i++)
             {
-                HandleRegionInfoRequest(avatars[i].ControllingClient); ;
+                HandleRegionInfoRequest(avatars[i].ControllingClient);
             }
         }
 
@@ -768,7 +769,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             else
             {
                 m_scene.RegionInfo.EstateSettings.UseGlobalTime = false;
-                m_scene.RegionInfo.EstateSettings.SunPosition = (double)(parms2 - 0x1800)/1024.0;
+                m_scene.RegionInfo.EstateSettings.SunPosition = (parms2 - 0x1800)/1024.0;
             }
 
             if ((parms1 & 0x00000010) != 0)
@@ -828,8 +829,108 @@ namespace OpenSim.Region.CoreModules.World.Estate
             m_scene.RegisterModuleInterface<IEstateModule>(this);
             m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
             m_scene.EventManager.OnRequestChangeWaterHeight += changeWaterHeight;
+
+            m_scene.AddCommand(this, "set terrain texture",
+                               "set terrain texture <number> <uuid> [<x>] [<y>]",
+                               "Sets the terrain <number> to <uuid>, if <x> or <y> are specified, it will only " +
+                               "set it on regions with a matching coordinate. Specify -1 in <x> or <y> to wildcard" +
+                               " that coordinate.",
+                               consoleSetTerrainTexture);
+
+            m_scene.AddCommand(this, "set terrain heights",
+                               "set terrain heights <corner> <min> <max> [<x>] [<y>]",
+                               "Sets the terrain texture heights on corner #<corner> to <min>/<max>, if <x> or <y> are specified, it will only " +
+                               "set it on regions with a matching coordinate. Specify -1 in <x> or <y> to wildcard" +
+                               " that coordinate. Corner # SW = 0, NW = 1, SE = 2, NE = 3.",
+                               consoleSetTerrainHeights);
+        }
+
+        #region Console Commands
+
+        public void consoleSetTerrainTexture(string module, string[] args)
+        {
+            string num = args[3];
+            string uuid = args[4];
+            int x = (args.Length > 5 ? int.Parse(args[5]) : -1);
+            int y = (args.Length > 6 ? int.Parse(args[6]) : -1);
+
+            if (x == -1 || m_scene.RegionInfo.RegionLocX == x)
+            {
+                if (y == -1 || m_scene.RegionInfo.RegionLocY == y)
+                {
+                    int corner = int.Parse(num);
+                    UUID texture = UUID.Parse(uuid);
+
+                    m_log.Debug("[ESTATEMODULE] Setting terrain textures for " + m_scene.RegionInfo.RegionName +
+                                string.Format(" (C#{0} = {1})", corner, texture));
+
+                    switch (corner)
+                    {
+                        case 0:
+                            m_scene.RegionInfo.RegionSettings.TerrainTexture1 = texture;
+                            break;
+                        case 1:
+                            m_scene.RegionInfo.RegionSettings.TerrainTexture2 = texture;
+                            break;
+                        case 2:
+                            m_scene.RegionInfo.RegionSettings.TerrainTexture3 = texture;
+                            break;
+                        case 3:
+                            m_scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
+                            break;
+                    }
+                    m_scene.RegionInfo.RegionSettings.Save();
+                    sendRegionInfoPacketToAll();
+
+                }
+            }
+         }
+ 
+        public void consoleSetTerrainHeights(string module, string[] args)
+        {
+            string num = args[3];
+            string min = args[4];
+            string max = args[5];
+            int x = (args.Length > 6 ? int.Parse(args[6]) : -1);
+            int y = (args.Length > 7 ? int.Parse(args[7]) : -1);
+
+            if (x == -1 || m_scene.RegionInfo.RegionLocX == x)
+            {
+                if (y == -1 || m_scene.RegionInfo.RegionLocY == y)
+                {
+                    int corner = int.Parse(num);
+                    float lowValue = float.Parse(min);
+                    float highValue = float.Parse(max);
+
+                    m_log.Debug("[ESTATEMODULE] Setting terrain heights " + m_scene.RegionInfo.RegionName +
+                                string.Format(" (C{0}, {1}-{2}", corner, lowValue, highValue));
+
+                    switch (corner)
+                    {
+                        case 0:
+                            m_scene.RegionInfo.RegionSettings.Elevation1SW = lowValue;
+                            m_scene.RegionInfo.RegionSettings.Elevation2SW = highValue;
+                            break;
+                        case 1:
+                            m_scene.RegionInfo.RegionSettings.Elevation1NW = lowValue;
+                            m_scene.RegionInfo.RegionSettings.Elevation2NW = highValue;
+                            break;
+                        case 2:
+                            m_scene.RegionInfo.RegionSettings.Elevation1SE = lowValue;
+                            m_scene.RegionInfo.RegionSettings.Elevation2SE = highValue;
+                            break;
+                        case 3:
+                            m_scene.RegionInfo.RegionSettings.Elevation1NE = lowValue;
+                            m_scene.RegionInfo.RegionSettings.Elevation2NE = highValue;
+                            break;
+                    }
+                    m_scene.RegionInfo.RegionSettings.Save();
+                    sendRegionHandshakeToAll();
+                }
+            }
         }
 
+        #endregion
 
         public void PostInitialise()
         {
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 76ff6da..fdff61e 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -36,10 +36,12 @@ using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using Caps=OpenSim.Framework.Capabilities.Caps;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.World.Land
 {
@@ -1301,7 +1303,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     else
                     {
                         // a parcel request for a parcel in another region. Ask the grid about the region
-                        RegionInfo info = m_scene.CommsManager.GridService.RequestNeighbourInfo(regionID);
+                        GridRegion info = m_scene.GridService.GetRegionByUUID(UUID.Zero, regionID);
                         if (info != null)
                             parcelID = Util.BuildFakeParcelID(info.RegionHandle, x, y);
                     }
@@ -1359,9 +1361,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
                 else
                 {
-                    extLandData.landData = m_scene.CommsManager.GridService.RequestLandData(extLandData.regionHandle,
-                                                                                            extLandData.x,
-                                                                                            extLandData.y);
+                    ILandService landService = m_scene.RequestModuleInterface<ILandService>();
+                    extLandData.landData = landService.GetLandData(extLandData.regionHandle,
+                                                                   extLandData.x,
+                                                                   extLandData.y);
                     if (extLandData.landData == null)
                     {
                         // we didn't find the region/land => don't cache
@@ -1373,20 +1376,27 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if (data != null)  // if we found some data, send it
             {
-                RegionInfo info;
+                GridRegion info;
                 if (data.regionHandle == m_scene.RegionInfo.RegionHandle)
                 {
-                    info = m_scene.RegionInfo;
+                    info = new GridRegion(m_scene.RegionInfo);
                 }
                 else
                 {
                     // most likely still cached from building the extLandData entry
-                    info = m_scene.CommsManager.GridService.RequestNeighbourInfo(data.regionHandle);
+                    uint x = 0, y = 0;
+                    Utils.LongToUInts(data.regionHandle, out x, out y);
+                    info = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
                 }
                 // we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark.
                 m_log.DebugFormat("[LAND] got parcelinfo for parcel {0} in region {1}; sending...",
                                   data.landData.Name, data.regionHandle);
-                remoteClient.SendParcelInfo(info, data.landData, parcelID, data.x, data.y);
+                // HACK for now
+                RegionInfo r = new RegionInfo();
+                r.RegionName = info.RegionName;
+                r.RegionLocX = (uint)info.RegionLocX;
+                r.RegionLocY = (uint)info.RegionLocY;
+                remoteClient.SendParcelInfo(r, data.landData, parcelID, data.x, data.y);
             }
             else
                 m_log.Debug("[LAND] got no parcelinfo; not sending");
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 2701f60..3be5f45 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -954,7 +954,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void SetMediaUrl(string url)
         {
             landData.MediaURL = url;
-            sendLandUpdateToAvatarsOverMe();            
+            sendLandUpdateToAvatarsOverMe();
         }
         
         /// <summary>
@@ -964,7 +964,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void SetMusicUrl(string url)
         {
             landData.MusicURL = url;
-            sendLandUpdateToAvatarsOverMe();            
+            sendLandUpdateToAvatarsOverMe();
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs
index 65f22b1..2cbaf96 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         private void LocalRezObject(IClientAPI remoteclient, UUID itemid, Vector3 rayend, Vector3 raystart, 
             UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem, 
             UUID fromtaskid)
-        {     
+        {
             int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX;
             int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY;
             rayend.X += differenceX * (int)Constants.RegionSize;
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
index 1436912..05d19a2 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Framework.Console;
 
 namespace OpenSim.Region.CoreModules.World.Land
 {
@@ -61,7 +62,10 @@ namespace OpenSim.Region.CoreModules.World.Land
             IConfig myConfig = source.Configs["Startup"];
             enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false);
             //enabledYN = true;
-        }
+            if (enabledYN)
+                MainConsole.Instance.Commands.AddCommand("RegionCombinerModule", false, "fix-phantoms",
+                    "Fix phantom objects", "Fixes phantom objects after an import to megaregions", FixPhantoms);
+            }
 
         public void Close()
         {
@@ -79,12 +83,12 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
             if (!enabledYN)
                 return;
-
+/* 
             // For testing on a single instance
             if (scene.RegionInfo.RegionLocX == 1004 && scene.RegionInfo.RegionLocY == 1000)
                 return;
-            //
-
+            // 
+*/
             lock (m_startingScenes)
                 m_startingScenes.Add(scene.RegionInfo.originRegionID, scene);
 
@@ -504,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             scene.WestBorders[0].TriggerRegionY = conn.RegionScene.RegionInfo.RegionLocY;
                         }
 
-                        /*  
+                        /*
                                                 else
                                                 {
                                                     conn.RegionScene.NorthBorders[0].BorderLine.Z += (int)Constants.RegionSize;
@@ -876,7 +880,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject;
             VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED
             VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED
-            VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED            
+            VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED
             VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage;
             VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED
@@ -895,11 +899,11 @@ namespace OpenSim.Region.CoreModules.World.Land
             VirtualRegion.Permissions.OnDelinkObject += BigRegion.PermissionModule.CanDelinkObject; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnBuyLand += BigRegion.PermissionModule.CanBuyLand; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnViewNotecard += BigRegion.PermissionModule.CanViewNotecard; //NOT YET IMPLEMENTED
-            VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED                       
-            VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED            
-            VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED            
+            VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED
+            VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED
+            VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnCreateObjectInventory += BigRegion.PermissionModule.CanCreateObjectInventory; //NOT IMPLEMENTED HERE 
-            VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED            
+            VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
             VirtualRegion.Permissions.OnCopyObjectInventory += BigRegion.PermissionModule.CanCopyObjectInventory; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnDeleteObjectInventory += BigRegion.PermissionModule.CanDeleteObjectInventory; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnResetScript += BigRegion.PermissionModule.CanResetScript;
@@ -910,5 +914,20 @@ namespace OpenSim.Region.CoreModules.World.Land
             VirtualRegion.Permissions.OnTeleport += BigRegion.PermissionModule.CanTeleport; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnUseObjectReturn += BigRegion.PermissionModule.CanUseObjectReturn; //NOT YET IMPLEMENTED
         }
+
+        #region console commands
+        public void FixPhantoms(string module, string[] cmdparams)
+        {
+        List<Scene> scenes = new List<Scene>(m_startingScenes.Values);
+            foreach (Scene s in scenes)
+            {
+                s.ForEachSOG(delegate(SceneObjectGroup e)
+                {
+                    e.AbsolutePosition = e.AbsolutePosition;
+                }
+                );
+            }
+        }
+        #endregion
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index f360577..a9e0b7f 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         //private uint PERM_MODIFY = (uint)16384;
         private uint PERM_MOVE = (uint)524288;
         private uint PERM_TRANS = (uint)8192;
-        private uint PERM_LOCKED = (uint)540672;  
+        private uint PERM_LOCKED = (uint)540672;
         
         /// <value>
         /// Different user set names that come in from the configuration file.
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             Administrators
         };
 
-        #endregion   
+        #endregion
 
         #region Bypass Permissions / Debug Permissions Stuff
 
@@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <value>
         /// The set of users that are allowed to edit (save) scripts.  This is only active if 
         /// permissions are not being bypassed.  This overrides normal permissions.-
-        /// </value>        
+        /// </value>
         private UserSet m_allowedScriptEditors = UserSet.All;
         
         private Dictionary<string, bool> GrantLSL = new Dictionary<string, bool>();
@@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
             m_scene.Permissions.OnDeleteObject += CanDeleteObject; //MAYBE FULLY IMPLEMENTED
             m_scene.Permissions.OnEditObject += CanEditObject; //MAYBE FULLY IMPLEMENTED
-            m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED            
+            m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED
             m_scene.Permissions.OnInstantMessage += CanInstantMessage;
             m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; //FULLY IMPLEMENTED
@@ -210,12 +210,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.Permissions.OnBuyLand += CanBuyLand; //NOT YET IMPLEMENTED
             
             m_scene.Permissions.OnViewNotecard += CanViewNotecard; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED                       
-            m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED            
-            m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED            
+            m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED
+            m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED
+            m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED
             
             m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory; //NOT IMPLEMENTED HERE 
-            m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED            
+            m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
             m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnResetScript += CanResetScript;
@@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 foreach (string uuidl in grant.Split(',')) {
                     string uuid = uuidl.Trim(" \t".ToCharArray());
                     GrantLSL.Add(uuid, true);
-                }                
+                }
             }
 
             grant = myConfig.GetString("GrantCS","");
@@ -431,7 +431,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 m_log.ErrorFormat(
                     "[PERMISSIONS]: {0} is not a valid {1} value, setting to {2}",
                     rawSetting, settingName, userSet);
-            }            
+            }
             
             m_log.DebugFormat("[PERMISSIONS]: {0} {1}", settingName, userSet);
             
@@ -942,7 +942,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (m_bypassPermissions) return m_bypassPermissionsValue;
                             
             if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(user))
-                return false;   
+                return false;
             
             // Ordinarily, if you can view it, you can edit it
             // There is no viewing a no mod script
@@ -957,7 +957,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <param name="objectID"></param>
         /// <param name="user"></param>
         /// <param name="scene"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user, Scene scene)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
@@ -1377,11 +1377,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <param name="objectID"></param>
         /// <param name="user"></param>
         /// <param name="scene"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
-            if (m_bypassPermissions) return m_bypassPermissionsValue;           
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
 
             if (objectID == UUID.Zero) // User inventory
             {
@@ -1472,7 +1472,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <param name="objectID"></param>
         /// <param name="user"></param>
         /// <param name="scene"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
         private bool CanViewNotecard(UUID notecard, UUID objectID, UUID user, Scene scene)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
@@ -1609,7 +1609,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// </summary>
         /// <param name="invType"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
         private bool CanCreateUserInventory(int invType, UUID userID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
@@ -1619,7 +1619,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 if (m_allowedScriptCreators == UserSet.Administrators && !IsAdministrator(userID))
                     return false;
             
-            return true;            
+            return true;
         }
         
         /// <summary>
@@ -1627,27 +1627,27 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// </summary>
         /// <param name="itemID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
         private bool CanCopyUserInventory(UUID itemID, UUID userID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return true;            
-        }        
+            return true;
+        }
         
         /// <summary>
         /// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
         /// </summary>
         /// <param name="itemID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
         private bool CanEditUserInventory(UUID itemID, UUID userID)
-        {            
+        {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return true;            
+            return true;
         }
         
         /// <summary>
@@ -1655,14 +1655,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// </summary>
         /// <param name="itemID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
         private bool CanDeleteUserInventory(UUID itemID, UUID userID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return true;            
-        }        
+            return true;
+        }
 
         private bool CanTeleport(UUID userID, Scene scene)
         {
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index e0331d3..58e4261 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName)
         {
             SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName);
-        }       
+        }
 
         public SceneObjectGroup DeserializeGroupFromXml2(string xmlString)
         {
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index 373b6ab..799a448 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         {
             m_serialiserModule = new SerialiserModule();
             m_scene = SceneSetupHelpers.SetupScene("");
-            SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule);            
+            SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule);
         }
 
         [Test]
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     continue;
                 
                 switch (xtr.Name)
-                {                   
+                {
                     case "UUID":
                         xtr.ReadStartElement("UUID");
                         uuid = UUID.Parse(xtr.ReadElementString("Guid"));
@@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     case "CreatorID":
                         xtr.ReadStartElement("CreatorID");
                         creatorId = UUID.Parse(xtr.ReadElementString("Guid"));
-                        xtr.ReadEndElement();                  
+                        xtr.ReadEndElement();
                         break;
                 }
             }
@@ -325,8 +325,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             // TODO: More checks
             Assert.That(uuid, Is.EqualTo(rpUuid));
             Assert.That(name, Is.EqualTo(rpName));
-            Assert.That(creatorId, Is.EqualTo(rpCreatorId));           
-        }        
+            Assert.That(creatorId, Is.EqualTo(rpCreatorId));
+        }
 
         [Test]
         public void TestDeserializeXml2()
@@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             string xml2 = m_serialiserModule.SerializeGroupToXml2(so);
 
             XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
-            xtr.ReadStartElement("SceneObjectGroup");      
+            xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("SceneObjectPart");
            
             UUID uuid = UUID.Zero;
@@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     continue;
                 
                 switch (xtr.Name)
-                {                   
+                {
                     case "UUID":
                         xtr.ReadStartElement("UUID");
                         uuid = UUID.Parse(xtr.ReadElementString("Guid"));
@@ -397,7 +397,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     case "CreatorID":
                         xtr.ReadStartElement("CreatorID");
                         creatorId = UUID.Parse(xtr.ReadElementString("Guid"));
-                        xtr.ReadEndElement();                  
+                        xtr.ReadEndElement();
                         break;
                 }
             }
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 6cc0ed9..37f1f2e 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -33,9 +33,9 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.World.Sound
-{        
+{
     public class SoundModule : IRegionModule, ISoundModule
-    {        
+    {
         //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         protected Scene m_scene;
@@ -68,11 +68,11 @@ namespace OpenSim.Region.CoreModules.World.Sound
                 if (dis > 100.0) // Max audio distance
                     continue;
                 
-                // Scale by distance          
+                // Scale by distance
                 gain = (float)((double)gain*((100.0 - dis) / 100.0));
                 
                 p.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags);
-            }                
+            }
         }
         
         public virtual void TriggerSound(
@@ -84,12 +84,12 @@ namespace OpenSim.Region.CoreModules.World.Sound
                 if (dis > 100.0) // Max audio distance
                     continue;
                 
-                // Scale by distance          
+                // Scale by distance
                 gain = (float)((double)gain*((100.0 - dis) / 100.0));
                 
                 p.ControllingClient.SendTriggeredSound(
                     soundId, ownerID, objectID, parentID, handle, position, (float)gain);
-            }            
-        }  
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index aa38c09..0712a7f 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules
                 m_DayLengthHours  = config.Configs["Sun"].GetDouble("day_length", d_day_length);
 
                 // Horizon shift, this is used to shift the sun's orbit, this affects the day / night ratio
-                // must hard code to ~.5 to match sun position in LL based viewers                
+                // must hard code to ~.5 to match sun position in LL based viewers
                 m_HorizonShift   = config.Configs["Sun"].GetDouble("day_night_offset", d_day_night);
 
                 
@@ -494,7 +494,7 @@ namespace OpenSim.Region.CoreModules
                 receivedEstateToolsSunUpdate = true;
 
                 // Generate shared values
-                GenSunPos();        
+                GenSunPos();
 
                 // When sun settings are updated, we should update all clients with new settings.
                 SunUpdateToAllClients();
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index a09315a..c2ad7b8 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
         protected Scene m_scene;
         
         protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree };
-        public PCode[] CreationCapabilities { get { return creationCapabilities; } }            
+        public PCode[] CreationCapabilities { get { return creationCapabilities; } }
         
         public void Initialise(Scene scene, IConfigSource source)
         {
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
             UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
         {
             if (Array.IndexOf(creationCapabilities, (PCode)shape.PCode) < 0)
-            {    
+            {
                 m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name);
                 return null;
             }
@@ -111,6 +111,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
                     tree.Scale = new Vector3(4, 4, 4);
                     break;
             }
-        }        
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
index 41d2071..9d47e19 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
 
         private float m_avgStrength = 5.0f; // Average magnitude of the wind vector
         private float m_avgDirection = 0.0f; // Average direction of the wind in degrees
-        private float m_varStrength = 5.0f; // Max Strength  Variance  
+        private float m_varStrength = 5.0f; // Max Strength  Variance
         private float m_varDirection = 30.0f;// Max Direction Variance
         private float m_rateChange = 1.0f; // 
 
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
                 {
                     m_windSpeeds[y * 16 + x] = m_curPredominateWind;
                 }
-            }            
+            }
         }
 
         public Vector3 WindSpeed(float fX, float fY, float fZ)
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
index 2c371da..071e20b 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
                         m_windSpeeds[y * 16 + x].Y *= m_strength;
                     }
                 }
-            }            
+            }
         }
 
         public Vector3 WindSpeed(float fX, float fY, float fZ)
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index b442f6f..3283c1f 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules
                 }
 
                 avatar.ControllingClient.SendWindData(windSpeeds);
-            }            
+            }
         }
 
         private void SendWindAllClients()
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 4783b35..436f332 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -33,6 +33,8 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Hypergrid;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
@@ -92,13 +94,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
             
             // try to fetch from GridServer
-            List<RegionInfo> regionInfos = m_scene.SceneGridService.RequestNamedRegions(mapName, 20);
+            List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(UUID.Zero, mapName, 20);
             if (regionInfos == null)
             {
                 m_log.Warn("[MAPSEARCHMODULE]: RequestNamedRegions returned null. Old gridserver?");
                 // service wasn't available; maybe still an old GridServer. Try the old API, though it will return only one region
-                regionInfos = new List<RegionInfo>();
-                RegionInfo info = m_scene.SceneGridService.RequestClosestRegion(mapName);
+                regionInfos = new List<GridRegion>();
+                GridRegion info = m_scene.GridService.GetRegionByName(UUID.Zero, mapName);
                 if (info != null) regionInfos.Add(info);
             }
 
@@ -109,11 +111,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if (mapName.Contains(".") && mapName.Contains(":"))
                 {
                     // It probably is a domain name. Try to link to it.
-                    RegionInfo regInfo;
+                    GridRegion regInfo;
                     Scene cScene = GetClientScene(remoteClient);
-                    regInfo = HGHyperlink.TryLinkRegion(cScene, remoteClient, mapName);
-                    if (regInfo != null)
-                        regionInfos.Add(regInfo);
+                    IHyperlinkService hyperService = cScene.RequestModuleInterface<IHyperlinkService>();
+                    if (hyperService != null)
+                    {
+                        regInfo = hyperService.TryLinkRegion(remoteClient, mapName);
+                        if (regInfo != null)
+                            regionInfos.Add(regInfo);
+                    }
                 }
             }
 
@@ -122,17 +128,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             MapBlockData data;
             if (regionInfos.Count > 0)
             {
-                foreach (RegionInfo info in regionInfos)
+                foreach (GridRegion info in regionInfos)
                 {
                     data = new MapBlockData();
                     data.Agents = 0;
-                    data.Access = info.AccessLevel;
-                    data.MapImageId = info.RegionSettings.TerrainImageID;
+                    data.Access = info.Access;
+                    data.MapImageId = info.TerrainImage;
                     data.Name = info.RegionName;
                     data.RegionFlags = 0; // TODO not used?
                     data.WaterHeight = 0; // not used
-                    data.X = (ushort)info.RegionLocX;
-                    data.Y = (ushort)info.RegionLocY;
+                    data.X = (ushort)(info.RegionLocX / Constants.RegionSize);
+                    data.Y = (ushort)(info.RegionLocY / Constants.RegionSize);
                     blocks.Add(data);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 1f25f28..05ed70a 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -48,6 +48,7 @@ using OpenSim.Region.Framework.Scenes;
 using Caps=OpenSim.Framework.Capabilities.Caps;
 using OSDArray=OpenMetaverse.StructuredData.OSDArray;
 using OSDMap=OpenMetaverse.StructuredData.OSDMap;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
@@ -232,10 +233,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 }
                 if (lookup)
                 {
-                    List<MapBlockData> mapBlocks;
-
-                    mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8);
-                    avatarPresence.ControllingClient.SendMapBlock(mapBlocks,0);
+                    List<MapBlockData> mapBlocks = new List<MapBlockData>(); ;
+
+                    List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+                        (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize,
+                        (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize,
+                        (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
+                        (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize);
+                    foreach (GridRegion r in regions)
+                    {
+                        MapBlockData block = new MapBlockData();
+                        MapBlockFromGridRegion(block, r);
+                        mapBlocks.Add(block);
+                    }
+                    avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
 
                     lock (cachedMapBlocks)
                         cachedMapBlocks = mapBlocks;
@@ -579,7 +590,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
             if (httpserver.Length == 0)
             {
-                RegionInfo mreg = m_scene.SceneGridService.RequestNeighbouringRegionInfo(regionhandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regionhandle, out x, out y);
+                GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); 
 
                 if (mreg != null)
                 {
@@ -719,15 +732,25 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 List<MapBlockData> response = new List<MapBlockData>();
 
-                // this should return one mapblock at most. But make sure: Look whether the one we requested is in there
-                List<MapBlockData> mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
-                if (mapBlocks != null)
+                // this should return one mapblock at most. 
+                // (diva note: why?? in that case we should GetRegionByPosition)
+                // But make sure: Look whether the one we requested is in there
+                List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+                    minX * (int)Constants.RegionSize, 
+                    maxX * (int)Constants.RegionSize, 
+                    minY * (int)Constants.RegionSize, 
+                    maxY * (int)Constants.RegionSize);
+
+                if (regions != null)
                 {
-                    foreach (MapBlockData block in mapBlocks)
+                    foreach (GridRegion r in regions)
                     {
-                        if (block.X == minX && block.Y == minY)
+                        if ((r.RegionLocX == minX * (int)Constants.RegionSize) && 
+                            (r.RegionLocY == minY * (int)Constants.RegionSize))
                         {
                             // found it => add it to response
+                            MapBlockData block = new MapBlockData();
+                            MapBlockFromGridRegion(block, r);
                             response.Add(block);
                             break;
                         }
@@ -754,10 +777,30 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         protected virtual void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            List<MapBlockData> mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, maxX + 4, maxY + 4);
+            List<MapBlockData> mapBlocks = new List<MapBlockData>();
+            List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+                (minX - 4) * (int)Constants.RegionSize, 
+                (maxX + 4) * (int)Constants.RegionSize,
+                (minY - 4) * (int)Constants.RegionSize,
+                (maxY + 4) * (int)Constants.RegionSize);
+            foreach (GridRegion r in regions)
+            {
+                MapBlockData block = new MapBlockData();
+                MapBlockFromGridRegion(block, r);
+                mapBlocks.Add(block);
+            }
             remoteClient.SendMapBlock(mapBlocks, flag);
         }
 
+        protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r)
+        {
+            block.Access = r.Access;
+            block.MapImageId = r.TerrainImage;
+            block.Name = r.RegionName;
+            block.X = (ushort)(r.RegionLocX / Constants.RegionSize);
+            block.Y = (ushort)(r.RegionLocY / Constants.RegionSize);
+        }
+
         public Hashtable OnHTTPGetMapImage(Hashtable keysvals)
         {
             m_log.Debug("[WORLD MAP]: Sending map image jpeg");
@@ -874,31 +917,34 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             m_log.InfoFormat(
                 "[WORLD MAP]: Exporting world map for {0} to {1}", m_scene.RegionInfo.RegionName, exportPath);
 
-            List<MapBlockData> mapBlocks =
-                m_scene.CommsManager.GridService.RequestNeighbourMapBlocks(
-                    (int)(m_scene.RegionInfo.RegionLocX - 9),
-                    (int)(m_scene.RegionInfo.RegionLocY - 9),
-                    (int)(m_scene.RegionInfo.RegionLocX + 9),
-                    (int)(m_scene.RegionInfo.RegionLocY + 9));
+            List<MapBlockData> mapBlocks = new List<MapBlockData>();
+            List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+                    (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize,
+                    (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize,
+                    (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize,
+                    (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize);
             List<AssetBase> textures = new List<AssetBase>();
             List<Image> bitImages = new List<Image>();
 
-            foreach (MapBlockData mapBlock in mapBlocks)
+            foreach (GridRegion r in regions)
             {
+                MapBlockData mapBlock = new MapBlockData();
+                MapBlockFromGridRegion(mapBlock, r);
                 AssetBase texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
 
                 if (texAsset != null)
                 {
                     textures.Add(texAsset);
                 }
-                else
-                {
-                    texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
-                    if (texAsset != null)
-                    {
-                        textures.Add(texAsset);
-                    }
-                }
+                //else
+                //{
+                //    // WHAT?!? This doesn't seem right. Commenting (diva)
+                //    texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
+                //    if (texAsset != null)
+                //    {
+                //        textures.Add(texAsset);
+                //    }
+                //}
             }
 
             foreach (AssetBase asset in textures)
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index b45b923..5fff89f 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
 
             if (userInfo != null)
             {
-                UserProfileData userProfile = userInfo.UserProfile;                
+                UserProfileData userProfile = userInfo.UserProfile;
                 firstname = userProfile.FirstName;
                 lastname = userProfile.SurName;
 
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 31222df..8ad4844 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -789,7 +789,7 @@ namespace OpenSim.Region.Examples.SimpleModule
         
         public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
         {
-        }        
+        }
 
         public void SendViewerTime(int phase)
         {
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
index c1ed1ac..0cc8fb6 100644
--- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Interfaces
                                                sbyte type, byte wearableType, uint nextOwnerMask);
         
         void HandleTaskItemUpdateFromTransaction(
-            IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item);      
+            IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item);
 
         void RemoveAgentAssetTransactions(UUID userID);
     }
diff --git a/OpenSim/Region/Framework/Interfaces/ICommander.cs b/OpenSim/Region/Framework/Interfaces/ICommander.cs
index 9371bea..6b872c1 100644
--- a/OpenSim/Region/Framework/Interfaces/ICommander.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICommander.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.Framework.Interfaces
     {
         /// <value>
         /// The name of this commander
-        /// </value>        
+        /// </value>
         string Name { get; }
 
         /// <value>
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// The commands available for this commander
         /// </summary>
-        Dictionary<string, ICommand> Commands { get; }     
+        Dictionary<string, ICommand> Commands { get; }
         
         void ProcessConsoleCommand(string function, string[] args);
         void RegisterCommand(string commandName, ICommand command);
diff --git a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
index a6ca7f1..ce57c44 100644
--- a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
@@ -37,15 +37,15 @@ namespace OpenSim.Region.Framework.Interfaces
         /// small interval.
         /// </summary>
         /// <param name="client"></param>
-        /// <param name="message"></param>        
-        void SendAlertToUser(IClientAPI client, string message);      
+        /// <param name="message"></param>
+        void SendAlertToUser(IClientAPI client, string message);
         
         /// <summary>
         /// Send an alert message to a particular user.
         /// </summary>
         /// <param name="client"></param>
         /// <param name="message"></param>
-        /// <param name="modal"></param>        
+        /// <param name="modal"></param>
         void SendAlertToUser(IClientAPI client, string message, bool modal);
         
         /// <summary>
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Interfaces
         void SendAlertToUser(string firstName, string lastName, string message, bool modal);
         
         /// <summary>
-        /// Send an alert message to all users in the scene.  
+        /// Send an alert message to all users in the scene.
         /// </summary>
         /// <param name="message"></param>
         void SendGeneralAlert(string message);
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="message"></param>
         /// <param name="url"></param>
         void SendUrlToUser(
-            UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url);        
+            UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url);
         
         /// <summary>
         /// Send a notification to all users in the scene.  This notification should remain around until the 
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// 
         /// <param name="fromAvatarID">The user sending the message</param>
         /// <param name="fromAvatarName">The name of the user doing the sending</param>
-        /// <param name="message">The message being sent to the user</param>       
+        /// <param name="message">The message being sent to the user</param>
         void SendNotificationToUsersInRegion(UUID fromAvatarID, string fromAvatarName, string message);
         
         /// <summary>
@@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// 
         /// <param name="fromAvatarID">The user sending the message</param>
         /// <param name="fromAvatarName">The name of the user doing the sending</param>
-        /// <param name="message">The message being sent to the user</param>  
+        /// <param name="message">The message being sent to the user</param>
         void SendNotificationToUsersInEstate(UUID fromAvatarID, string fromAvatarName, string message);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
index f3a3747..c39627c 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
@@ -29,13 +29,13 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Framework.Interfaces    
+namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
     /// Interface to a class that is capable of creating entities
-    /// </summary>        
+    /// </summary>
     public interface IEntityCreator
-    {        
+    {
         /// <summary>
         /// The entities that this class is capable of creating.  These match the PCode format.
         /// </summary>
@@ -51,6 +51,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="rot"></param>
         /// <param name="shape"></param>
         /// <returns>The entity created, or null if the creation failed</returns>
-        SceneObjectGroup CreateEntity(UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape);       
+        SceneObjectGroup CreateEntity(UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 1ed92fb..2c906a2 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// Change every item in this inventory to a new group.
         /// </summary>
-        /// <param name="groupID"></param>        
+        /// <param name="groupID"></param>
         void ChangeInventoryGroup(UUID groupID);
 
         /// <summary>
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="startParam"></param>
         /// <param name="postOnRez"></param>
         /// <param name="engine"></param>
-        /// <param name="stateSource"></param>        
+        /// <param name="stateSource"></param>
         void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
 
         /// <summary>
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Framework.Interfaces
 
         /// <summary>
         /// Return the name with which a client can request a xfer of this prim's inventory metadata
-        /// </summary>      
+        /// </summary>
         string GetInventoryFileName();
 
         bool GetInventoryFileName(IClientAPI client, uint localID);
diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
index af54c76..7a8aba2 100644
--- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Interfaces
-{       
+{
     public interface IFriendsModule
     {
         /// <summary>
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// FIXME: This is somewhat too tightly coupled - it should arguably be possible to offer friendships even if the 
         /// receiving user is not currently online. 
         /// </param>
-        /// <param name="offerMessage"></param>      
-        void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage);        
+        /// <param name="offerMessage"></param>
+        void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs
index 02abb05..552ce01 100644
--- a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Interfaces
-{      
+{
     /// <summary>
     /// This interface provides god related methods
     /// </summary>
@@ -53,6 +53,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="agentID">the person that is being kicked</param>
         /// <param name="kickflags">This isn't used apparently</param>
         /// <param name="reason">The message to send to the user after it's been turned into a field</param>
-        void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason);     
+        void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
index 1622564..2d038ce 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
@@ -30,7 +30,7 @@ using System.IO;
 using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Region.Framework.Interfaces
-{    
+{
     /// <summary>
     /// Used for the OnInventoryArchiveSaved event.
     /// </summary>
@@ -43,11 +43,11 @@ namespace OpenSim.Region.Framework.Interfaces
     public delegate void InventoryArchiveSaved(
         Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, Exception reportedException);
     
-    public interface IInventoryArchiverModule       
+    public interface IInventoryArchiverModule
     {
         /// <summary>
         /// Fired when an archive inventory save has been completed.
-        /// </summary>        
+        /// </summary>
         event InventoryArchiveSaved OnInventoryArchiveSaved;
         
         /// <summary>
@@ -69,6 +69,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="invPath">The inventory path from which the inventory should be saved.</param>
         /// <param name="saveStream">The stream to which the inventory archive will be saved</param>
         /// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
-        bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream);     
+        bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index 19b8574..74f404f 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
         /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
-        /// <returns>Land object at the point supplied</returns>           
+        /// <returns>Land object at the point supplied</returns>
         ILandObject GetLandObject(int x, int y);
 
         ILandObject GetLandObject(int localID);
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
         /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
-        /// <returns>Land object at the point supplied</returns>           
+        /// <returns>Land object at the point supplied</returns>
         ILandObject GetLandObject(float x, float y);
         
         bool IsLandPrimCountTainted();
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 78b5322..9ad2036 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -52,9 +52,9 @@ namespace OpenSim.Region.Framework.Interfaces
         /// This method occurs asynchronously.  If you want notification of when it has completed then subscribe to
         /// the EventManager.OnOarFileSaved event.
         /// 
-        /// <param name="savePath"></param>  
+        /// <param name="savePath"></param>
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void ArchiveRegion(string savePath, Guid requestId);        
+        void ArchiveRegion(string savePath, Guid requestId);
 
         /// <summary>
         /// Archive the region to a stream.
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// settings in the archive will be ignored.
         /// </param>
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void DearchiveRegion(string loadPath, bool merge, Guid requestId);        
+        void DearchiveRegion(string loadPath, bool merge, Guid requestId);
         
         /// <summary>
         /// Dearchive a region from a stream.  This replaces the existing scene. 
@@ -109,8 +109,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="merge">
         /// If true, the loaded region merges with the existing one rather than replacing it.  Any terrain or region
         /// settings in the archive will be ignored.
-        /// </param>    
+        /// </param>
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void DearchiveRegion(Stream loadStream, bool merge, Guid requestId);        
+        void DearchiveRegion(Stream loadStream, bool merge, Guid requestId);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
index 41a1e51..78bd622 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
@@ -71,21 +71,21 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Load persisted objects from region storage.
         /// </summary>
         /// <param name="regionUUID">the Region UUID</param>
-        /// <returns>List of loaded groups</returns>        
+        /// <returns>List of loaded groups</returns>
         List<SceneObjectGroup> LoadObjects(UUID regionUUID);
 
         /// <summary>
         /// Store a terrain revision in region storage
         /// </summary>
         /// <param name="ter">HeightField data</param>
-        /// <param name="regionID">region UUID</param>      
+        /// <param name="regionID">region UUID</param>
         void StoreTerrain(double[,] terrain, UUID regionID);
         
         /// <summary>
         /// Load the latest terrain revision from region storage
         /// </summary>
         /// <param name="regionID">the region UUID</param>
-        /// <returns>Heightfield data</returns>        
+        /// <returns>Heightfield data</returns>
         double[,] LoadTerrain(UUID regionID);
 
         void StoreLandObject(ILandObject Parcel);
@@ -96,7 +96,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <item>delete from landaccesslist where LandUUID=globalID</item>
         /// </list>
         /// </summary>
-        /// <param name="globalID"></param>     
+        /// <param name="globalID"></param>
         void RemoveLandObject(UUID globalID);
         
         List<LandData> LoadLandObjects(UUID regionUUID);
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
index bfd25d3..e7562a5 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
@@ -117,6 +117,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <param name="grp"></param>
         /// <returns></returns>
-        string SerializeGroupToXml2(SceneObjectGroup grp);        
+        string SerializeGroupToXml2(SceneObjectGroup grp);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index 3d803ee..379fabd 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -29,12 +29,12 @@ using System;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
-{       
+{
     public interface ISoundModule
     {
         void PlayAttachedSound(UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags);
         
         void TriggerSound(
-            UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle);        
+            UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs
index 344601f..403d542 100644
--- a/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
-{        
+{
     public interface IVegetationModule : IEntityCreator
     {
         /// <summary>
@@ -44,6 +44,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="newTree"></param>
         /// <returns></returns>
         SceneObjectGroup AddTree(
-            UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree);        
+            UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree);
     }
 }
diff --git a/OpenSim/Framework/Communications/IHyperlink.cs b/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs
index 5057386..2e555fa 100644
--- a/OpenSim/Framework/Communications/IHyperlink.cs
+++ b/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs
@@ -25,14 +25,21 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Framework.Communications
+
+using System.IO;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Framework.Interfaces
 {
-    public interface IHyperlink
+    public interface IVoiceModule
     {
-        bool IsHyperlinkRegion(ulong handle);
-        RegionInfo GetHyperlinkRegion(ulong handle);
-        ulong FindRegionHandle(ulong handle);
-        bool SendUserInformation(RegionInfo region, AgentCircuitData aCircuit);
-        void AdjustUserInformation(AgentCircuitData aCircuit);
+
+        /// <summary>
+        /// Set the SIP url to be used by a parcel, this will allow manual setting of a SIP address
+        /// for a particular piece of land, allowing region owners to use preconfigured SIP conference channels.
+        /// This is used by osSetParcelSIPAddress
+        /// </summary>
+        void setLandSIPAddress(string SIPAddress,UUID GlobalID);
+        
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
index a0b0888..de1bcd4 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
@@ -26,9 +26,9 @@
  */
 
 namespace OpenSim.Region.Framework.Interfaces
-{        
+{
     public interface IWorldMapModule
     {
-        void LazySaveGeneratedMaptile(byte[] data, bool temporary);        
+        void LazySaveGeneratedMaptile(byte[] data, bool temporary);
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 7ac1e7e..5b571c7 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -34,7 +34,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Scenes
-{        
+{
     class DeleteToInventoryHolder
     {
         public DeRezAction action;
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes
     /// up the main client thread.
     /// </summary>
     public class AsyncSceneObjectGroupDeleter
-    {   
+    {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
@@ -58,16 +58,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// </value>
         public bool Enabled;
         
-        private Timer m_inventoryTicker = new Timer(2000);       
-        private readonly Queue<DeleteToInventoryHolder> m_inventoryDeletes = new Queue<DeleteToInventoryHolder>();        
-        private Scene m_scene;        
+        private Timer m_inventoryTicker = new Timer(2000);
+        private readonly Queue<DeleteToInventoryHolder> m_inventoryDeletes = new Queue<DeleteToInventoryHolder>();
+        private Scene m_scene;
         
         public AsyncSceneObjectGroupDeleter(Scene scene)
         {
             m_scene = scene;
             
             m_inventoryTicker.AutoReset = false;
-            m_inventoryTicker.Elapsed += InventoryRunDeleteTimer;            
+            m_inventoryTicker.Elapsed += InventoryRunDeleteTimer;
         }
 
         /// <summary>
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 //m_log.Debug("[SCENE]: Sent item successfully to inventory, continuing...");
             }
-        }            
+        }
 
         /// <summary>
         /// Move the next object in the queue to inventory.  Then delete it properly from the scene.
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool InventoryDeQueueAndDelete()
         {
-            DeleteToInventoryHolder x = null;            
+            DeleteToInventoryHolder x = null;
  
             try
             {
@@ -142,9 +142,9 @@ namespace OpenSim.Region.Framework.Scenes
                         
                         try
                         {
-                            m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient);                            
+                            m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient);
                             if (x.permissionToDelete)
-                                m_scene.DeleteSceneObject(x.objectGroup, false);                            
+                                m_scene.DeleteSceneObject(x.objectGroup, false);
                         }
                         catch (Exception e)
                         {
@@ -166,6 +166,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_log.Debug("[SCENE]: No objects left in inventory send queue.");
             return false;
-        }        
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
index 06b1d22..72d599a 100644
--- a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (nod.Attributes["name"] != null)
                     {
-                        string name = (string)nod.Attributes["name"].Value;                        
+                        string name = (string)nod.Attributes["name"].Value;
                         UUID id = (UUID)nod.InnerText;
                         string animState = (string)nod.Attributes["state"].Value;
 
diff --git a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
index 1dd9613..5f2eb0d 100644
--- a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
+++ b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         
         /// <summary>
-        /// Variable length strings seem to be null terminated in the animation asset..    but..   
+        /// Variable length strings seem to be null terminated in the animation asset..    but..
         /// use with caution, home grown.
         /// advances the index.
         /// </summary>
@@ -273,7 +273,7 @@ namespace OpenSim.Region.Framework.Scenes
                 byte[] interm = new byte[endpos-i];
                 for (; i<endpos; i++)
                 {
-                    interm[i-startpos] = data[i];       
+                    interm[i-startpos] = data[i];
                 }
                 i++;  // advance past the null character
 
@@ -624,7 +624,7 @@ switch (jointname)
                     case "mWristLeft":
                     case "mWristRight":
                     case "mShoulderLeft":
-                    case "mShoulderRight":    
+                    case "mShoulderRight":
                         // ZYX->ZXY
                         t = y;
                         y = z;
diff --git a/OpenSim/Region/Framework/Scenes/Border.cs b/OpenSim/Region/Framework/Scenes/Border.cs
index 1488c5b..c6a6511 100644
--- a/OpenSim/Region/Framework/Scenes/Border.cs
+++ b/OpenSim/Region/Framework/Scenes/Border.cs
@@ -55,11 +55,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Creates a Border.  The line is perpendicular to the direction cardinal. 
         /// IE: if the direction cardinal is South, the line is West->East
         /// </summary>
-        /// <param name="lineStart">The starting point for the line of the border.  
-        /// The position of an object must be greater then this for this border to trigger.  
+        /// <param name="lineStart">The starting point for the line of the border.
+        /// The position of an object must be greater then this for this border to trigger.
         /// Perpendicular to the direction cardinal</param>
-        /// <param name="lineEnd">The ending point for the line of the border.  
-        /// The position of an object must be less then this for this border to trigger.  
+        /// <param name="lineEnd">The ending point for the line of the border.
+        /// The position of an object must be less then this for this border to trigger.
         /// Perpendicular to the direction cardinal</param>
         /// <param name="triggerCoordinate">The position that triggers border the border 
         /// cross parallel to the direction cardinal.  On the North cardinal, this 
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 00c99c5..c2ec6a5 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Framework.Scenes
         public abstract void UpdateMovement();
 
         /// <summary>
-        /// Performs any updates that need to be done at each frame, as opposed to immediately.  
+        /// Performs any updates that need to be done at each frame, as opposed to immediately.
         /// These included scheduled updates and updates that occur due to physics processing.
         /// </summary>
         public abstract void Update();
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index 504b90a..0ceef39 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_log.ErrorFormat("Remove Entity failed for {0}", localID, e);
                     return false;
-                }                
+                }
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 287d8d9..753344d 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -32,6 +32,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using Caps=OpenSim.Framework.Capabilities.Caps;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -289,7 +290,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Guid.Empty is returned.
         /// </summary>
         public delegate void OarFileSaved(Guid guid, string message);
-        public event OarFileSaved OnOarFileSaved;        
+        public event OarFileSaved OnOarFileSaved;
 
         /// <summary>
         /// Called when the script compile queue becomes empty
@@ -305,6 +306,9 @@ namespace OpenSim.Region.Framework.Scenes
         public delegate void Attach(uint localID, UUID itemID, UUID avatarID);
         public event Attach OnAttach;
 
+        public delegate void RegionUp(GridRegion region);
+        public event RegionUp OnRegionUp;
+
         public class MoneyTransferArgs : EventArgs
         {
             public UUID sender;
@@ -446,6 +450,7 @@ namespace OpenSim.Region.Framework.Scenes
         private EmptyScriptCompileQueue handlerEmptyScriptCompileQueue = null;
 
         private Attach handlerOnAttach = null;
+        private RegionUp handlerOnRegionUp = null;
 
         public void TriggerOnAttach(uint localID, UUID itemID, UUID avatarID)
         {
@@ -999,7 +1004,7 @@ namespace OpenSim.Region.Framework.Scenes
             handlerOarFileSaved = OnOarFileSaved;
             if (handlerOarFileSaved != null)
                 handlerOarFileSaved(requestId, message);
-        }        
+        }
 
         public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message)
         {
@@ -1035,5 +1040,13 @@ namespace OpenSim.Region.Framework.Scenes
             if (handlerSetRootAgentScene != null)
                 handlerSetRootAgentScene(agentID, scene);
         }
+
+        public void TriggerOnRegionUp(GridRegion otherRegion)
+        {
+            handlerOnRegionUp = OnRegionUp;
+            if (handlerOnRegionUp != null)
+                handlerOnRegionUp(otherRegion);
+        }
+
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 5d65f98..b6fa41d 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Clients;
 using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Services.Interfaces;
 
 //using HyperGrid.Framework;
 //using OpenSim.Region.Communications.Hypergrid;
@@ -47,10 +48,21 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // This maps between inventory server urls and inventory server clients
-        private Dictionary<string, InventoryClient> m_inventoryServers = new Dictionary<string, InventoryClient>();
-
+//        private Dictionary<string, InventoryClient> m_inventoryServers = new Dictionary<string, InventoryClient>();
 
         private Scene m_scene;
+
+        private IHyperlinkService m_hyper;
+        IHyperlinkService HyperlinkService
+        {
+            get
+            {
+                if (m_hyper == null)
+                    m_hyper = m_scene.RequestModuleInterface<IHyperlinkService>();
+                return m_hyper;
+            }
+        }
+
         #endregion
 
         #region Constructor
@@ -72,30 +84,14 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
             return null;
         }
 
-        private string UserInventoryURL(UUID userID)
-        {
-            CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
-            if (uinfo != null)
-                return (uinfo.UserProfile.UserInventoryURI == "") ? null : uinfo.UserProfile.UserInventoryURI;
-            return null;
-        }
+//        private string UserInventoryURL(UUID userID)
+//        {
+//            CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
+//            if (uinfo != null)
+//                return (uinfo.UserProfile.UserInventoryURI == "") ? null : uinfo.UserProfile.UserInventoryURI;
+//            return null;
+//        }
 
-        private bool IsLocalUser(UUID userID)
-        {
-            CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
-
-            if (uinfo != null)
-            {
-                if (HGNetworkServersInfo.Singleton.IsLocalUser(uinfo.UserProfile))
-                {
-                    m_log.Debug("[HGScene]: Home user " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName);
-                    return true;
-                }
-            }
-
-            m_log.Debug("[HGScene]: Foreign user " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName);
-            return false;
-        }
 
         public AssetBase FetchAsset(string url, UUID assetID)
         {
@@ -171,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
 
         public void Get(UUID assetID, UUID ownerID)
         {
-            if (!IsLocalUser(ownerID))
+            if (!HyperlinkService.IsLocalUser(ownerID))
             {
                 // Get the item from the remote asset server onto the local AssetCache
                 // and place an entry in m_assetMap
@@ -229,7 +225,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
 
         public void Post(UUID assetID, UUID ownerID)
         {
-            if (!IsLocalUser(ownerID))
+            if (!HyperlinkService.IsLocalUser(ownerID))
             {
                 // Post the item from the local AssetCache onto the remote asset server
                 // and place an entry in m_assetMap
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
deleted file mode 100644
index a576feb..0000000
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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.Net;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Region.Framework.Scenes.Hypergrid
-{
-    public class HGHyperlink
-    {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private static Random random = new Random();
-
-        public static RegionInfo TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, uint xloc, uint yloc)
-        {
-            string host = "127.0.0.1";
-            string portstr;
-            string regionName = "";
-            uint port = 9000;
-            string[] parts = mapName.Split(new char[] { ':' });
-            if (parts.Length >= 1)
-            {
-                host = parts[0];
-            }
-            if (parts.Length >= 2)
-            {
-                portstr = parts[1];
-                if (!UInt32.TryParse(portstr, out port))
-                    regionName = parts[1];
-            }
-            // always take the last one
-            if (parts.Length >= 3)
-            {
-                regionName = parts[2];
-            }
-
-            // Sanity check. Don't ever link to this sim.
-            IPAddress ipaddr = null;
-            try
-            {
-                ipaddr = Util.GetHostFromDNS(host);
-            }
-            catch { }
-
-            if ((ipaddr != null) &&
-                !((m_scene.RegionInfo.ExternalEndPoint.Address.Equals(ipaddr)) && (m_scene.RegionInfo.HttpPort == port)))
-            {
-                RegionInfo regInfo;
-                bool success = TryCreateLink(m_scene, client, xloc, yloc, regionName, port, host, out regInfo);
-                if (success)
-                {
-                    regInfo.RegionName = mapName;
-                    return regInfo;
-                }
-            }
-
-            return null;
-        }
-
-        public static RegionInfo TryLinkRegion(Scene m_scene, IClientAPI client, string mapName)
-        {
-            uint xloc = (uint)(random.Next(0, Int16.MaxValue));
-            return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0);
-        }
-
-        public static bool TryCreateLink(Scene m_scene, IClientAPI client, uint xloc, uint yloc, 
-            string externalRegionName, uint externalPort, string externalHostName, out RegionInfo regInfo)
-        {
-            m_log.DebugFormat("[HGrid]: Link to {0}:{1}, in {2}-{3}", externalHostName, externalPort, xloc, yloc);
-
-            regInfo = new RegionInfo();
-            regInfo.RegionName = externalRegionName;
-            regInfo.HttpPort = externalPort;
-            regInfo.ExternalHostName = externalHostName;
-            regInfo.RegionLocX = xloc;
-            regInfo.RegionLocY = yloc;
-
-            try
-            {
-                regInfo.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)0);
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[HGrid]: Wrong format for link-region: " + e.Message);
-                return false;
-            }
-            regInfo.RemotingAddress = regInfo.ExternalEndPoint.Address.ToString();
-
-            // Finally, link it
-            try
-            {
-                m_scene.CommsManager.GridService.RegisterRegion(regInfo);
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[HGrid]: Unable to link region: " + e.Message);
-                return false;
-            }
-
-            uint x, y;
-            if (!Check4096(m_scene, regInfo, out x, out y))
-            {
-                m_scene.CommsManager.GridService.DeregisterRegion(regInfo);
-                if (client != null)
-                    client.SendAlertMessage("Region is too far (" + x + ", " + y + ")");
-                m_log.Info("[HGrid]: Unable to link, region is too far (" + x + ", " + y + ")");
-                return false;
-            }
-
-            if (!CheckCoords(m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, x, y))
-            {
-                m_scene.CommsManager.GridService.DeregisterRegion(regInfo);
-                if (client != null)
-                    client.SendAlertMessage("Region has incompatible coordinates (" + x + ", " + y + ")");
-                m_log.Info("[HGrid]: Unable to link, region has incompatible coordinates (" + x + ", " + y + ")");
-                return false;
-            }
-
-            m_log.Debug("[HGrid]: link region succeeded");
-            return true;
-        }
-
-        public static bool TryUnlinkRegion(Scene m_scene, string mapName)
-        {
-            RegionInfo regInfo = null;
-            if (mapName.Contains(":"))
-            {
-                string host = "127.0.0.1";
-                //string portstr;
-                //string regionName = "";
-                uint port = 9000;
-                string[] parts = mapName.Split(new char[] { ':' });
-                if (parts.Length >= 1)
-                {
-                    host = parts[0];
-                }
-//                if (parts.Length >= 2)
-//                {
-//                    portstr = parts[1];
-//                    if (!UInt32.TryParse(portstr, out port))
-//                        regionName = parts[1];
-//                }
-                // always take the last one
-//                if (parts.Length >= 3)
-//                {
-//                    regionName = parts[2];
-//                }
-                regInfo = m_scene.CommsManager.GridService.RequestNeighbourInfo(host, port);
-            }
-            else
-            {
-                regInfo = m_scene.CommsManager.GridService.RequestNeighbourInfo(mapName);
-            }
-            if (regInfo != null)
-            {
-                return m_scene.CommsManager.GridService.DeregisterRegion(regInfo);
-            }
-            else
-            {
-                m_log.InfoFormat("[HGrid]: Region {0} not found", mapName);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Cope with this viewer limitation.
-        /// </summary>
-        /// <param name="regInfo"></param>
-        /// <returns></returns>
-        public static bool Check4096(Scene m_scene, RegionInfo regInfo, out uint x, out uint y)
-        {
-            ulong realHandle;
-            if (UInt64.TryParse(regInfo.regionSecret, out realHandle))
-            {
-                Utils.LongToUInts(realHandle, out x, out y);
-                x = x / Constants.RegionSize;
-                y = y / Constants.RegionSize;
-
-                if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - (int)x) >= 4096) ||
-                    (Math.Abs((int)m_scene.RegionInfo.RegionLocY - (int)y) >= 4096))
-                {
-                    return false;
-                }
-                return true;
-            }
-            else
-            {
-                m_scene.CommsManager.GridService.RegisterRegion(regInfo);
-                m_log.Debug("[HGrid]: Gnomes. Region deregistered.");
-                x = y = 0;
-                return false;
-            }
-        }
-
-        public static bool CheckCoords(uint thisx, uint thisy, uint x, uint y)
-        {
-            if ((thisx == x) && (thisy == y))
-                return false;
-            return true;
-        }
-
-    }
-}
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index bf55df7..b1981b6 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -29,6 +29,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
@@ -50,7 +51,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
 
                 if (UserProfile != null)
                 {
-                    RegionInfo regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion);
+                    GridRegion regionInfo = GridService.GetRegionByUUID(UUID.Zero, UserProfile.HomeRegionID);
                     //if (regionInfo != null)
                     //{
                     //    UserProfile.HomeRegionID = regionInfo.RegionID;
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 5c99d73..d7e62a8 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -38,6 +38,8 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
@@ -45,11 +47,19 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public readonly IHyperlink m_hg;
+        private IHyperlinkService m_hg;
+        IHyperlinkService HyperlinkService
+        {
+            get
+            {
+                if (m_hg == null)
+                    m_hg = m_scene.RequestModuleInterface<IHyperlinkService>();
+                return m_hg;
+            }
+        }
 
-        public HGSceneCommunicationService(CommunicationsManager commsMan, IHyperlink hg) : base(commsMan)
+        public HGSceneCommunicationService(CommunicationsManager commsMan) : base(commsMan)
         {
-            m_hg = hg;
         }
 
 
@@ -77,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
             if (regionHandle == m_regionInfo.RegionHandle)
             {
                 // Teleport within the same region
-                if (position.X < 0 || position.X > Constants.RegionSize || position.Y < 0 || position.Y > Constants.RegionSize || position.Z < 0)
+                if (IsOutsideRegion(avatar.Scene, position) || position.Z < 0)
                 {
                     Vector3 emergencyPos = new Vector3(128, 128, 128);
 
@@ -89,7 +99,13 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                 // TODO: Get proper AVG Height
                 float localAVHeight = 1.56f;
                 
-                float posZLimit = (float)avatar.Scene.Heightmap[(int)position.X, (int)position.Y];
+                float posZLimit = 22;
+
+                if (position.X > 0 && position.X <= (int)Constants.RegionSize && position.Y > 0 && position.Y <= (int)Constants.RegionSize)
+                {
+                    posZLimit = (float) avatar.Scene.Heightmap[(int) position.X, (int) position.Y];
+                }
+
                 float newPosZ = posZLimit + localAVHeight;
                 if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
                 {
@@ -106,7 +122,10 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
             }
             else
             {
-                RegionInfo reg = RequestNeighbouringRegionInfo(regionHandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regionHandle, out x, out y);
+                GridRegion reg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); 
+
                 if (reg != null)
                 {
 
@@ -119,13 +138,13 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                     /// Hypergrid mod start
                     /// 
                     ///
-                    bool isHyperLink = m_hg.IsHyperlinkRegion(reg.RegionHandle);
+                    bool isHyperLink = (HyperlinkService.GetHyperlinkRegion(reg.RegionHandle) != null);
                     bool isHomeUser = true;
                     ulong realHandle = regionHandle;
                     CachedUserInfo uinfo = m_commsProvider.UserProfileCacheService.GetUserDetails(avatar.UUID);
                     if (uinfo != null)
                     {
-                        isHomeUser = HGNetworkServersInfo.Singleton.IsLocalUser(uinfo.UserProfile);
+                        isHomeUser = HyperlinkService.IsLocalUser(uinfo.UserProfile.ID);
                         realHandle = m_hg.FindRegionHandle(regionHandle);
                         m_log.Debug("XXX ---- home user? " + isHomeUser + " --- hyperlink? " + isHyperLink + " --- real handle: " + realHandle.ToString());
                     }
@@ -338,7 +357,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                             m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
                             m_log.DebugFormat(
                                 "[HGSceneCommService]: User {0} is going to another region, profile cache removed",
-                                avatar.UUID);                            
+                                avatar.UUID);
                         }
                     }
                     else
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index 7c02f9a..73f918e 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes
     
                                       
     public class RegionStatsHandler : IStreamedRequestHandler
-    {        
+    {
         private string osRXStatsURI = String.Empty;
         private string osXStatsURI = String.Empty;
         //private string osSecret = String.Empty;
@@ -87,13 +87,13 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public string Path
-        {   
+        {
             // This is for the region and is the regionSecret hashed
             get { return "/" + osRXStatsURI + "/"; }
         }
         
         private string Report()
-        {            
+        {
             OSDMap args = new OSDMap(30);
             //int time = Util.ToUnixTime(DateTime.Now);
             args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/");
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index eb397f6..a4460e4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1015,7 +1015,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId);
             }
             else
-            {             
+            {
                 InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId);
 
                 if (agentItem == null)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index fddba86..e561efb 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -413,7 +413,7 @@ namespace OpenSim.Region.Framework.Scenes
                 remoteClient.SendInventoryItemDetails(ownerID, item);
             }
             // else shouldn't we send an alert message?
-        }    
+        }
         
         /// <summary>
         /// Tell the client about the various child items and folders contained in the requested folder.
@@ -485,7 +485,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // TODO: This code for looking in the folder for the library should be folded back into the
             // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.
-            // can be handled transparently).            
+            // can be handled transparently).
             InventoryFolderImpl fold;
             if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null)
             {
@@ -515,7 +515,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             return contents;
 
-        }        
+        }
         
         /// <summary>
         /// Handle an inventory folder creation request from the client.
@@ -535,7 +535,7 @@ namespace OpenSim.Region.Framework.Scenes
                      "[AGENT INVENTORY]: Failed to move create folder for user {0} {1}",
                      remoteClient.Name, remoteClient.AgentId);
             }
-        }      
+        }
 
         /// <summary>
         /// Handle a client request to update the inventory folder
@@ -544,7 +544,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE
         /// so this will work to rename an existing folder.  Needless to say, to rely on this is very confusing,
         /// and needs to be changed.
-        ///  
+        ///
         /// <param name="remoteClient"></param>
         /// <param name="folderID"></param>
         /// <param name="type"></param>
@@ -570,7 +570,7 @@ namespace OpenSim.Region.Framework.Scenes
                          remoteClient.Name, remoteClient.AgentId);
                 }
             }
-        }        
+        }
         
         public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID)
         {
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.WarnFormat("[AGENT INVENTORY]: request to move folder {0} but folder not found", folderID);
             }
-        }      
+        }
 
         /// <summary>
         /// This should delete all the items and folders in the given directory.
@@ -609,7 +609,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.WarnFormat("[AGENT INVENTORY]: Exception on purge folder for user {0}: {1}", remoteClient.AgentId, e.Message);
             }
-        }        
+        }
 
 
         private void PurgeFolderAsync(UUID userID, UUID folderID)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 226ec15..d01cef7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -805,7 +805,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="invType"></param>
         /// <param name="objectID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
         public bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID)
         {
             CreateObjectInventoryHandler handler = OnCreateObjectInventory;
@@ -856,7 +856,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="invType"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
         public bool CanCreateUserInventory(int invType, UUID userID)
         {
             CreateUserInventoryHandler handler = OnCreateUserInventory;
@@ -877,7 +877,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="itemID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
         public bool CanEditUserInventory(UUID itemID, UUID userID)
         {
             EditUserInventoryHandler handler = OnEditUserInventory;
@@ -891,14 +891,14 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
             return true;
-        }         
+        }
         
         /// <summary>
         /// Check whether the specified user is allowed to copy the given inventory item from their own inventory.
         /// </summary>
         /// <param name="itemID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
         public bool CanCopyUserInventory(UUID itemID, UUID userID)
         {
             CopyUserInventoryHandler handler = OnCopyUserInventory;
@@ -912,14 +912,14 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
             return true;
-        }         
+        }
         
         /// <summary>
         /// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
         /// </summary>
         /// <param name="itemID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
         public bool CanDeleteUserInventory(UUID itemID, UUID userID)
         {
             DeleteUserInventoryHandler handler = OnDeleteUserInventory;
@@ -933,7 +933,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
             return true;
-        }         
+        }
         
         public bool CanTeleport(UUID userID)
         {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d8478a2..05a6f13 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -49,6 +49,7 @@ using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Region.Physics.Manager;
 using Timer=System.Timers.Timer;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -193,6 +194,26 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        protected IGridService m_GridService = null;
+
+        public IGridService GridService
+        {
+            get
+            {
+                if (m_GridService == null)
+                {
+                    m_GridService = RequestModuleInterface<IGridService>();
+
+                    if (m_GridService == null)
+                    {
+                        throw new Exception("No IGridService available. This could happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set.  Please also check that you have the correct version of your inventory service dll.  Sometimes old versions of this dll will still exist.  Do a clean checkout and re-create the opensim.ini from the opensim.ini.example.");
+                    }
+                }
+
+                return m_GridService;
+            }
+        }
+
         protected IXMLRPC m_xmlrpcModule;
         protected IWorldComm m_worldCommModule;
         protected IAvatarFactory m_AvatarFactory;
@@ -566,10 +587,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Another region is up. Gets called from Grid Comms:
-        /// (OGS1 -> LocalBackEnd -> RegionListened -> SceneCommunicationService)
-        /// We have to tell all our ScenePresences about it, and add it to the
-        /// neighbor list.
+        /// Another region is up. 
         ///
         /// We only add it to the neighbor list if it's within 1 region from here.
         /// Agents may have draw distance values that cross two regions though, so
@@ -578,47 +596,30 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="otherRegion">RegionInfo handle for the new region.</param>
         /// <returns>True after all operations complete, throws exceptions otherwise.</returns>
-        public override bool OtherRegionUp(RegionInfo otherRegion)
+        public override void OtherRegionUp(GridRegion otherRegion)
         {
-            m_log.InfoFormat("[SCENE]: Region {0} up in coords {1}-{2}", otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY);
+            uint xcell = (uint)((int)otherRegion.RegionLocX / (int)Constants.RegionSize);
+            uint ycell = (uint)((int)otherRegion.RegionLocY / (int)Constants.RegionSize);
+            m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}", 
+                RegionInfo.RegionName, otherRegion.RegionName, xcell, ycell);
 
             if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
             {
-                for (int i = 0; i < m_neighbours.Count; i++)
-                {
-                    // The purpose of this loop is to re-update the known neighbors
-                    // when another region comes up on top of another one.
-                    // The latest region in that location ends up in the
-                    // 'known neighbors list'
-                    // Additionally, the commFailTF property gets reset to false.
-                    if (m_neighbours[i].RegionHandle == otherRegion.RegionHandle)
-                    {
-                        lock (m_neighbours)
-                        {
-                            m_neighbours[i] = otherRegion;
-
-                        }
-                    }
-                }
-
-                // If the value isn't in the neighbours, add it.
-                // If the RegionInfo isn't exact but is for the same XY World location,
-                // then the above loop will fix that.
-
-                if (!(CheckNeighborRegion(otherRegion)))
-                {
-                    lock (m_neighbours)
-                    {
-                        m_neighbours.Add(otherRegion);
-                        //m_log.Info("[UP]: " + otherRegion.RegionHandle.ToString());
-                    }
-                }
 
                 // If these are cast to INT because long + negative values + abs returns invalid data
-                int resultX = Math.Abs((int)otherRegion.RegionLocX - (int)RegionInfo.RegionLocX);
-                int resultY = Math.Abs((int)otherRegion.RegionLocY - (int)RegionInfo.RegionLocY);
+                int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX);
+                int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY);
                 if (resultX <= 1 && resultY <= 1)
                 {
+                    // Let the grid service module know, so this can be cached
+                    m_eventManager.TriggerOnRegionUp(otherRegion);
+
+                    RegionInfo regInfo = new RegionInfo(xcell, ycell, otherRegion.InternalEndPoint, otherRegion.ExternalHostName);
+                    regInfo.RegionID = otherRegion.RegionID;
+                    regInfo.RegionName = otherRegion.RegionName;
+                    regInfo.ScopeID = otherRegion.ScopeID;
+                    regInfo.ExternalHostName = otherRegion.ExternalHostName;
+
                     try
                     {
                         ForEachScenePresence(delegate(ScenePresence agent)
@@ -632,7 +633,7 @@ namespace OpenSim.Region.Framework.Scenes
                                                      List<ulong> old = new List<ulong>();
                                                      old.Add(otherRegion.RegionHandle);
                                                      agent.DropOldNeighbours(old);
-                                                     InformClientOfNeighbor(agent, otherRegion);
+                                                     InformClientOfNeighbor(agent, regInfo);
                                                  }
                                              }
                             );
@@ -643,6 +644,7 @@ namespace OpenSim.Region.Framework.Scenes
                         // This shouldn't happen too often anymore.
                         m_log.Error("[SCENE]: Couldn't inform client of regionup because we got a null reference exception");
                     }
+
                 }
                 else
                 {
@@ -651,7 +653,6 @@ namespace OpenSim.Region.Framework.Scenes
                                otherRegion.RegionLocY.ToString() + ")");
                 }
             }
-            return true;
         }
 
         public void AddNeighborRegion(RegionInfo region)
@@ -683,9 +684,10 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         // Alias IncomingHelloNeighbour OtherRegionUp, for now
-        public bool IncomingHelloNeighbour(RegionInfo neighbour)
+        public GridRegion IncomingHelloNeighbour(RegionInfo neighbour)
         {
-            return OtherRegionUp(neighbour);
+            OtherRegionUp(new GridRegion(neighbour));
+            return new GridRegion(RegionInfo);
         }
 
         /// <summary>
@@ -994,7 +996,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     // Loop it
                     if (m_frame == Int32.MaxValue)
-                        m_frame = 0;                   
+                        m_frame = 0;
 
                     otherMS = Environment.TickCount;
                     // run through all entities looking for updates (slow)
@@ -1336,24 +1338,31 @@ namespace OpenSim.Region.Framework.Scenes
             RegisterCommsEvents();
 
             // These two 'commands' *must be* next to each other or sim rebooting fails.
-            m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo);
+            //m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo);
+
+            GridRegion region = new GridRegion(RegionInfo);
+            bool success = GridService.RegisterRegion(RegionInfo.ScopeID, region);
+            if (!success)
+                throw new Exception("Can't register with grid");
+
+            m_sceneGridService.SetScene(this);
             m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);
 
-            Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings();
+            //Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings();
 
-            if (dGridSettings.ContainsKey("allow_forceful_banlines"))
-            {
-                if (dGridSettings["allow_forceful_banlines"] != "TRUE")
-                {
-                    m_log.Info("[GRID]: Grid is disabling forceful parcel banlists");
-                    EventManager.TriggerSetAllowForcefulBan(false);
-                }
-                else
-                {
-                    m_log.Info("[GRID]: Grid is allowing forceful parcel banlists");
-                    EventManager.TriggerSetAllowForcefulBan(true);
-                }
-            }
+            //if (dGridSettings.ContainsKey("allow_forceful_banlines"))
+            //{
+            //    if (dGridSettings["allow_forceful_banlines"] != "TRUE")
+            //    {
+            //        m_log.Info("[GRID]: Grid is disabling forceful parcel banlists");
+            //        EventManager.TriggerSetAllowForcefulBan(false);
+            //    }
+            //    else
+            //    {
+            //        m_log.Info("[GRID]: Grid is allowing forceful parcel banlists");
+            //        EventManager.TriggerSetAllowForcefulBan(true);
+            //    }
+            //}
         }
 
         /// <summary>
@@ -2014,12 +2023,12 @@ namespace OpenSim.Region.Framework.Scenes
                                 return true;
                         }
                         break;
-                    case Cardinals.W:                     
+                    case Cardinals.W:
                         foreach (Border b in WestBorders)
                         {
                             if (b.TestCross(position))
                                 return true;
-                        }                       
+                        }
                         break;
                 }
             }
@@ -2717,10 +2726,12 @@ namespace OpenSim.Region.Framework.Scenes
             UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(agentId);
             if (UserProfile != null)
             {
-                RegionInfo regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegionID);
+                GridRegion regionInfo = GridService.GetRegionByUUID(UUID.Zero, UserProfile.HomeRegionID);
                 if (regionInfo == null)
                 {
-                    regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion);
+                    uint x = 0, y = 0;
+                    Utils.LongToUInts(UserProfile.HomeRegion, out x, out y);
+                    regionInfo = GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
                     if (regionInfo != null) // home region can be away temporarily, too
                     {
                         UserProfile.HomeRegionID = regionInfo.RegionID;
@@ -3074,7 +3085,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_sceneGridService.OnExpectUser += HandleNewUserConnection;
             m_sceneGridService.OnAvatarCrossingIntoRegion += AgentCrossing;
             m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent;
-            m_sceneGridService.OnRegionUp += OtherRegionUp;
+            //m_eventManager.OnRegionUp += OtherRegionUp;
             //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
             m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup;
             //m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
@@ -3102,7 +3113,7 @@ namespace OpenSim.Region.Framework.Scenes
             //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
             m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup;
             //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate;
-            m_sceneGridService.OnRegionUp -= OtherRegionUp;
+            //m_eventManager.OnRegionUp -= OtherRegionUp;
             m_sceneGridService.OnExpectUser -= HandleNewUserConnection;
             m_sceneGridService.OnAvatarCrossingIntoRegion -= AgentCrossing;
             m_sceneGridService.OnCloseAgentConnection -= IncomingCloseAgent;
@@ -3111,7 +3122,11 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_interregionCommsIn != null)
                 m_interregionCommsIn.OnChildAgentUpdate -= IncomingChildAgentDataUpdate;
 
+            // this does nothing; should be removed
             m_sceneGridService.Close();
+
+            if (!GridService.DeregisterRegion(m_regInfo.RegionID))
+                m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", m_regInfo.RegionName);
         }
 
         /// <summary>
@@ -3255,7 +3270,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region",
                                      agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
                     //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName);
-                    return false;    
+                    return false;
                 }
             }
 
@@ -3404,7 +3419,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// We've got an update about an agent that sees into this region, 
         /// send it to ScenePresence for processing  It's the full data.
         /// </summary>
-        /// <param name="cAgentData">Agent that contains all of the relevant things about an agent.  
+        /// <param name="cAgentData">Agent that contains all of the relevant things about an agent.
         /// Appearance, animations, position, etc.</param>
         /// <returns>true if we handled it.</returns>
         public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData)
@@ -3557,30 +3572,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Requests information about this region from gridcomms
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
-        {
-            return m_sceneGridService.RequestNeighbouringRegionInfo(regionHandle);
-        }
-
-        /// <summary>
-        /// Requests textures for map from minimum region to maximum region in world cordinates
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="minX"></param>
-        /// <param name="minY"></param>
-        /// <param name="maxX"></param>
-        /// <param name="maxY"></param>
-        public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
-        {
-            m_log.DebugFormat("[MAPBLOCK]: {0}-{1}, {2}-{3}", minX, minY, maxX, maxY);
-            m_sceneGridService.RequestMapBlocks(remoteClient, minX, minY, maxX, maxY);
-        }
-
-        /// <summary>
         /// Tries to teleport agent to other region.
         /// </summary>
         /// <param name="remoteClient"></param>
@@ -3591,7 +3582,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void RequestTeleportLocation(IClientAPI remoteClient, string regionName, Vector3 position,
                                             Vector3 lookat, uint teleportFlags)
         {
-            RegionInfo regionInfo = m_sceneGridService.RequestClosestRegion(regionName);
+            GridRegion regionInfo = GridService.GetRegionByName(UUID.Zero, regionName);
             if (regionInfo == null)
             {
                 // can't find the region: Tell viewer and abort
@@ -3680,7 +3671,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="position"></param>
         public void RequestTeleportLandmark(IClientAPI remoteClient, UUID regionID, Vector3 position)
         {
-            RegionInfo info = CommsManager.GridService.RequestNeighbourInfo(regionID);
+            GridRegion info = GridService.GetRegionByUUID(UUID.Zero, regionID);
 
             if (info == null)
             {
@@ -3864,10 +3855,6 @@ namespace OpenSim.Region.Framework.Scenes
             return LandChannel.GetLandObject((int)x, (int)y).landData;
         }
 
-        public RegionInfo RequestClosestRegion(string name)
-        {
-            return m_sceneGridService.RequestClosestRegion(name);
-        }
 
         #endregion
 
@@ -4154,6 +4141,11 @@ namespace OpenSim.Region.Framework.Scenes
             m_sceneGraph.ForEachClient(action);
         }
 
+        public void ForEachSOG(Action<SceneObjectGroup> action)
+        {
+            m_sceneGraph.ForEachSOG(action);
+        }
+
         /// <summary>
         /// Returns a list of the entities in the scene.  This is a new list so operations perform on the list itself
         /// will not affect the original list of objects in the scene.
@@ -4178,14 +4170,18 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void RegionHandleRequest(IClientAPI client, UUID regionID)
         {
-            RegionInfo info;
+            ulong handle = 0;
             if (regionID == RegionInfo.RegionID)
-                info = RegionInfo;
+                handle = RegionInfo.RegionHandle;
             else
-                info = CommsManager.GridService.RequestNeighbourInfo(regionID);
+            {
+                GridRegion r = GridService.GetRegionByUUID(UUID.Zero, regionID);
+                if (r != null)
+                    handle = r.RegionHandle;
+            }
 
-            if (info != null)
-                client.SendRegionHandle(regionID, info.RegionHandle);
+            if (handle != 0)
+                client.SendRegionHandle(regionID, handle);
         }
 
         public void TerrainUnAcked(IClientAPI client, int patchX, int patchY)
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 2a82237..0ac4ed4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -36,6 +36,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -91,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <value>
         /// Registered classes that are capable of creating entities.
         /// </value>
-        protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();                
+        protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();
 
         /// <summary>
         /// The last allocated local prim id.  When a new local id is requested, the next number in the sequence is
@@ -227,7 +228,7 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
         
-        public abstract bool OtherRegionUp(RegionInfo thisRegion);
+        public abstract void OtherRegionUp(GridRegion otherRegion);
 
         public virtual string GetSimulatorVersion()
         {
@@ -278,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes
             _primAllocateMutex.ReleaseMutex();
 
             return myID;
-        }        
+        }
         
         #region Module Methods
 
@@ -472,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain.
         /// </summary>
-        /// <param name="showParams">What to show</param>        
+        /// <param name="showParams">What to show</param>
         public virtual void Show(string[] showParams)
         {
             switch (showParams[0])
@@ -488,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     break;
             }
-        }        
+        }
 
         public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback)
         {
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 204c319..4a2db5e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -41,6 +41,7 @@ using OpenSim.Framework.Capabilities;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Services.Interfaces;
 using OSD = OpenMetaverse.StructuredData.OSD;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -58,11 +59,19 @@ namespace OpenSim.Region.Framework.Scenes
         protected CommunicationsManager m_commsProvider;
         protected IInterregionCommsOut m_interregionCommsOut;
         protected RegionInfo m_regionInfo;
+        protected Scene m_scene;
 
         protected RegionCommsListener regionCommsHost;
 
         protected List<UUID> m_agentsInTransit;
 
+        public bool RegionLoginsEnabled
+        {
+            get { return m_regionLoginsEnabled; }
+            set { m_regionLoginsEnabled = value; }
+        }
+        private bool m_regionLoginsEnabled = false;
+
         /// <summary>
         /// An agent is crossing into this region
         /// </summary>
@@ -84,10 +93,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public event PrimCrossing OnPrimCrossingIntoRegion;
 
-        /// <summary>
-        /// A New Region is up and available
-        /// </summary>
-        public event RegionUp OnRegionUp;
+        ///// <summary>
+        ///// A New Region is up and available
+        ///// </summary>
+        //public event RegionUp OnRegionUp;
 
         /// <summary>
         /// We have a child agent for this avatar and we're getting a status update about it
@@ -110,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes
         private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
         private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
         private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
-        private RegionUp handlerRegionUp = null; // OnRegionUp;
+        //private RegionUp handlerRegionUp = null; // OnRegionUp;
         private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
         //private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;
         private LogOffUser handlerLogOffUser = null;
@@ -124,6 +133,13 @@ namespace OpenSim.Region.Framework.Scenes
             m_agentsInTransit = new List<UUID>();
         }
 
+        public void SetScene(Scene s)
+        {
+            m_scene = s;
+            m_regionInfo = s.RegionInfo;
+            m_interregionCommsOut = m_scene.RequestModuleInterface<IInterregionCommsOut>();
+        }
+
         /// <summary>
         /// Register a region with the grid
         /// </summary>
@@ -131,40 +147,30 @@ namespace OpenSim.Region.Framework.Scenes
         /// <exception cref="System.Exception">Thrown if region registration fails.</exception>
         public void RegisterRegion(IInterregionCommsOut comms_out, RegionInfo regionInfos)
         {
-            m_interregionCommsOut = comms_out;
+            //m_interregionCommsOut = comms_out;
 
-            m_regionInfo = regionInfos;
-            m_commsProvider.GridService.gdebugRegionName = regionInfos.RegionName;
-            regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo);
+            //m_regionInfo = regionInfos;
+            //m_commsProvider.GridService.gdebugRegionName = regionInfos.RegionName;
+            //regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo);
 
-            if (regionCommsHost != null)
-            {
-                //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got" + regionCommsHost.ToString());
-
-                regionCommsHost.debugRegionName = regionInfos.RegionName;
-                regionCommsHost.OnExpectPrim += IncomingPrimCrossing;
-                regionCommsHost.OnExpectUser += NewUserConnection;
-                regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing;
-                regionCommsHost.OnCloseAgentConnection += CloseConnection;
-                regionCommsHost.OnRegionUp += newRegionUp;
-                regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate;
-                regionCommsHost.OnLogOffUser += GridLogOffUser;
-                regionCommsHost.OnGetLandData += FetchLandData;
-            }
-            else
-            {
-                //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got null");
-            }
-        }
-
-        /// <summary>
-        /// Returns a region with the name closest to string provided
-        /// </summary>
-        /// <param name="name">Partial Region Name for matching</param>
-        /// <returns>Region Information for the region</returns>
-        public RegionInfo RequestClosestRegion(string name)
-        {
-            return m_commsProvider.GridService.RequestClosestRegion(name);
+            //if (regionCommsHost != null)
+            //{
+            //    //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got" + regionCommsHost.ToString());
+
+            //    regionCommsHost.debugRegionName = regionInfos.RegionName;
+            //    regionCommsHost.OnExpectPrim += IncomingPrimCrossing;
+            //    regionCommsHost.OnExpectUser += NewUserConnection;
+            //    regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing;
+            //    regionCommsHost.OnCloseAgentConnection += CloseConnection;
+            //    regionCommsHost.OnRegionUp += newRegionUp;
+            //    regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate;
+            //    regionCommsHost.OnLogOffUser += GridLogOffUser;
+            //    regionCommsHost.OnGetLandData += FetchLandData;
+            //}
+            //else
+            //{
+            //    //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got null");
+            //}
         }
 
         /// <summary>
@@ -173,30 +179,31 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void Close()
         {
-            if (regionCommsHost != null)
-            {
-                regionCommsHost.OnLogOffUser -= GridLogOffUser;
-                regionCommsHost.OnChildAgentUpdate -= ChildAgentUpdate;
-                regionCommsHost.OnRegionUp -= newRegionUp;
-                regionCommsHost.OnExpectUser -= NewUserConnection;
-                regionCommsHost.OnExpectPrim -= IncomingPrimCrossing;
-                regionCommsHost.OnAvatarCrossingIntoRegion -= AgentCrossing;
-                regionCommsHost.OnCloseAgentConnection -= CloseConnection;
-                regionCommsHost.OnGetLandData -= FetchLandData;
+
+            //if (regionCommsHost != null)
+            //{
+            //    regionCommsHost.OnLogOffUser -= GridLogOffUser;
+            //    regionCommsHost.OnChildAgentUpdate -= ChildAgentUpdate;
+            //    regionCommsHost.OnRegionUp -= newRegionUp;
+            //    regionCommsHost.OnExpectUser -= NewUserConnection;
+            //    regionCommsHost.OnExpectPrim -= IncomingPrimCrossing;
+            //    regionCommsHost.OnAvatarCrossingIntoRegion -= AgentCrossing;
+            //    regionCommsHost.OnCloseAgentConnection -= CloseConnection;
+            //    regionCommsHost.OnGetLandData -= FetchLandData;
                 
-                try
-                {
-                    m_commsProvider.GridService.DeregisterRegion(m_regionInfo);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[GRID]: Deregistration of region {0} from the grid failed - {1}.  Continuing", 
-                        m_regionInfo.RegionName, e);
-                }
+            //    try
+            //    {
+            //        m_commsProvider.GridService.DeregisterRegion(m_regionInfo);
+            //    }
+            //    catch (Exception e)
+            //    {
+            //        m_log.ErrorFormat(
+            //            "[GRID]: Deregistration of region {0} from the grid failed - {1}.  Continuing", 
+            //            m_regionInfo.RegionName, e);
+            //    }
                 
-                regionCommsHost = null;
-            }
+            //    regionCommsHost = null;
+            //}
         }
 
         #region CommsManager Event handlers
@@ -232,22 +239,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// A New Region is now available.  Inform the scene that there is a new region available.
-        /// </summary>
-        /// <param name="region">Information about the new region that is available</param>
-        /// <returns>True if the event was handled</returns>
-        protected bool newRegionUp(RegionInfo region)
-        {
-            handlerRegionUp = OnRegionUp;
-            if (handlerRegionUp != null)
-            {
-                //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: newRegionUp Fired for User:" + region.RegionName);
-                handlerRegionUp(region);
-            }
-            return true;
-        }
-
-        /// <summary>
         /// Inform the scene that we've got an update about a child agent that we have
         /// </summary>
         /// <param name="cAgentData"></param>
@@ -330,7 +321,7 @@ namespace OpenSim.Region.Framework.Scenes
         #region Inform Client of Neighbours
 
         private delegate void InformClientOfNeighbourDelegate(
-            ScenePresence avatar, AgentCircuitData a, SimpleRegionInfo reg, IPEndPoint endPoint, bool newAgent);
+            ScenePresence avatar, AgentCircuitData a, GridRegion reg, IPEndPoint endPoint, bool newAgent);
 
         private void InformClientOfNeighbourCompleted(IAsyncResult iar)
         {
@@ -348,7 +339,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="a"></param>
         /// <param name="regionHandle"></param>
         /// <param name="endPoint"></param>
-        private void InformClientOfNeighbourAsync(ScenePresence avatar, AgentCircuitData a, SimpleRegionInfo reg,
+        private void InformClientOfNeighbourAsync(ScenePresence avatar, AgentCircuitData a, GridRegion reg,
                                                   IPEndPoint endPoint, bool newAgent)
         {
             // Let's wait just a little to give time to originating regions to catch up with closing child agents
@@ -366,8 +357,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             string reason = String.Empty;
 
-            //bool regionAccepted = m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, a);
-            
+           
             bool regionAccepted = m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a, out reason);
 
             if (regionAccepted && newAgent)
@@ -400,17 +390,7 @@ namespace OpenSim.Region.Framework.Scenes
             
         }
 
-        public void RequestNeighbors(RegionInfo region)
-        {
-            // List<SimpleRegionInfo> neighbours =
-            m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
-            //IPEndPoint blah = new IPEndPoint();
-
-            //blah.Address = region.RemotingAddress;
-            //blah.Port = region.RemotingPort;
-        }
-
-        public List<SimpleRegionInfo> RequestNeighbors(Scene pScene, uint pRegionLocX, uint pRegionLocY)
+        public List<GridRegion> RequestNeighbours(Scene pScene, uint pRegionLocX, uint pRegionLocY)
         {
             Border[] northBorders = pScene.NorthBorders.ToArray();
             Border[] southBorders = pScene.SouthBorders.ToArray();
@@ -420,50 +400,34 @@ namespace OpenSim.Region.Framework.Scenes
             // Legacy one region.  Provided for simplicity while testing the all inclusive method in the else statement.
             if (northBorders.Length <= 1 && southBorders.Length <= 1 && eastBorders.Length <= 1 && westBorders.Length <= 1)
             {
-                return m_commsProvider.GridService.RequestNeighbours(pRegionLocX, pRegionLocY);
+                return m_scene.GridService.GetNeighbours(m_regionInfo.ScopeID, m_regionInfo.RegionID);
             }
             else
             {
                 Vector2 extent = Vector2.Zero;
-                for (int i=0;i<eastBorders.Length;i++)
+                for (int i = 0; i < eastBorders.Length; i++)
                 {
                     extent.X = (eastBorders[i].BorderLine.Z > extent.X) ? eastBorders[i].BorderLine.Z : extent.X;
                 }
-                for (int i=0;i<northBorders.Length;i++)
+                for (int i = 0; i < northBorders.Length; i++)
                 {
                     extent.Y = (northBorders[i].BorderLine.Z > extent.Y) ? northBorders[i].BorderLine.Z : extent.Y;
                 }
 
-                List<SimpleRegionInfo> neighbourList = new List<SimpleRegionInfo>();
-
                 // Loss of fraction on purpose
                 extent.X = ((int)extent.X / (int)Constants.RegionSize) + 1;
                 extent.Y = ((int)extent.Y / (int)Constants.RegionSize) + 1;
 
-                int startX = (int) pRegionLocX - 1;
-                int startY = (int) pRegionLocY - 1;
+                int startX = (int)(pRegionLocX - 1) * (int)Constants.RegionSize;
+                int startY = (int)(pRegionLocY - 1) * (int)Constants.RegionSize;
 
-                int endX = (int) pRegionLocX + (int)extent.X;
-                int endY = (int) pRegionLocY + (int)extent.Y;
+                int endX = ((int)pRegionLocX + (int)extent.X) * (int)Constants.RegionSize;
+                int endY = ((int)pRegionLocY + (int)extent.Y) * (int)Constants.RegionSize;
 
-                for (int i=startX;i<endX;i++)
-                {
-                    for (int j=startY;j<endY;j++)
-                    {
-                        // Skip CurrentRegion
-                        if (i == (int)pRegionLocX && j == (int)pRegionLocY)
-                            continue;
-
-                        ulong regionHandle = Util.UIntsToLong((uint)(i * Constants.RegionSize),
-                                                              (uint)(j * Constants.RegionSize));
-                        RegionInfo neighborreg = m_commsProvider.GridService.RequestNeighbourInfo(regionHandle);
-                        if (neighborreg != null)
-                        {
-                            neighbourList.Add(neighborreg);
-                        }
-                    }
-                }
-                return neighbourList;
+                List<GridRegion> neighbours = m_scene.GridService.GetRegionRange(m_regionInfo.ScopeID, startX, endX, startY, endY);
+                neighbours.RemoveAll(delegate(GridRegion r) { return r.RegionID == m_regionInfo.RegionID; });
+
+                return neighbours;
                 //SimpleRegionInfo regionData = m_commsProvider.GridService.RequestNeighbourInfo()
                 //return m_commsProvider.GridService.RequestNeighbours(pRegionLocX, pRegionLocY);
             }
@@ -475,29 +439,28 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void EnableNeighbourChildAgents(ScenePresence avatar, List<RegionInfo> lstneighbours)
         {
-            List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
+            //List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
+            List<GridRegion> neighbours = new List<GridRegion>();
 
-            //m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
-            for (int i = 0; i < lstneighbours.Count; i++)
-            {
-                // We don't want to keep sending to regions that consistently fail on comms.
-                if (!(lstneighbours[i].commFailTF))
-                {
-                    neighbours.Add(new SimpleRegionInfo(lstneighbours[i]));
-                }
-            }
+            ////m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
+            //for (int i = 0; i < lstneighbours.Count; i++)
+            //{
+            //    // We don't want to keep sending to regions that consistently fail on comms.
+            //    if (!(lstneighbours[i].commFailTF))
+            //    {
+            //        neighbours.Add(new SimpleRegionInfo(lstneighbours[i]));
+            //    }
+            //}
             // we're going to be using the above code once neighbour cache is correct.  Currently it doesn't appear to be
             // So we're temporarily going back to the old method of grabbing it from the Grid Server Every time :/
             if (m_regionInfo != null)
             {
-                neighbours =
-                RequestNeighbors(avatar.Scene,m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
+                neighbours = RequestNeighbours(avatar.Scene,m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
             }
             else
             {
                 m_log.Debug("[ENABLENEIGHBOURCHILDAGENTS]: m_regionInfo was null in EnableNeighbourChildAgents, is this a NPC?");
             }
-            
 
             /// We need to find the difference between the new regions where there are no child agents
             /// and the regions where there are already child agents. We only send notification to the former.
@@ -540,8 +503,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             /// Create the necessary child agents
             List<AgentCircuitData> cagents = new List<AgentCircuitData>();
-            foreach (SimpleRegionInfo neighbour in neighbours)
-            {
+            //foreach (SimpleRegionInfo neighbour in neighbours)
+            foreach (GridRegion neighbour in neighbours)
+                {
                 if (neighbour.RegionHandle != avatar.Scene.RegionInfo.RegionHandle)
                 {
 
@@ -581,7 +545,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             bool newAgent = false;
             int count = 0;
-            foreach (SimpleRegionInfo neighbour in neighbours)
+            foreach (GridRegion neighbour in neighbours)
             {
                 // Don't do it if there's already an agent in that region
                 if (newRegions.Contains(neighbour.RegionHandle))
@@ -634,7 +598,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// This informs a single neighboring region about agent "avatar".
         /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
         /// </summary>
-        public void InformNeighborChildAgent(ScenePresence avatar, SimpleRegionInfo region)
+        public void InformNeighborChildAgent(ScenePresence avatar, GridRegion region)
         {
             AgentCircuitData agent = avatar.ControllingClient.RequestClientInfo();
             agent.BaseFolder = UUID.Zero;
@@ -665,61 +629,63 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="regionhandle"></param>
         private void InformNeighboursThatRegionIsUpAsync(INeighbourService neighbourService, RegionInfo region, ulong regionhandle)
         {
-            m_log.Info("[INTERGRID]: Starting to inform neighbors that I'm here");
-            //RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
+            uint x = 0, y = 0;
+            Utils.LongToUInts(regionhandle, out x, out y);
 
-            //bool regionAccepted =
-            //    m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region), regionhandle);
-
-            //bool regionAccepted = m_interregionCommsOut.SendHelloNeighbour(regionhandle, region);
-            bool regionAccepted = false;
+            GridRegion neighbour = null;
             if (neighbourService != null)
-                regionAccepted = neighbourService.HelloNeighbour(regionhandle, region);
+                neighbour = neighbourService.HelloNeighbour(regionhandle, region);
             else
                 m_log.DebugFormat("[SCS]: No neighbour service provided for informing neigbhours of this region");
 
-            if (regionAccepted)
+            if (neighbour != null)
             {
-                m_log.Info("[INTERGRID]: Completed informing neighbors that I'm here");
-                handlerRegionUp = OnRegionUp;
-
-                // yes, we're notifying ourselves.
-                if (handlerRegionUp != null)
-                    handlerRegionUp(region);
+                m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize);
+                m_scene.EventManager.TriggerOnRegionUp(neighbour);
             }
             else
             {
-                m_log.Warn("[INTERGRID]: Failed to inform neighbors that I'm here.");
+                m_log.WarnFormat("[INTERGRID]: Failed to inform neighbour {0}-{1} that I'm here.", x / Constants.RegionSize, y / Constants.RegionSize);
             }
         }
 
-        /// <summary>
-        /// Called by scene when region is initialized (not always when it's listening for agents)
-        /// This is an inter-region message that informs the surrounding neighbors that the sim is up.
-        /// </summary>
+
         public void InformNeighborsThatRegionisUp(INeighbourService neighbourService, RegionInfo region)
         {
             //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
 
-            
-            List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
-            // This stays uncached because we don't already know about our neighbors at this point.
-            neighbours = m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
-            if (neighbours != null)
-            {
-                for (int i = 0; i < neighbours.Count; i++)
-                {
-                    InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
+            for (int x = (int)region.RegionLocX - 1; x <= region.RegionLocX + 1; x++)
+                for (int y = (int)region.RegionLocY - 1; y <= region.RegionLocY + 1; y++)
+                    if (!((x == region.RegionLocX) && (y == region.RegionLocY))) // skip this region
+                    {
+                        ulong handle = Utils.UIntsToLong((uint)x * Constants.RegionSize, (uint)y * Constants.RegionSize);
+                        InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
 
-                    d.BeginInvoke(neighbourService, region, neighbours[i].RegionHandle,
-                                  InformNeighborsThatRegionisUpCompleted,
-                                  d);
-                }
-            }
+                        d.BeginInvoke(neighbourService, region, handle,
+                                      InformNeighborsThatRegionisUpCompleted,
+                                      d);
+                    }
+
+            //List<GridRegion> neighbours = new List<GridRegion>();
+            //// This stays uncached because we don't already know about our neighbors at this point.
+
+            //neighbours = m_scene.GridService.GetNeighbours(m_regionInfo.ScopeID, m_regionInfo.RegionID);
+            //if (neighbours != null)
+            //{
+            //    for (int i = 0; i < neighbours.Count; i++)
+            //    {
+            //        InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
+
+            //        d.BeginInvoke(neighbourService, region, neighbours[i].RegionHandle,
+            //                      InformNeighborsThatRegionisUpCompleted,
+            //                      d);
+            //    }
+            //}
 
             //bool val = m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region));
         }
 
+
         public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, ulong regionHandle);
 
         /// <summary>
@@ -815,41 +781,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        /// <summary>
-        /// Helper function to request neighbors from grid-comms
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public virtual RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
-        {
-            //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending Grid Services Request about neighbor " + regionHandle.ToString());
-            return m_commsProvider.GridService.RequestNeighbourInfo(regionHandle);
-        }
-
-        /// <summary>
-        /// Helper function to request neighbors from grid-comms
-        /// </summary>
-        /// <param name="regionID"></param>
-        /// <returns></returns>
-        public virtual RegionInfo RequestNeighbouringRegionInfo(UUID regionID)
-        {
-            //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending Grid Services Request about neighbor " + regionID);
-            return m_commsProvider.GridService.RequestNeighbourInfo(regionID);
-        }
-
-        /// <summary>
-        /// Requests map blocks in area of minX, maxX, minY, MaxY in world cordinates
-        /// </summary>
-        /// <param name="minX"></param>
-        /// <param name="minY"></param>
-        /// <param name="maxX"></param>
-        /// <param name="maxY"></param>
-        public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
-        {
-            List<MapBlockData> mapBlocks;
-            mapBlocks = m_commsProvider.GridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4);
-            remoteClient.SendMapBlock(mapBlocks, 0);
-        }
 
         /// <summary>
         /// Try to teleport an agent to a new region.
@@ -914,7 +845,10 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                RegionInfo reg = RequestNeighbouringRegionInfo(regionHandle);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(regionHandle, out x, out y);
+                GridRegion reg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
+
                 if (reg != null)
                 {
                     m_log.DebugFormat(
@@ -1163,7 +1097,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        private bool IsOutsideRegion(Scene s, Vector3 pos)
+        protected bool IsOutsideRegion(Scene s, Vector3 pos)
         {
             
             if (s.TestBorderCross(pos,Cardinals.N))
@@ -1221,10 +1155,10 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
 
-        private List<ulong> NeighbourHandles(List<SimpleRegionInfo> neighbours)
+        private List<ulong> NeighbourHandles(List<GridRegion> neighbours)
         {
             List<ulong> handles = new List<ulong>();
-            foreach (SimpleRegionInfo reg in neighbours)
+            foreach (GridRegion reg in neighbours)
             {
                 handles.Add(reg.RegionHandle);
             }
@@ -1475,7 +1409,10 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.DebugFormat("[SCENE COMM]: Crossing agent {0} {1} to {2}-{3}", agent.Firstname, agent.Lastname, neighbourx, neighboury);
 
             ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
-            SimpleRegionInfo neighbourRegion = RequestNeighbouringRegionInfo(neighbourHandle);
+
+            int x = (int)(neighbourx * Constants.RegionSize), y = (int)(neighboury * Constants.RegionSize);
+            GridRegion neighbourRegion = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
+
             if (neighbourRegion != null && agent.ValidateAttachments())
             {
                 pos = pos + (agent.Velocity);
@@ -1602,11 +1539,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
 
-        public Dictionary<string, string> GetGridSettings()
-        {
-            return m_commsProvider.GridService.GetGridSettings();
-        }
-
         public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
         {
             m_commsProvider.LogOffUser(userid, regionid, regionhandle, position, lookat);
@@ -1643,19 +1575,14 @@ namespace OpenSim.Region.Framework.Scenes
             return m_commsProvider.GetUserFriendList(friendlistowner);
         }
 
-        public  List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            return m_commsProvider.GridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
-        }
-
         public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
         {
             return m_commsProvider.GenerateAgentPickerRequestResponse(queryID, query);
         }
         
-        public List<RegionInfo> RequestNamedRegions(string name, int maxNumber)
+        public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
         {
-            return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber);
+            return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
         }
 
         //private void Dump(string msg, List<ulong> handles)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 48dea07..54ac792 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -845,7 +845,7 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence sp;
             
             lock (ScenePresences)
-            {                
+            {
                 ScenePresences.TryGetValue(agentID, out sp);
             }
 
@@ -1134,6 +1134,23 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        protected internal void ForEachSOG(Action<SceneObjectGroup> action)
+        {
+            List<SceneObjectGroup> objlist = new List<SceneObjectGroup>(SceneObjectGroupsByFullID.Values);
+            foreach (SceneObjectGroup obj in objlist)
+            {
+                try
+                {
+                    action(obj);
+                }
+                catch (Exception e)
+                {
+                    // Catch it and move on. This includes situations where splist has inconsistent info
+                    m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.Message);
+                }
+            }
+        }
+        
         #endregion
 
         #region Client Event handlers
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 1843e2c..3097929 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void SaveCurrentSceneToXml(string filename)
         {
             IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)            
+            if (serialiser != null)
                 serialiser.SavePrimsToXml(CurrentOrFirstScene, filename);
         }
 
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, Vector3 loadOffset)
         {
             IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)            
+            if (serialiser != null)
                 serialiser.LoadPrimsFromXml(CurrentOrFirstScene, filename, generateNewIDs, loadOffset);
         }
 
@@ -216,14 +216,14 @@ namespace OpenSim.Region.Framework.Scenes
         public void SaveCurrentSceneToXml2(string filename)
         {
             IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)            
+            if (serialiser != null)
                 serialiser.SavePrimsToXml2(CurrentOrFirstScene, filename);
         }
 
         public void SaveNamedPrimsToXml2(string primName, string filename)
         {
             IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)               
+            if (serialiser != null)
                 serialiser.SaveNamedPrimsToXml2(CurrentOrFirstScene, primName, filename);
         }
 
@@ -233,7 +233,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void LoadCurrentSceneFromXml2(string filename)
         {
             IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)              
+            if (serialiser != null)
                 serialiser.LoadPrimsFromXml2(CurrentOrFirstScene, filename);
         }
 
@@ -257,7 +257,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void LoadArchiveToCurrentScene(string filename)
         {
             IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface<IRegionArchiverModule>();
-            if (archiver != null)            
+            if (archiver != null)
                 archiver.DearchiveRegion(filename);
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3c17bbe..25489d8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Is this scene object acting as an attachment?
         /// 
         /// We return false if the group has already been deleted.
-        ///  
+        ///
         /// TODO: At the moment set must be done on the part itself.  There may be a case for doing it here since I
         /// presume either all or no parts in a linkset can be part of an attachment (in which
         /// case the value would get proprogated down into all the descendent parts).
@@ -245,6 +245,11 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        private bool IsAttachmentCheckFull()
+        {
+            return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0));
+        }
+        
         /// <summary>
         /// The absolute position of this scene object in the scene
         /// </summary>
@@ -257,8 +262,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
                     || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) 
-                    && !IsAttachment)
-                {                                       
+                    && !IsAttachmentCheckFull())
+                {
                     m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
                 }
 
@@ -449,7 +454,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="scene"></param>
         public void AttachToScene(Scene scene)
         {
-            m_scene = scene;                        
+            m_scene = scene;
             RegionHandle = m_scene.RegionInfo.RegionHandle;
 
             if (m_rootPart.Shape.PCode != 9 || m_rootPart.Shape.State == 0)
@@ -474,9 +479,9 @@ namespace OpenSim.Region.Framework.Scenes
                 //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID);
             }
             
-            ApplyPhysics(m_scene.m_physicalPrim);            
+            ApplyPhysics(m_scene.m_physicalPrim);
             
-            ScheduleGroupForFullUpdate();            
+            ScheduleGroupForFullUpdate();
         }
 
         public Vector3 GroupScale()
@@ -1032,12 +1037,12 @@ namespace OpenSim.Region.Framework.Scenes
             m_rootPart = part;
             if (!IsAttachment)
                 part.ParentID = 0;
-            part.LinkNum = 0;           
+            part.LinkNum = 0;
             
             // No locking required since the SOG should not be in the scene yet - one can't change root parts after
             // the scene object has been attached to the scene
             m_parts.Add(m_rootPart.UUID, m_rootPart);
-        }        
+        }
 
         /// <summary>
         /// Add a new part to this scene object.  The part must already be correctly configured.
@@ -1155,7 +1160,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <summary>
         /// Delete this group from its scene and tell all the scene presences about that deletion.
-        /// </summary>        
+        /// </summary>
         /// <param name="silent">Broadcast deletions to all clients.</param>
         public void DeleteGroup(bool silent)
         {
@@ -1262,11 +1267,11 @@ namespace OpenSim.Region.Framework.Scenes
                         if (part.LocalId != m_rootPart.LocalId)
                         {
                             part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim);
-                        }                                                  
-                    }    
+                        }
+                    }
                     
                     // Hack to get the physics scene geometries in the right spot
-                    ResetChildPrimPhysicsPositions();                     
+                    ResetChildPrimPhysicsPositions();
                 }
                 else
                 {
@@ -1489,7 +1494,7 @@ namespace OpenSim.Region.Framework.Scenes
             List<SceneObjectPart> partList;
 
             lock (m_parts)
-            {                
+            {
                 partList = new List<SceneObjectPart>(m_parts.Values);
             }
             
@@ -1739,7 +1744,7 @@ namespace OpenSim.Region.Framework.Scenes
                         rootpart.PhysActor.PIDHoverActive = false;
                     }
                 }
-            }            
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 51bb114..ea6bc9c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -42,7 +42,7 @@ using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
 
 namespace OpenSim.Region.Framework.Scenes
-{       
+{
     #region Enumerations
 
     [Flags]
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes
         public UUID FromItemID = UUID.Zero;
                
         /// <value>
-        /// The UUID of the user inventory item from which this object was rezzed if this is a root part.  
+        /// The UUID of the user inventory item from which this object was rezzed if this is a root part.
         /// If UUID.Zero then either this is not a root part or there is no connection with a user inventory item.
         /// </value>
         private UUID m_fromUserInventoryItemID = UUID.Zero;
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes
         public IEntityInventory Inventory
         {
             get { return m_inventory; }
-        }       
+        }
         protected SceneObjectPartInventory m_inventory;
 
         [XmlIgnore]
@@ -309,9 +309,9 @@ namespace OpenSim.Region.Framework.Scenes
             RotationOffset = rotationOffset;
             Velocity = new Vector3(0, 0, 0);
             AngularVelocity = new Vector3(0, 0, 0);
-            Acceleration = new Vector3(0, 0, 0);          
+            Acceleration = new Vector3(0, 0, 0);
             m_TextureAnimation = new byte[0];
-            m_particleSystem = new byte[0];            
+            m_particleSystem = new byte[0];
 
             // Prims currently only contain a single folder (Contents).  From looking at the Second Life protocol,
             // this appears to have the same UUID (!) as the prim.  If this isn't the case, one can't drag items from
@@ -363,7 +363,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <summary>
         /// A relic from when we we thought that prims contained folder objects. In 
-        /// reality, prim == folder  
+        /// reality, prim == folder
         /// Exposing this is not particularly good, but it's one of the least evils at the moment to see
         /// folder id from prim inventory item data, since it's not (yet) actually stored with the prim.
         /// </summary>
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <value>
         /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes
-        /// </value>        
+        /// </value>
         public TaskInventoryDictionary TaskInventory
         {
             get { return m_inventory.Items; }
@@ -3386,7 +3386,7 @@ if (m_shape != null) {
                 }
                 else
                 {
-                    IsPhantom = false;  
+                    IsPhantom = false;
                     // If volumedetect is active we don't want phantom to be applied.
                     // If this is a new call to VD out of the state "phantom"
                     // this will also cause the prim to be visible to physics
@@ -3455,6 +3455,7 @@ if (m_shape != null) {
                         RotationOffset,
                         UsePhysics);
 
+                    pa = PhysActor;
                     if (pa != null)
                     {
                         pa.LocalID = LocalId;
@@ -3483,7 +3484,7 @@ if (m_shape != null) {
                 }
                 else // it already has a physical representation
                 {
-                    pa.IsPhysical = UsePhysics;                    
+                    pa.IsPhysical = UsePhysics;
 
                     DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim
                     if (m_parentGroup != null)
@@ -3513,11 +3514,10 @@ if (m_shape != null) {
                     AddFlag(PrimFlags.Phantom); // We set this flag also if VD is active
                     this.VolumeDetectActive = true;
                 }
-
             }
             else
             {   // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
-                // (mumbles, well, at least if you have infinte CPU powers :-) )
+                // (mumbles, well, at least if you have infinte CPU powers :-))
                 PhysicsActor pa = this.PhysActor;
                 if (pa != null)
                 {
@@ -3775,7 +3775,7 @@ if (m_shape != null) {
         public override string ToString()
         {
             return String.Format("{0} {1} (parent {2}))", Name, UUID, ParentGroup);
-        }        
+        }
 
         #endregion Public Methods
 
@@ -3823,11 +3823,11 @@ if (m_shape != null) {
             _everyoneMask &= _nextOwnerMask;
 
             Inventory.ApplyNextOwnerPermissions();
-        }        
+        }
 
         public bool CanBeDeleted()
         {
             return Inventory.CanBeDeleted();
         }
-    }        
+    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 76bcd7e..098e010 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void ForceInventoryPersistence()
         {
             HasInventoryChanged = true;
-        }                
+        }
 
         /// <summary>
         /// Reset UUIDs for all the items in the prim's inventory.  This involves either generating
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Change every item in this inventory to a new group.
         /// </summary>
-        /// <param name="groupID"></param>        
+        /// <param name="groupID"></param>
         public void ChangeInventoryGroup(UUID groupID)
         {
             lock (Items)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ea5240e..3996cdc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -36,6 +36,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Types;
 using OpenSim.Region.Physics.Manager;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -777,7 +778,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Moved this from SendInitialData to ensure that m_appearance is initialized
             // before the inventory is processed in MakeRootAgent. This fixes a race condition
             // related to the handling of attachments
-            //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);            
+            //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
             if (m_scene.TestBorderCross(pos, Cardinals.E))
             {
                 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
@@ -1236,7 +1237,7 @@ namespace OpenSim.Region.Framework.Scenes
             if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
             {
                 StandUp();
-            }                       
+            }
 
             // Check if Client has camera in 'follow cam' or 'build' mode.
             Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation);
@@ -1490,7 +1491,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
 //                    m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed));
 //                    m_log.DebugFormat(
-//                        "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);                    
+//                        "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);
                     
                     AddNewMovement(agent_control_v3, q);
 
@@ -2271,7 +2272,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         //Record the time we enter this state so we know whether to "land" or not
                         m_animPersistUntil = DateTime.Now.Ticks;
-                        return "FALLDOWN";
+                        return "FALLDOWN"; // this falling animation is invoked too frequently when capsule tilt correction is used - why?
                     }
                 }
             }
@@ -2307,14 +2308,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// Rotate the avatar to the given rotation and apply a movement in the given relative vector
         /// </summary>
         /// <param name="vec">The vector in which to move.  This is relative to the rotation argument</param>
-        /// <param name="rotation">The direction in which this avatar should now face.        
+        /// <param name="rotation">The direction in which this avatar should now face.
         public void AddNewMovement(Vector3 vec, Quaternion rotation)
         {
             if (m_isChildAgent)
             {
                 m_log.Debug("DEBUG: AddNewMovement: child agent, Making root agent!");
 
-                // we have to reset the user's child agent connections.  
+                // we have to reset the user's child agent connections.
                 // Likely, here they've lost the eventqueue for other regions so border 
                 // crossings will fail at this point unless we reset them.
 
@@ -2650,7 +2651,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Tell the client for this scene presence what items it should be wearing now
         /// </summary>
         public void SendWearables()
-        {   
+        {
             ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
         }
 
@@ -2959,8 +2960,9 @@ namespace OpenSim.Region.Framework.Scenes
             else if (dir > 3 && dir < 7) // Heading Sout
                 neighboury--;
 
-            ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
-            SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle);
+            int x = (int)(neighbourx * Constants.RegionSize);
+            int y = (int)(neighboury * Constants.RegionSize);
+            GridRegion neighbourRegion = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, x, y);
 
             if (neighbourRegion == null)
             {
@@ -3198,7 +3200,7 @@ namespace OpenSim.Region.Framework.Scenes
                     else
                     {
                         wears[i++] = UUID.Zero;
-                        wears[i++] = UUID.Zero;                        
+                        wears[i++] = UUID.Zero;
                     }
                 }
                 cAgent.Wearables = wears;
@@ -3510,7 +3512,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool HasAttachments()
         {
-            return m_attachments.Count > 0;   
+            return m_attachments.Count > 0;
         }
 
         public bool HasScriptedAttachments()
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index fe74158..f7544ac 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -122,13 +122,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     "[SERIALIZER]: Deserialization of xml failed with {0}.  xml was {1}", e, xmlData);
                 return null;
             }
-        }      
+        }
 
         /// <summary>
         /// Serialize a scene object to the original xml format
         /// </summary>
         /// <param name="sceneObject"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject)
         {
             using (StringWriter sw = new StringWriter())
@@ -140,13 +140,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
                 return sw.ToString();
             }
-        }                
+        }
 
         /// <summary>
         /// Serialize a scene object to the original xml format
         /// </summary>
         /// <param name="sceneObject"></param>
-        /// <returns></returns>            
+        /// <returns></returns>
         public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer)
         {
             //m_log.DebugFormat("[SERIALIZER]: Starting serialization of {0}", Name);
@@ -238,13 +238,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed with {0}.  xml was {1}", e, xmlData);
                 return null;
             }
-        }         
+        }
 
         /// <summary>
         /// Serialize a scene object to the 'xml2' format.
         /// </summary>
         /// <param name="sceneObject"></param>
-        /// <returns></returns>               
+        /// <returns></returns>
         public static string ToXml2Format(SceneObjectGroup sceneObject)
         {
             using (StringWriter sw = new StringWriter())
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// Serialize a scene object to the 'xml2' format.
         /// </summary>
         /// <param name="sceneObject"></param>
-        /// <returns></returns>          
+        /// <returns></returns>
         public static void ToXml2Format(SceneObjectGroup sceneObject, XmlTextWriter writer)
         {
             //m_log.DebugFormat("[SERIALIZER]: Starting serialization of SOG {0} to XML2", Name);
@@ -288,6 +288,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteEndElement(); // End of SceneObjectGroup
 
             //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0} to XML2, {1}ms", Name, System.Environment.TickCount - time);
-        }   
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 7fa1b8c..cf0f345 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -236,7 +236,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
 
             SavePrimListToXml2(primList, fileName);
-        }        
+        }
 
         public static void SavePrimListToXml2(List<EntityBase> entityList, string fileName)
         {
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 7f44bf1..ee288b3 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -450,7 +450,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             addFrameMS(ms);
             addAgentMS(ms);
-        }        
+        }
 
         #endregion
     }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index 3b0e77f..fc66c85 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 {
     [TestFixture, LongRunning]
     public class EntityManagerTests
-    {        
+    {
         static public Random random;
         SceneObjectGroup found;
         Scene scene = SceneSetupHelpers.SetupScene();
@@ -81,13 +81,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Assert.That(entman.ContainsKey(obj1), Is.False);
             Assert.That(entman.ContainsKey(li1), Is.False);
-            Assert.That(entman.ContainsKey(obj2), Is.False);            
-            Assert.That(entman.ContainsKey(li2), Is.False);            
+            Assert.That(entman.ContainsKey(obj2), Is.False);
+            Assert.That(entman.ContainsKey(li2), Is.False);
         }
 
         [Test]
         public void T011_ThreadAddRemoveTest()
-        {   
+        {
             TestHelper.InMethod();
             // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
             
@@ -148,12 +148,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             int size = random.Next(40,80); 
             char ch ;
             for (int i=0; i<size; i++)
-            {       
+            {
                 ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
                 name.Append(ch);
             }
             return name.ToString();
-        }        
+        }
     }
 
     public class NewTestThreads
@@ -179,4 +179,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             entman.Remove(sog.UUID);
         }
     }
-}    
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
index f6737a5..5c9e66f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
@@ -29,6 +29,7 @@ using System;
 using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Framework;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
@@ -65,7 +66,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 throw new NotImplementedException();
             }
 
-            public override bool OtherRegionUp(RegionInfo thisRegion)
+            public override void OtherRegionUp(GridRegion otherRegion)
             {
                 throw new NotImplementedException();
             }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 105446d..0ed00de 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -46,13 +46,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     /// </summary>
     [TestFixture]
     public class SceneObjectBasicTests
-    {         
+    {
         /// <summary>
         /// Test adding an object to a scene.
         /// </summary>
         [Test, LongRunning]
         public void TestAddSceneObject()
-        {              
+        {
             TestHelper.InMethod();
 
             Scene scene = SceneSetupHelpers.SetupScene();
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             
             //m_log.Debug("retrievedPart : {0}", retrievedPart);
             // If the parts have the same UUID then we will consider them as one and the same
-            Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));        
+            Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
         }
         
         /// <summary>
@@ -72,11 +72,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelper.InMethod();
             
-            TestScene scene = SceneSetupHelpers.SetupScene();         
+            TestScene scene = SceneSetupHelpers.SetupScene();
             SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
             scene.DeleteSceneObject(part.ParentGroup, false);
             
-            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);            
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
             Assert.That(retrievedPart, Is.Null);
         }
         
@@ -115,19 +115,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         //[Test]
         //public void TestDeleteSceneObjectAsyncToUserInventory()
         //{
-        //    TestHelper.InMethod();            
-        //    //log4net.Config.XmlConfigurator.Configure();                  
+        //    TestHelper.InMethod();
+        //    //log4net.Config.XmlConfigurator.Configure();
             
         //    UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
         //    string myObjectName = "Fred";
             
-        //    TestScene scene = SceneSetupHelpers.SetupScene();                
+        //    TestScene scene = SceneSetupHelpers.SetupScene();
         //    SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene, myObjectName);
             
         //    Assert.That(
         //        scene.CommsManager.UserAdminService.AddUser(
         //            "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
-        //        Is.EqualTo(agentId));  
+        //        Is.EqualTo(agentId));
             
         //    IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
                                                 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index bf13607..aa2f53f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     /// <summary>
     /// Linking tests
     /// </summary>
-    [TestFixture]    
+    [TestFixture]
     public class SceneObjectLinkingTests
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -94,10 +94,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             }
 
             // root part should have no offset position or rotation
-            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity);
+            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity, 
+                "root part should have no offset position or rotation");
 
             // offset position should be root part position - part2.absolute position.
-            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10));
+            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10),
+                "offset position should be root part position - part2.absolute position.");
 
             float roll = 0;
             float pitch = 0;
@@ -116,7 +118,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             if (debugtest)
                 m_log.Debug(rotEuler2);
 
-            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
+            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f),
+                "Not exactly sure what this is asserting...");
 
             // Delink part 2
             grp1.DelinkFromGroup(part2.LocalId);
@@ -125,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 m_log.Debug("Group2: Prim2: OffsetPosition:" + part2.AbsolutePosition + ", OffsetRotation:" + part2.RotationOffset);
 
             Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink.");
-            Assert.That(part2.AbsolutePosition == Vector3.Zero);
+            Assert.That(part2.AbsolutePosition == Vector3.Zero, "The absolute position should be zero");
         }
 
         [Test]
@@ -174,13 +177,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Link grp4 to grp3.
             grp3.LinkToGroup(grp4);
             
-            // At this point we should have 4 parts total in two groups.            
-            Assert.That(grp1.Children.Count == 2);
+            // At this point we should have 4 parts total in two groups.
+            Assert.That(grp1.Children.Count == 2, "Group1 children count should be 2");
             Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link.");
-            Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink.");            
-            Assert.That(grp3.Children.Count == 2);
+            Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink.");
+            Assert.That(grp3.Children.Count == 2, "Group3 children count should be 2");
             Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link.");
-            Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink.");            
+            Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink.");
             
             if (debugtest)
             {
@@ -194,17 +197,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation);
                 m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset);
                 m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset);
-            }            
+            }
 
             // Required for linking
             grp1.RootPart.UpdateFlag = 0;
             grp3.RootPart.UpdateFlag = 0;
 
             // root part should have no offset position or rotation
-            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity);
+            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity,
+                "root part should have no offset position or rotation (again)");
 
             // offset position should be root part position - part2.absolute position.
-            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10));
+            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10),
+                "offset position should be root part position - part2.absolute position (again)");
 
             float roll = 0;
             float pitch = 0;
@@ -223,7 +228,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             if (debugtest)
                 m_log.Debug(rotEuler2);
 
-            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
+            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f),
+                "Not sure what this assertion is all about...");
 
             // Now we're linking the first group to the third group.  This will make the first group child parts of the third one.
             grp3.LinkToGroup(grp1);
@@ -246,13 +252,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 m_log.Debug("Group3: Prim2: OffsetPosition:" + part4.OffsetPosition + ", OffsetRotation:" + part4.RotationOffset);
             }
 
-            Assert.That(part2.AbsolutePosition == Vector3.Zero);
-            Assert.That(part4.OffsetPosition == new Vector3(20, 20, 20));
+            Assert.That(part2.AbsolutePosition == Vector3.Zero, "Badness 1");
+            Assert.That(part4.OffsetPosition == new Vector3(20, 20, 20), "Badness 2");
             Quaternion compareQuaternion = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
             Assert.That((part4.RotationOffset.X - compareQuaternion.X < 0.00003) 
                 && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) 
                 && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) 
-                && (part4.RotationOffset.W - compareQuaternion.W < 0.00003));
-        }        
+                && (part4.RotationOffset.W - compareQuaternion.W < 0.00003),
+                "Badness 3");
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 1c9bce4..8a27b7b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -41,11 +41,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     public class SceneTests
     {
         private class FakeStorageManager : StorageManager
-        {            
+        {
             private class FakeRegionDataStore : IRegionDataStore
             {
                 public void Initialise(string filename)
-                {                    
+                {
                 }
 
                 public void Dispose()
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 1d460dd..b46eb8e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 {
     /// <summary>
     /// Teleport tests in a standalone OpenSim
-    /// </summary>    
+    /// </summary>
     [TestFixture]
     public class StandaloneTeleportTests
     {
@@ -52,7 +52,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         /// Test a teleport between two regions that are not neighbours and do not share any neighbours in common.
         /// </summary>
         /// Does not yet do what is says on the tin.
-        [Test, LongRunning]        
+        /// Commenting for now
+        //[Test, LongRunning]
         public void TestSimpleNotNeighboursTeleport()
         {
             TestHelper.InMethod();
@@ -117,14 +118,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // shared module
             ISharedRegionModule interregionComms = new RESTInterregionComms();
 
-            Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm);
-            SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
-            sceneA.RegisterRegionWithGrid();
 
-            Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm);
+            Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm, "grid");
             SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
             sceneB.RegisterRegionWithGrid();
 
+            Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm, "grid");
+            SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
+            sceneA.RegisterRegionWithGrid();
+
             UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");
             TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId);
 
diff --git a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
index 21cda09..213e954 100644
--- a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
     {
         private Queue<SceneObjectPart> m_queue;
 
-        private List<UUID> m_ids;
+        private Dictionary<UUID, bool> m_ids;
 
         private object m_syncObject = new object();
 
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
         public UpdateQueue()
         {
             m_queue = new Queue<SceneObjectPart>();
-            m_ids = new List<UUID>();
+            m_ids = new Dictionary<UUID, bool>();
         }
 
         public void Clear()
@@ -66,9 +66,8 @@ namespace OpenSim.Region.Framework.Scenes.Types
         {
             lock (m_syncObject)
             {
-                if (!m_ids.Contains(part.UUID))
-                {
-                    m_ids.Add(part.UUID);
+                if (!m_ids.ContainsKey(part.UUID)) {
+                    m_ids.Add(part.UUID, true);
                     m_queue.Enqueue(part);
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index f449e18..525a93a 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes
 {
     /// <summary>
     /// Gather uuids for a given entity.
-    /// </summary>        
+    /// </summary>
     ///
     /// This does a deep inspection of the entity to retrieve all the assets it uses (whether as textures, as scripts
     /// contained in inventory, as scripts contained in objects contained in another object's inventory, etc.  Assets
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// 
         /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param>
         /// <param name="assetType">The type of the asset for the uuid given</param>
-        /// <param name="assetUuids">The assets gathered</param>        
+        /// <param name="assetUuids">The assets gathered</param>
         public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, int> assetUuids)
         {
             assetUuids[assetUuid] = 1;
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes
                     
                     // If the prim is a sculpt then preserve this information too
                     if (part.Shape.SculptTexture != UUID.Zero)
-                        assetUuids[part.Shape.SculptTexture] = 1;                    
+                        assetUuids[part.Shape.SculptTexture] = 1;
                     
                     TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
                     
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes
         
         /// <summary>
         /// The callback made when we request the asset for an object from the asset service.
-        /// </summary>        
+        /// </summary>
         protected void AssetReceived(string id, Object sender, AssetBase asset)
         {
             lock (this)
@@ -242,7 +242,7 @@ namespace OpenSim.Region.Framework.Scenes
             AssetBase assetBase = GetAsset(wearableAssetUuid);
 
             if (null != assetBase)
-            {            
+            {
                 //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data));
                 AssetWearable wearableAsset = new AssetBodypart(wearableAssetUuid, assetBase.Data);
                 wearableAsset.Decode();
@@ -275,6 +275,6 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
                 GatherAssetUuids(sog, assetUuids);
             }
-        }       
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 57f5d29..ee2d2db 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -601,7 +601,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
                 if (names.Length > 1)
                     return names[1];
                 return names[0];
-            }            
+            }
         }
 
         public IScene Scene
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
index c49d942..773507c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
@@ -351,7 +351,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             {
                 m_log.DebugFormat("[IRC-Region {0}] dropping message {1} on channel {2}", Region, msg, msg.Channel);
                 return;
-            }                
+            }
 
             ScenePresence avatar = null;
             string fromName = msg.From;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
index 9ba09ed..46ad30f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
@@ -97,8 +97,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                    </document>", Context, Realm);
             }
              
-            return response;   
-        }    
+            return response;
+        }
     }
     
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
index 5d90a8f..17cdf74 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                      {
                          response = HandleRegister(Context, Realm, request);
                      } 
-                     else if (sipAuthMethod == "INVITE")  
+                     else if (sipAuthMethod == "INVITE")
                      {
                           response = HandleInvite(Context, Realm, request);
                      }
@@ -138,7 +138,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                      response["str_response_string"] = "";
                  }
             }
-            return response;   
+            return response;
         }
         
         private Hashtable HandleRegister(string Context, string Realm, Hashtable request)
@@ -309,17 +309,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                 "</document>\r\n", 
                 domain, Context); 
              
-            return response;    
-        }    
+            return response;
+        }
 
         
 //        private Hashtable HandleLoadNetworkLists(Hashtable request)
 //        {
 //            m_log.Info("[FreeSwitchDirectory] HandleLoadNetworkLists called");
-//            
+//
 //            // TODO the password we return needs to match that sent in the request, this is hard coded for now
 //            string domain = (string) request["domain"];
-//            
+//
 //            Hashtable response = new Hashtable();
 //            response["content_type"] = "text/xml";
 //            response["keepalive"] = false;
@@ -340,9 +340,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 //                    "</section>\r\n" +
 //                "</document>\r\n",
 //                domain); 
-//         
-//             
-//            return response;    
-//        }       
+//
+//
+//            return response;
+//        }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 65c5274..c7bb56a 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -53,7 +53,7 @@ using System.Text.RegularExpressions;
 
 namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 {
-    public class FreeSwitchVoiceModule : IRegionModule
+    public class FreeSwitchVoiceModule : IRegionModule, IVoiceModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -101,13 +101,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         private FreeSwitchDialplan m_FreeSwitchDialplan;
 
         private readonly Dictionary<string, string> m_UUIDName = new Dictionary<string, string>();
+        private Dictionary<string, string> m_ParcelAddress = new Dictionary<string, string>();
+        
+        private Scene m_scene;
         
 
         private IConfig m_config;
 
         public void Initialise(Scene scene, IConfigSource config)
         {
-
+            m_scene = scene;
             m_config = config.Configs["FreeSwitchVoice"];
 
             if (null == m_config)
@@ -230,6 +233,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                     {
                         OnRegisterCaps(scene, agentID, caps);
                     };
+                    
+                
 
                 try
                 {
@@ -255,6 +260,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         
         public void PostInitialise()
         {
+            if (m_pluginEnabled)
+            {
+                m_log.Info("[FreeSwitchVoice] registering IVoiceModule with the scene");
+                
+                // register the voice interface for this module, so the script engine can call us
+                m_scene.RegisterModuleInterface<IVoiceModule>(this);
+            }
         }
 
         public void Close()
@@ -270,7 +282,27 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         {
             get { return true; }
         }
-
+        
+        // <summary>
+        // implementation of IVoiceModule, called by osSetParcelSIPAddress script function
+        // </summary>
+        public void setLandSIPAddress(string SIPAddress,UUID GlobalID)
+        {
+            m_log.DebugFormat("[FreeSwitchVoice]: setLandSIPAddress parcel id {0}: setting sip address {1}", 
+                                  GlobalID, SIPAddress);
+                                  
+            lock (m_ParcelAddress)
+            {
+                if (m_ParcelAddress.ContainsKey(GlobalID.ToString()))
+                {
+                    m_ParcelAddress[GlobalID.ToString()] = SIPAddress;
+                }
+                else
+                {
+                    m_ParcelAddress.Add(GlobalID.ToString(), SIPAddress);
+                }
+            }
+        }
         
         // <summary>
         // OnRegisterCaps is invoked via the scene.EventManager
@@ -776,6 +808,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 
             // Create parcel voice channel. If no parcel exists, then the voice channel ID is the same
             // as the directory ID. Otherwise, it reflects the parcel's ID.
+            
+            lock (m_ParcelAddress)
+            {
+                if (m_ParcelAddress.ContainsKey(land.GlobalID.ToString()))
+                {
+                    m_log.DebugFormat("[FreeSwitchVoice]: parcel id {0}: using sip address {1}", 
+                                      land.GlobalID, m_ParcelAddress[land.GlobalID.ToString()]);
+                    return m_ParcelAddress[land.GlobalID.ToString()];
+                }
+            }
 
             if (land.LocalID != 1 && (land.Flags & (uint)ParcelFlags.UseEstateVoiceChan) == 0)
             {
@@ -797,6 +839,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             // the personal speech indicators as well unless some siren14-3d codec magic happens. we dont have siren143d so we'll settle for the personal speech indicator.
             channelUri = String.Format("sip:conf-{0}@{1}", "x" + Convert.ToBase64String(encoding.GetBytes(landUUID)), m_freeSwitchRealm);
             
+            lock (m_ParcelAddress)
+            {
+                if (!m_ParcelAddress.ContainsKey(land.GlobalID.ToString()))
+                {
+                    m_ParcelAddress.Add(land.GlobalID.ToString(),channelUri);
+                }
+            }
 
             return channelUri;
         }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index febb491..cb76200 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -226,7 +226,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 m_log.DebugFormat("[VivoxVoice] plugin initialization failed: {0}", e.ToString());
                 return;
             }
-        }   
+        }
 
 
         // Called to indicate that the module has been added to the region
@@ -1144,7 +1144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 // Otherwise prepare the request
                 m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl);
 
-                HttpWebRequest  req = (HttpWebRequest)WebRequest.Create(requrl);            
+                HttpWebRequest  req = (HttpWebRequest)WebRequest.Create(requrl);
                 HttpWebResponse rsp = null;
 
                 // We are sending just parameters, no content
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index d5cbfd4..2e89a24 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -477,7 +477,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                             foreach (string key in binBucketOSD.Keys)
                             {
                                 m_log.WarnFormat("{0}: {1}", key, binBucketOSD[key].ToString());
-                            }                     
+                            }
                         }
    
                         // treat as if no attachment
@@ -1261,7 +1261,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            // TODO: Probably isn't nessesary to update every client in every scene.  
+            // TODO: Probably isn't nessesary to update every client in every scene.
             // Need to examine client updates and do only what's nessesary.
             lock (m_sceneList)
             {
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 805c3d4..964d0bb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -871,7 +871,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_log.ErrorFormat("[XMLRPCGROUPDATA]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function);
                 m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", e.ToString());
 
-                foreach( string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None))
+                foreach (string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None))
                 {
                     m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", ResponseLine);
                 }
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
index b5da6f7..7202601 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
@@ -208,7 +208,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
                 // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened
                 m_log.ErrorFormat(
                     "[CONTENT MANAGEMENT]: Content management thread terminating with exception.  PLEASE REBOOT YOUR SIM - CONTENT MANAGEMENT WILL NOT BE AVAILABLE UNTIL YOU DO.  Exception is {0}", 
-                    e);                                   
+                    e);
             }
         }
 
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
index 52c4e03..0dc78c0 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
             {
                 if (m_MetaEntityCollection.Auras.ContainsKey(((SceneObjectPart)missingPart).UUID))
                     continue;
-                newList.Add(m_MetaEntityCollection.CreateAuraForNewlyCreatedEntity((SceneObjectPart)missingPart));                
+                newList.Add(m_MetaEntityCollection.CreateAuraForNewlyCreatedEntity((SceneObjectPart)missingPart));
             }
             m_log.Info("Number of missing objects found: " + newList.Count);
             return newList;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index bf523dd..ce50f9e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         /// </exception>
         /// <returns>AppDomain with a restricted security policy</returns>
         /// <remarks>Substantial portions of this function from: http://blogs.msdn.com/shawnfa/archive/2004/10/25/247379.aspx
-        /// Valid permissionSetName values are:     
+        /// Valid permissionSetName values are:
         /// * FullTrust
         /// * SkipVerification
         /// * Execution
diff --git a/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
index c539280..fc1c608 100644
--- a/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
         public void LoadRegion(Scene scene)
         {
             IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)   
+            if (serialiser != null)
             {
                 serialiser.LoadPrimsFromXml2(
                     scene,
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index d4bba10..3044b17 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                 this.m_maximum_scale = cp.m_maximum_scale;
                 this.m_initial_scale = cp.m_initial_scale;
                 this.m_rate = cp.m_rate;
-                this.m_planted = planted;  
+                this.m_planted = planted;
                 this.m_trees = new List<UUID>();
             }
 
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index 7ab8b98..f22ea71 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -204,7 +204,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             tempAngularVelocity2 = new btVector3(0, 0, 0);
             tempInertia1 = new btVector3(0, 0, 0);
             tempInertia2 = new btVector3(0, 0, 0);
-            tempOrientation1 = new btQuaternion(0,0,0,1);
+            tempOrientation1 = new btQuaternion(0, 0, 0, 1);
             tempOrientation2 = new btQuaternion(0, 0, 0, 1);
             _parent_scene = parent_scene;
             tempTransform1 = new btTransform(_parent_scene.QuatIdentity, _parent_scene.VectorZero);
@@ -216,10 +216,10 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             tempMotionState2 = new btDefaultMotionState(_parent_scene.TransZero);
             tempMotionState3 = new btDefaultMotionState(_parent_scene.TransZero);
 
-            
+
             AxisLockLinearLow = new btVector3(-1 * (int)Constants.RegionSize, -1 * (int)Constants.RegionSize, -1 * (int)Constants.RegionSize);
-            int regionsize = (int) Constants.RegionSize;
-            
+            int regionsize = (int)Constants.RegionSize;
+
             if (regionsize == 256)
                 regionsize = 512;
 
@@ -611,7 +611,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             DisableAxisMotor();
             DisposeOfBody();
             SetCollisionShape(null);
-           
+
             if (tempMotionState3 != null && tempMotionState3.Handle != IntPtr.Zero)
             {
                 tempMotionState3.Dispose();
@@ -677,8 +677,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 tempInertia2.Dispose();
                 tempInertia1 = null;
             }
-            
-            
+
+
             if (tempAngularVelocity2 != null && tempAngularVelocity2.Handle != IntPtr.Zero)
             {
                 tempAngularVelocity2.Dispose();
@@ -802,7 +802,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 changesize(timestep);
             }
 
-        //
+            //
 
             if (m_taintshape)
             {
@@ -1001,7 +1001,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             else
                 SetBody(0);
             changeSelectedStatus(timestep);
-            
+
             resetCollisionAccounting();
             m_taintPhysics = m_isphysical;
         }
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
             if (_parent_scene.needsMeshing(_pbs))
             {
-                ProcessGeomCreationAsTriMesh(PhysicsVector.Zero,Quaternion.Identity);
+                ProcessGeomCreationAsTriMesh(PhysicsVector.Zero, Quaternion.Identity);
                 // createmesh returns null when it doesn't mesh.
                 CreateGeom(IntPtr.Zero, _mesh);
             }
@@ -1038,32 +1038,32 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 meshlod = _parent_scene.MeshSculptphysicalLOD;
 
             IMesh mesh = _parent_scene.mesher.CreateMesh(SOPName, _pbs, _size, meshlod, IsPhysical);
-            if (!positionOffset.IsIdentical(PhysicsVector.Zero,0.001f) || orientation != Quaternion.Identity)
+            if (!positionOffset.IsIdentical(PhysicsVector.Zero, 0.001f) || orientation != Quaternion.Identity)
             {
-                
-                    float[] xyz = new float[3];
-                    xyz[0] = positionOffset.X;
-                    xyz[1] = positionOffset.Y;
-                    xyz[2] = positionOffset.Z;
-
-                    Matrix4 m4 = Matrix4.CreateFromQuaternion(orientation);
-
-                    float[,] matrix = new float[3,3];
-
-                    matrix[0, 0] = m4.M11;
-                    matrix[0, 1] = m4.M12;
-                    matrix[0, 2] = m4.M13;
-                    matrix[1, 0] = m4.M21;
-                    matrix[1, 1] = m4.M22;
-                    matrix[1, 2] = m4.M23;
-                    matrix[2, 0] = m4.M31;
-                    matrix[2, 1] = m4.M32;
-                    matrix[2, 2] = m4.M33;
-
-                    
-                    mesh.TransformLinear(matrix, xyz);
-                    
-                
+
+                float[] xyz = new float[3];
+                xyz[0] = positionOffset.X;
+                xyz[1] = positionOffset.Y;
+                xyz[2] = positionOffset.Z;
+
+                Matrix4 m4 = Matrix4.CreateFromQuaternion(orientation);
+
+                float[,] matrix = new float[3, 3];
+
+                matrix[0, 0] = m4.M11;
+                matrix[0, 1] = m4.M12;
+                matrix[0, 2] = m4.M13;
+                matrix[1, 0] = m4.M21;
+                matrix[1, 1] = m4.M22;
+                matrix[1, 2] = m4.M23;
+                matrix[2, 0] = m4.M31;
+                matrix[2, 1] = m4.M32;
+                matrix[2, 2] = m4.M33;
+
+
+                mesh.TransformLinear(matrix, xyz);
+
+
 
             }
 
@@ -1088,12 +1088,12 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             SetCollisionShape(null);
             // Construction of new prim
             ProcessGeomCreation();
-            
+
             if (IsPhysical)
                 SetBody(Mass);
             else
                 SetBody(0);
-            
+
             m_taintsize = _size;
 
         }
@@ -1136,7 +1136,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 //prim_geom = IntPtr.Zero;
                 m_log.Error("[PHYSICS]: PrimGeom dead");
             }
-            
+
             // we don't need to do space calculation because the client sends a position update also.
             if (_size.X <= 0) _size.X = 0.01f;
             if (_size.Y <= 0) _size.Y = 0.01f;
@@ -1153,8 +1153,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 tempTransform1.Dispose();
             tempTransform1 = new btTransform(tempOrientation1, tempPosition1);
 
-            
-            
+
+
 
             //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
             if (IsPhysical)
@@ -1162,7 +1162,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 SetBody(Mass);
                 // Re creates body on size.
                 // EnableBody also does setMass()
-               
+
             }
             else
             {
@@ -1179,7 +1179,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 }
             }
             resetCollisionAccounting();
-            
+
             m_taintshape = false;
         }
 
@@ -1291,7 +1291,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             {
                 Body.setCollisionFlags((int)ContactFlags.CF_NO_CONTACT_RESPONSE);
                 disableBodySoft();
-                
+
             }
             else
             {
@@ -1299,7 +1299,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 enableBodySoft();
             }
             m_isSelected = m_taintselected;
-            
+
         }
 
         private void changevelocity(float timestep)
@@ -1368,7 +1368,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             _parent = m_taintparent;
 
             m_taintPhysics = m_isphysical;
-            
+
         }
 
         private void changefloatonwater(float timestep)
@@ -1627,7 +1627,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             {
                 if (m_zeroPosition == null)
                     m_zeroPosition = new PhysicsVector(0, 0, 0);
-                 m_zeroPosition.setValues(_position.X,_position.Y,_position.Z);
+                m_zeroPosition.setValues(_position.X, _position.Y, _position.Z);
                 return;
             }
         }
@@ -1981,7 +1981,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 //_mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical);
                 _mesh = p_mesh;
                 setMesh(_parent_scene, _mesh);
-                
+
             }
             else
             {
@@ -1994,15 +1994,15 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                             //SetGeom to a Regular Sphere
                             if (tempSize1 == null)
                                 tempSize1 = new btVector3(0, 0, 0);
-                            tempSize1.setValue(_size.X * 0.5f,_size.Y * 0.5f, _size.Z * 0.5f);
-                            SetCollisionShape(new btSphereShape(_size.X*0.5f));
+                            tempSize1.setValue(_size.X * 0.5f, _size.Y * 0.5f, _size.Z * 0.5f);
+                            SetCollisionShape(new btSphereShape(_size.X * 0.5f));
                         }
                         else
                         {
                             // uses halfextents
                             if (tempSize1 == null)
                                 tempSize1 = new btVector3(0, 0, 0);
-                            tempSize1.setValue(_size.X*0.5f, _size.Y*0.5f, _size.Z*0.5f);
+                            tempSize1.setValue(_size.X * 0.5f, _size.Y * 0.5f, _size.Z * 0.5f);
                             SetCollisionShape(new btBoxShape(tempSize1));
                         }
                     }
@@ -2052,14 +2052,24 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 }
             }
 
+            //IMesh oldMesh = primMesh;
+
+            //primMesh = mesh;
+
+            //float[] vertexList = primMesh.getVertexListAsFloatLocked(); // Note, that vertextList is pinned in memory
+            //int[] indexList = primMesh.getIndexListAsIntLocked(); // Also pinned, needs release after usage
+            ////Array.Reverse(indexList);
+            //primMesh.releaseSourceMeshData(); // free up the original mesh data to save memory
+
             IMesh oldMesh = primMesh;
 
             primMesh = mesh;
-            
-            float[] vertexList = primMesh.getVertexListAsFloatLocked(); // Note, that vertextList is pinned in memory
-            int[] indexList = primMesh.getIndexListAsIntLocked(); // Also pinned, needs release after usage
+
+            float[] vertexList = mesh.getVertexListAsFloatLocked(); // Note, that vertextList is pinned in memory
+            int[] indexList = mesh.getIndexListAsIntLocked(); // Also pinned, needs release after usage
             //Array.Reverse(indexList);
-            primMesh.releaseSourceMeshData(); // free up the original mesh data to save memory
+            mesh.releaseSourceMeshData(); // free up the original mesh data to save memory
+
 
             int VertexCount = vertexList.GetLength(0) / 3;
             int IndexCount = indexList.GetLength(0);
@@ -2068,17 +2078,17 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 btshapeArray.Dispose();
             //Array.Reverse(indexList);
             btshapeArray = new btTriangleIndexVertexArray(IndexCount / 3, indexList, (3 * sizeof(int)),
-                                                                                     VertexCount, vertexList, 3*sizeof (float));
+                                                                                     VertexCount, vertexList, 3 * sizeof(float));
             SetCollisionShape(new btGImpactMeshShape(btshapeArray));
             //((btGImpactMeshShape) prim_geom).updateBound();
-            ((btGImpactMeshShape)prim_geom).setLocalScaling(new btVector3(1,1, 1));
+            ((btGImpactMeshShape)prim_geom).setLocalScaling(new btVector3(1, 1, 1));
             ((btGImpactMeshShape)prim_geom).updateBound();
             _parent_scene.SetUsingGImpact();
-            if (oldMesh != null)
-            {
-                oldMesh.releasePinned();
-                oldMesh = null;
-            }
+            //if (oldMesh != null)
+            //{
+            //    oldMesh.releasePinned();
+            //    oldMesh = null;
+            //}
 
         }
 
@@ -2102,7 +2112,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             }
              */
             prim_geom = shape;
-           
+
             //Body.set
         }
 
@@ -2143,8 +2153,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
                 if (prim_geom is btGImpactMeshShape)
                 {
-                    ((btGImpactMeshShape) prim_geom).setLocalScaling(new btVector3(1, 1, 1));
-                    ((btGImpactMeshShape) prim_geom).updateBound();
+                    ((btGImpactMeshShape)prim_geom).setLocalScaling(new btVector3(1, 1, 1));
+                    ((btGImpactMeshShape)prim_geom).updateBound();
                 }
                 //Body.setCollisionFlags(Body.getCollisionFlags() | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK);
                 //Body.setUserPointer((IntPtr) (int)m_localID);
@@ -2159,7 +2169,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                     {
                         if (chld == null)
                             continue;
-                        
+
                         // if (chld.NeedsMeshing())
                         //     hasTrimesh = true;
                     }
@@ -2167,40 +2177,40 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
                 //if (hasTrimesh)
                 //{
-                    ProcessGeomCreationAsTriMesh(PhysicsVector.Zero, Quaternion.Identity);
-                    // createmesh returns null when it doesn't mesh.
-                    
-                    /*
-                    if (_mesh is Mesh)
-                    {
-                    }
-                    else
-                    {
-                        m_log.Warn("[PHYSICS]: Can't link a OpenSim.Region.Physics.Meshing.Mesh object");
-                        return;
-                    }
-                    */
+                ProcessGeomCreationAsTriMesh(PhysicsVector.Zero, Quaternion.Identity);
+                // createmesh returns null when it doesn't mesh.
 
-                    
-                    
-                    foreach (BulletDotNETPrim chld in childrenPrim)
-                    {
-                        if (chld == null)
-                            continue;
-                        PhysicsVector offset = chld.Position - Position;
-                        Vector3 pos = new Vector3(offset.X, offset.Y, offset.Z);
-                        pos *= Quaternion.Inverse(Orientation);
-                        //pos *= Orientation;
-                        offset.setValues(pos.X, pos.Y, pos.Z);
-                        chld.ProcessGeomCreationAsTriMesh(offset, chld.Orientation);
-                        
-                            _mesh.Append(chld._mesh);
-                        
+                /*
+                if (_mesh is Mesh)
+                {
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Can't link a OpenSim.Region.Physics.Meshing.Mesh object");
+                    return;
+                }
+                */
 
-                    }
-                    setMesh(_parent_scene, _mesh);
-                
-            //}
+
+
+                foreach (BulletDotNETPrim chld in childrenPrim)
+                {
+                    if (chld == null)
+                        continue;
+                    PhysicsVector offset = chld.Position - Position;
+                    Vector3 pos = new Vector3(offset.X, offset.Y, offset.Z);
+                    pos *= Quaternion.Inverse(Orientation);
+                    //pos *= Orientation;
+                    offset.setValues(pos.X, pos.Y, pos.Z);
+                    chld.ProcessGeomCreationAsTriMesh(offset, chld.Orientation);
+
+                    _mesh.Append(chld._mesh);
+
+
+                }
+                setMesh(_parent_scene, _mesh);
+
+                //}
 
                 if (tempMotionState1 != null && tempMotionState1.Handle != IntPtr.Zero)
                     tempMotionState1.Dispose();
@@ -2238,7 +2248,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                     ((btGImpactMeshShape)prim_geom).updateBound();
                 }
                 _parent_scene.AddPrimToScene(this);
-                
+
             }
 
             if (IsPhysical)
@@ -2252,7 +2262,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 if (Body.Handle != IntPtr.Zero)
                 {
                     DisableAxisMotor();
-                    _parent_scene.removeFromWorld(this,Body);
+                    _parent_scene.removeFromWorld(this, Body);
                     Body.Dispose();
                 }
                 Body = null;
@@ -2305,7 +2315,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 return;
 
 
-            
+
             lock (childrenPrim)
             {
                 if (!childrenPrim.Contains(prm))
@@ -2313,8 +2323,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                     childrenPrim.Add(prm);
                 }
             }
-           
-            
+
+
         }
 
         public void disableBody()
@@ -2386,7 +2396,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             {
                 Body.clearForces();
                 Body.forceActivationState(0);
-                
+
             }
 
         }
@@ -2400,7 +2410,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                     Body.clearForces();
                     Body.forceActivationState(4);
                     forceenable = true;
-                    
+
                 }
                 m_disabled = false;
             }
@@ -2415,7 +2425,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                     SetBody(Mass);
                 else
                     SetBody(0);
-                
+
                 // TODO: Set Collision Category Bits and Flags
                 // TODO: Set Auto Disable data
 
@@ -2587,10 +2597,10 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                         _velocity.Y = tempLinearVelocity1.getY();
                         _velocity.Z = tempLinearVelocity1.getZ();
 
-                        _acceleration = ((_velocity - m_lastVelocity)/0.1f);
-                        _acceleration = new PhysicsVector(_velocity.X - m_lastVelocity.X/0.1f,
-                                                          _velocity.Y - m_lastVelocity.Y/0.1f,
-                                                          _velocity.Z - m_lastVelocity.Z/0.1f);
+                        _acceleration = ((_velocity - m_lastVelocity) / 0.1f);
+                        _acceleration = new PhysicsVector(_velocity.X - m_lastVelocity.X / 0.1f,
+                                                          _velocity.Y - m_lastVelocity.Y / 0.1f,
+                                                          _velocity.Z - m_lastVelocity.Z / 0.1f);
                         //m_log.Info("[PHYSICS]: V1: " + _velocity + " V2: " + m_lastVelocity + " Acceleration: " + _acceleration.ToString());
 
                         if (_velocity.IsIdentical(pv, 0.5f))
@@ -2669,7 +2679,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             if (AxisLockAngleHigh != null && AxisLockAngleHigh.Handle != IntPtr.Zero)
                 AxisLockAngleHigh.Dispose();
 
-           
+
 
             m_aMotor = new btGeneric6DofConstraint(Body, _parent_scene.TerrainBody, _parent_scene.TransZero,
                                                    _parent_scene.TransZero, false);
@@ -2683,7 +2693,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             m_aMotor.setLinearUpperLimit(AxisLockLinearHigh);
             _parent_scene.getBulletWorld().addConstraint((btTypedConstraint)m_aMotor);
             //m_aMotor.
-            
+
 
         }
         internal void DisableAxisMotor()
@@ -2698,4 +2708,4 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
     }
 }
-                    
+
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
index e0f856a..18d4bab 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
@@ -528,7 +528,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
             // Teravus: Kitto, this code causes recurring errors that stall physics permenantly unless 
             // the values are checked, so checking below.
-            // Is there any reason that we don't do this in ScenePresence?   
+            // Is there any reason that we don't do this in ScenePresence?
             // The only physics engine that benefits from it in the physics plugin is this one
 
             if (x > (int)Constants.RegionSize || y > (int)Constants.RegionSize ||
@@ -650,7 +650,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
             if (iPropertiesNotSupportedDefault == 0)
             {
-#if SPAM              
+#if SPAM
                 m_log.Warn("NonMesh");
 #endif
                 return false;
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index ce52744..7130a3e 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Physics.Manager
             plugHard = new ZeroMesherPlugin();
             _MeshPlugins.Add(plugHard.GetName(), plugHard);
             
-            m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName());            
+            m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName());
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 8a07f71..6dd26bb 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -178,12 +178,12 @@ namespace OpenSim.Region.Physics.Manager
         }
 
         /// <summary>
-        /// Queue a raycast against the physics scene.  
+        /// Queue a raycast against the physics scene.
         /// The provided callback method will be called when the raycast is complete
         /// 
         /// Many physics engines don't support collision testing at the same time as 
         /// manipulating the physics scene, so we queue the request up and callback 
-        /// a custom method when the raycast is complete.  
+        /// a custom method when the raycast is complete.
         /// This allows physics engines that give an immediate result to callback immediately
         /// and ones that don't, to callback when it gets a result back.
         /// 
diff --git a/OpenSim/Region/Physics/Manager/VehicleConstants.cs b/OpenSim/Region/Physics/Manager/VehicleConstants.cs
index 97f66d3..532e55e 100644
--- a/OpenSim/Region/Physics/Manager/VehicleConstants.cs
+++ b/OpenSim/Region/Physics/Manager/VehicleConstants.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Physics.Manager
         BANKING_TIMESCALE = 40,
         REFERENCE_FRAME = 44
 
-    }   
+    }
 
     [Flags]
     public enum VehicleFlag
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs
index ceafaad..aae8871 100644
--- a/OpenSim/Region/Physics/Meshing/Mesh.cs
+++ b/OpenSim/Region/Physics/Meshing/Mesh.cs
@@ -40,7 +40,6 @@ namespace OpenSim.Region.Physics.Meshing
         private List<Triangle> triangles;
         GCHandle pinnedVirtexes;
         GCHandle pinnedIndex;
-        public PrimMesh primMesh = null;
         public float[] normals;
 
         public Mesh()
@@ -63,6 +62,8 @@ namespace OpenSim.Region.Physics.Meshing
 
         public void Add(Triangle triangle)
         {
+            if (pinnedIndex.IsAllocated || pinnedVirtexes.IsAllocated)
+                throw new NotSupportedException("Attempt to Add to a pinned Mesh");
             // If a vertex of the triangle is not yet in the vertices list,
             // add it and set its index to the current index count
             if (!vertices.ContainsKey(triangle.v1))
@@ -148,40 +149,22 @@ namespace OpenSim.Region.Physics.Meshing
 
         public float[] getVertexListAsFloatLocked()
         {
+            if (pinnedVirtexes.IsAllocated)
+                return (float[])(pinnedVirtexes.Target);
             float[] result;
 
-            if (primMesh == null)
+            //m_log.WarnFormat("vertices.Count = {0}", vertices.Count);
+            result = new float[vertices.Count * 3];
+            foreach (KeyValuePair<Vertex, int> kvp in vertices)
             {
-                //m_log.WarnFormat("vertices.Count = {0}", vertices.Count);
-                result = new float[vertices.Count * 3];
-                foreach (KeyValuePair<Vertex, int> kvp in vertices)
-                {
-                    Vertex v = kvp.Key;
-                    int i = kvp.Value;
-                    //m_log.WarnFormat("kvp.Value = {0}", i);
-                    result[3 * i + 0] = v.X;
-                    result[3 * i + 1] = v.Y;
-                    result[3 * i + 2] = v.Z;
-                }
-                pinnedVirtexes = GCHandle.Alloc(result, GCHandleType.Pinned);
-            }
-            else
-            {
-                int count = primMesh.coords.Count;
-                result = new float[count * 3];
-                for (int i = 0; i < count; i++)
-                {
-                    Coord c = primMesh.coords[i];
-                    {
-                        int resultIndex = 3 * i;
-                        result[resultIndex] = c.X;
-                        result[resultIndex + 1] = c.Y;
-                        result[resultIndex + 2] = c.Z;
-                    }
-
-                }
-                pinnedVirtexes = GCHandle.Alloc(result, GCHandleType.Pinned);
+                Vertex v = kvp.Key;
+                int i = kvp.Value;
+                //m_log.WarnFormat("kvp.Value = {0}", i);
+                result[3 * i + 0] = v.X;
+                result[3 * i + 1] = v.Y;
+                result[3 * i + 2] = v.Z;
             }
+            pinnedVirtexes = GCHandle.Alloc(result, GCHandleType.Pinned);
             return result;
         }
 
@@ -189,33 +172,13 @@ namespace OpenSim.Region.Physics.Meshing
         {
             int[] result;
 
-            if (primMesh == null)
-            {
-                result = new int[triangles.Count * 3];
-                for (int i = 0; i < triangles.Count; i++)
-                {
-                    Triangle t = triangles[i];
-                    result[3 * i + 0] = vertices[t.v1];
-                    result[3 * i + 1] = vertices[t.v2];
-                    result[3 * i + 2] = vertices[t.v3];
-                }
-            }
-            else
+            result = new int[triangles.Count * 3];
+            for (int i = 0; i < triangles.Count; i++)
             {
-                int numFaces = primMesh.faces.Count;
-                result = new int[numFaces * 3];
-                for (int i = 0; i < numFaces; i++)
-                {
-                    Face f = primMesh.faces[i];
-//                    Coord c1 = primMesh.coords[f.v1];
-//                    Coord c2 = primMesh.coords[f.v2];
-//                    Coord c3 = primMesh.coords[f.v3];
-
-                    int resultIndex = i * 3;
-                    result[resultIndex] = f.v1;
-                    result[resultIndex + 1] = f.v2;
-                    result[resultIndex + 2] = f.v3;
-                }
+                Triangle t = triangles[i];
+                result[3 * i + 0] = vertices[t.v1];
+                result[3 * i + 1] = vertices[t.v2];
+                result[3 * i + 2] = vertices[t.v3];
             }
             return result;
         }
@@ -226,6 +189,9 @@ namespace OpenSim.Region.Physics.Meshing
         /// <returns></returns>
         public int[] getIndexListAsIntLocked()
         {
+            if (pinnedIndex.IsAllocated)
+                return (int[])(pinnedIndex.Target);
+        
             int[] result = getIndexListAsInt();
             pinnedIndex = GCHandle.Alloc(result, GCHandleType.Pinned);
 
@@ -245,11 +211,13 @@ namespace OpenSim.Region.Physics.Meshing
         {
             triangles = null;
             vertices = null;
-            primMesh = null;
         }
 
         public void Append(IMesh newMesh)
         {
+            if (pinnedIndex.IsAllocated || pinnedVirtexes.IsAllocated)
+                throw new NotSupportedException("Attempt to Append to a pinned Mesh");
+        
             if (!(newMesh is Mesh))
                 return;
 
@@ -260,6 +228,9 @@ namespace OpenSim.Region.Physics.Meshing
         // Do a linear transformation of  mesh.
         public void TransformLinear(float[,] matrix, float[] offset)
         {
+            if (pinnedIndex.IsAllocated || pinnedVirtexes.IsAllocated)
+                throw new NotSupportedException("Attempt to TransformLinear a pinned Mesh");
+        
             foreach (Vertex v in vertices.Keys)
             {
                 if (v == null)
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index aa8df23..d56ddc8 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -76,6 +76,7 @@ namespace OpenSim.Region.Physics.Meshing
 
         private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh
 
+        private Dictionary<ulong, Mesh> m_uniqueMeshes = new Dictionary<ulong, Mesh>();
 
         public Meshmerizer()
         {
@@ -184,9 +185,62 @@ namespace OpenSim.Region.Physics.Meshing
 
         }
 
-        public Mesh CreateMeshFromPrimMesher(string primName, PrimitiveBaseShape primShape, PhysicsVector size, float lod)
+        private ulong GetMeshKey(PrimitiveBaseShape pbs, PhysicsVector size, float lod)
+        {
+            ulong hash = 5381;
+
+            hash = djb2(hash, pbs.PathCurve);
+            hash = djb2(hash, (byte)((byte)pbs.HollowShape | (byte)pbs.ProfileShape));
+            hash = djb2(hash, pbs.PathBegin);
+            hash = djb2(hash, pbs.PathEnd);
+            hash = djb2(hash, pbs.PathScaleX);
+            hash = djb2(hash, pbs.PathScaleY);
+            hash = djb2(hash, pbs.PathShearX);
+            hash = djb2(hash, pbs.PathShearY);
+            hash = djb2(hash, (byte)pbs.PathTwist);
+            hash = djb2(hash, (byte)pbs.PathTwistBegin);
+            hash = djb2(hash, (byte)pbs.PathRadiusOffset);
+            hash = djb2(hash, (byte)pbs.PathTaperX);
+            hash = djb2(hash, (byte)pbs.PathTaperY);
+            hash = djb2(hash, pbs.PathRevolutions);
+            hash = djb2(hash, (byte)pbs.PathSkew);
+            hash = djb2(hash, pbs.ProfileBegin);
+            hash = djb2(hash, pbs.ProfileEnd);
+            hash = djb2(hash, pbs.ProfileHollow);
+
+            // TODO: Separate scale out from the primitive shape data (after
+            // scaling is supported at the physics engine level)
+            byte[] scaleBytes = size.GetBytes();
+            for (int i = 0; i < scaleBytes.Length; i++)
+                hash = djb2(hash, scaleBytes[i]);
+
+            // Include LOD in hash, accounting for endianness
+            byte[] lodBytes = new byte[4];
+            Buffer.BlockCopy(BitConverter.GetBytes(lod), 0, lodBytes, 0, 4);
+            if (!BitConverter.IsLittleEndian)
+            {
+                Array.Reverse(lodBytes, 0, 4);
+            }
+            for (int i = 0; i < lodBytes.Length; i++)
+                hash = djb2(hash, lodBytes[i]);
+
+            return hash;
+        }
+
+        private ulong djb2(ulong hash, byte c)
+        {
+            return ((hash << 5) + hash) + (ulong)c;
+        }
+
+        private ulong djb2(ulong hash, ushort c)
+        {
+            hash = ((hash << 5) + hash) + (ulong)((byte)c);
+            return ((hash << 5) + hash) + (ulong)(c >> 8);
+        }
+        
+
+        private Mesh CreateMeshFromPrimMesher(string primName, PrimitiveBaseShape primShape, PhysicsVector size, float lod)
         {
-            Mesh mesh = new Mesh();
             PrimMesh primMesh;
             PrimMesher.SculptMesh sculptMesh;
 
@@ -399,8 +453,6 @@ namespace OpenSim.Region.Physics.Meshing
 
                 coords = primMesh.coords;
                 faces = primMesh.faces;
-
-
             }
 
 
@@ -415,13 +467,13 @@ namespace OpenSim.Region.Physics.Meshing
                 vertices.Add(new Vertex(c.X, c.Y, c.Z));
             }
 
+            Mesh mesh = new Mesh();
             // Add the corresponding triangles to the mesh
             for (int i = 0; i < numFaces; i++)
             {
                 Face f = faces[i];
                 mesh.Add(new Triangle(vertices[f.v1], vertices[f.v2], vertices[f.v3]));
             }
-
             return mesh;
         }
 
@@ -432,7 +484,12 @@ namespace OpenSim.Region.Physics.Meshing
 
         public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size, float lod, bool isPhysical)
         {
+            // If this mesh has been created already, return it instead of creating another copy
+            // For large regions with 100k+ prims and hundreds of copies of each, this can save a GB or more of memory
+            ulong key = GetMeshKey(primShape, size, lod);
             Mesh mesh = null;
+            if (m_uniqueMeshes.TryGetValue(key, out mesh))
+                return mesh;
 
             if (size.X < 0.01f) size.X = 0.01f;
             if (size.Y < 0.01f) size.Y = 0.01f;
@@ -455,7 +512,7 @@ namespace OpenSim.Region.Physics.Meshing
                 // trim the vertex and triangle lists to free up memory
                 mesh.TrimExcess();
             }
-
+            m_uniqueMeshes.Add(key, mesh);
             return mesh;
         }
     }
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index 0d19c01..abfd400 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -345,6 +345,21 @@ namespace PrimMesher
             this.v3.Z *= z;
         }
 
+        public void AddPos(float x, float y, float z)
+        {
+            this.v1.X += x;
+            this.v2.X += x;
+            this.v3.X += x;
+
+            this.v1.Y += y;
+            this.v2.Y += y;
+            this.v3.Y += y;
+
+            this.v1.Z += z;
+            this.v2.Z += z;
+            this.v3.Z += z;
+        }
+
         public void AddRot(Quat q)
         {
             this.v1 *= q;
@@ -2141,6 +2156,18 @@ namespace PrimMesher
                 vert.Z += z;
                 this.coords[i] = vert;
             }
+
+            if (this.viewerFaces != null)
+            {
+                int numViewerFaces = this.viewerFaces.Count;
+
+                for (i = 0; i < numViewerFaces; i++)
+                {
+                    ViewerFace v = this.viewerFaces[i];
+                    v.AddPos(x, y, z);
+                    this.viewerFaces[i] = v;
+                }
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
index bf42fee..bd63aef 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
@@ -494,6 +494,18 @@ namespace PrimMesher
                 vert.Z += z;
                 this.coords[i] = vert;
             }
+
+            if (this.viewerFaces != null)
+            {
+                int numViewerFaces = this.viewerFaces.Count;
+
+                for (i = 0; i < numViewerFaces; i++)
+                {
+                    ViewerFace v = this.viewerFaces[i];
+                    v.AddPos(x, y, z);
+                    this.viewerFaces[i] = v;
+                }
+            }
         }
 
         /// <summary>
@@ -556,7 +568,7 @@ namespace PrimMesher
             if (path == null)
                 return;
             String fileName = name + "_" + title + ".raw";
-            String completePath = Path.Combine(path, fileName);
+            String completePath = System.IO.Path.Combine(path, fileName);
             StreamWriter sw = new StreamWriter(completePath);
 
             for (int i = 0; i < this.faces.Count; i++)
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index dd58a4e..a00ba11 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -107,6 +107,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public float MinimumGroundFlightOffset = 3f;
 
         private float m_tainted_CAPSULE_LENGTH; // set when the capsule length changes. 
+        private float m_tiltMagnitudeWhenProjectedOnXYPlane = 0.1131371f; // used to introduce a fixed tilt because a straight-up capsule falls through terrain, probably a bug in terrain collider
 
 
         private float m_buoyancy = 0f;
@@ -477,7 +478,71 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
             }
         }
-        
+
+        private void AlignAvatarTiltWithCurrentDirectionOfMovement(PhysicsVector movementVector)
+        {
+            movementVector.Z = 0f;
+            float magnitude = (float)Math.Sqrt((double)(movementVector.X * movementVector.X + movementVector.Y * movementVector.Y));
+            if (magnitude < 0.1f) return;
+
+            // normalize the velocity vector
+            float invMagnitude = 1.0f / magnitude;
+            movementVector.X *= invMagnitude;
+            movementVector.Y *= invMagnitude;
+
+            // if we change the capsule heading too often, the capsule can fall down
+            // therefore we snap movement vector to just 1 of 4 predefined directions (ne, nw, se, sw),
+            // meaning only 4 possible capsule tilt orientations
+            if (movementVector.X > 0)
+            {
+                // east
+                if (movementVector.Y > 0)
+                {
+                    // northeast
+                    movementVector.X = (float)Math.Sqrt(2.0);
+                    movementVector.Y = (float)Math.Sqrt(2.0);
+                }
+                else
+                {
+                    // southeast
+                    movementVector.X = (float)Math.Sqrt(2.0);
+                    movementVector.Y = -(float)Math.Sqrt(2.0);
+                }
+            }
+            else
+            {
+                // west
+                if (movementVector.Y > 0)
+                {
+                    // northwest
+                    movementVector.X = -(float)Math.Sqrt(2.0);
+                    movementVector.Y = (float)Math.Sqrt(2.0);
+                }
+                else
+                {
+                    // southwest
+                    movementVector.X = -(float)Math.Sqrt(2.0);
+                    movementVector.Y = -(float)Math.Sqrt(2.0);
+                }
+            }
+
+
+            // movementVector.Z is zero
+
+            // calculate tilt components based on desired amount of tilt and current (snapped) heading.
+            // the "-" sign is to force the tilt to be OPPOSITE the direction of movement.
+            float xTiltComponent = -movementVector.X * m_tiltMagnitudeWhenProjectedOnXYPlane;
+            float yTiltComponent = -movementVector.Y * m_tiltMagnitudeWhenProjectedOnXYPlane;
+
+            //m_log.Debug("[PHYSICS] changing avatar tilt");
+            d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, xTiltComponent);
+            d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, xTiltComponent); // must be same as lowstop, else a different, spurious tilt is introduced
+            d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, yTiltComponent);
+            d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, yTiltComponent); // same as lowstop
+            d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, 0f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f); // same as lowstop
+        }
+
         /// <summary>
         /// This creates the Avatar's physical Surrogate at the position supplied
         /// </summary>
@@ -576,71 +641,13 @@ namespace OpenSim.Region.Physics.OdePlugin
                 // (with -0..0 motor stops) falls into the terrain for reasons yet
                 // to be comprehended in their entirety.
                 #endregion
+                AlignAvatarTiltWithCurrentDirectionOfMovement(new PhysicsVector(0,0,0));
                 d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, 0.08f);
                 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -0f);
                 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, 0.08f);
                 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop,  0.08f); // must be same as lowstop, else a different, spurious tilt is introduced
                 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f); // same as lowstop
                 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.08f); // same as lowstop
-                #region Documentation of capsule motor StopERP and StopCFM parameters
-                // In addition to the above tilt, we allow a dynamic tilt, or
-                // wobble, to emerge as the capsule is pushed around the environment.
-                // We do this with an experimentally determined combination of
-                // StopERP and StopCFM which make the above motor stops soft.
-                // The softness of the stops should be tweaked according to two
-                // requirements:
-                //
-                // 1. Motor stops should be weak enough to allow enough wobble such 
-                // that the capsule can tilt slightly more when moving, to allow 
-                // "gliding" over obstacles:
-                //
-                // 
-                //                                        .-.
-                //                                       / /
-                //                                      / /
-                //     _                               / /       _ 
-                //    / \                     .-.     / /       / \
-                //    | | ---->              / /     / /        | |
-                //    | |                   / /     `-'         | |
-                //    | |                  / / +------+         | |
-                //    | |                 / /  |      |         | |
-                //    | |                / /   |      |         | |
-                //    \_/               `-'    +------+         \_/
-                // ----------------------------------------------------------
-                // 
-                // Note that requirement 1 is made complicated by the ever-present
-                // slight avatar tilt (assigned in the above code to prevent avatar
-                // from falling through terrain), which introduces a direction-dependent
-                // bias into the wobble (wobbling against the existing tilt is harder
-                // than wobbling with the tilt), which makes it easier to walk over
-                // prims from some directions. I have tried to minimize this effect by
-                // minimizing the avatar tilt to the minimum that prevents the avatar from
-                // falling through the terrain.
-                // 
-                // 2. Motor stops should be strong enough to prevent the capsule
-                // from being forced all the way to the ground; otherwise the
-                // capsule could slip underneath obstacles like this:
-                //     _                                         _ 
-                //    / \                      +------+         / \
-                //    | | ---->                |      |         | |
-                //    | |                      |      |         | |
-                //    | |             .--.___  +------+         | |
-                //    | |              `--.__`--.__             | |
-                //    | |                    `--.__`--.         | |
-                //    \_/                          `--'         \_/
-                // ----------------------------------------------------------
-                // 
-                //
-                // It is strongly recommended you enable USE_DRAWSTUFF if you want to
-                // tweak these values, to see how the capsule is reacting in various
-                // situations.
-                #endregion
-                d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM, 0.0035f); 
-                d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM2, 0.0035f);
-                d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM3, 0.0035f);
-                d.JointSetAMotorParam(Amotor, (int)dParam.StopERP, 0.8f);
-                d.JointSetAMotorParam(Amotor, (int)dParam.StopERP2, 0.8f);
-                d.JointSetAMotorParam(Amotor, (int)dParam.StopERP3, 0.8f);
             }
 
             // Fudge factor is 1f by default, we're setting it to 0.  We don't want it to Fudge or the
@@ -939,6 +946,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
             PhysicsVector vec = new PhysicsVector();
             d.Vector3 vel = d.BodyGetLinearVel(Body);
+
             float movementdivisor = 1f;
 
             if (!m_alwaysRun)
@@ -1052,6 +1060,10 @@ namespace OpenSim.Region.Physics.OdePlugin
             if (PhysicsVector.isFinite(vec))
             {
                 doForce(vec);
+                if (!_zeroFlag)
+                {
+                  AlignAvatarTiltWithCurrentDirectionOfMovement(new PhysicsVector(vec.X, vec.Y, vec.Z));
+                }
             }
             else
             {
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 673ae39..032b5df 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -82,7 +82,6 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         // private float m_tensor = 5f;
         private int body_autodisable_frames = 20;
-        private IMesh primMesh = null;
 
 
         private const CollisionCategories m_default_collisionFlags = (CollisionCategories.Geom
@@ -814,14 +813,10 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
             }
 
-            IMesh oldMesh = primMesh;
+            float[] vertexList = mesh.getVertexListAsFloatLocked(); // Note, that vertextList is pinned in memory
+            int[] indexList = mesh.getIndexListAsIntLocked(); // Also pinned, needs release after usage
 
-            primMesh = mesh;
-
-            float[] vertexList = primMesh.getVertexListAsFloatLocked(); // Note, that vertextList is pinned in memory
-            int[] indexList = primMesh.getIndexListAsIntLocked(); // Also pinned, needs release after usage
-
-            primMesh.releaseSourceMeshData(); // free up the original mesh data to save memory
+            mesh.releaseSourceMeshData(); // free up the original mesh data to save memory
 
             int VertexCount = vertexList.GetLength(0)/3;
             int IndexCount = indexList.GetLength(0);
@@ -847,12 +842,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                 return;
             }
 
-            if (oldMesh != null)
-            {
-                oldMesh.releasePinned();
-                oldMesh = null;
-            }
-
            // if (IsPhysical && Body == (IntPtr) 0)
            // {
                 // Recreate the body
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
index d9f4951..c8ae229 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
@@ -228,7 +228,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                         mono [0x81d28b6]
                         mono [0x81ea2c6]
                         /lib/i686/cmov/libpthread.so.0 [0xb7e744c0]
-                        /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]             
+                        /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]
              */
 
             // Exclude heightfield geom
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 94223d8..0769c90 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2536,7 +2536,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
             if (iPropertiesNotSupportedDefault == 0)
             {
-#if SPAM              
+#if SPAM
                 m_log.Warn("NonMesh");
 #endif
                 return false;
@@ -3334,7 +3334,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             // this._heightmap[i] = (double)heightMap[i];
             // dbm (danx0r) -- creating a buffer zone of one extra sample all around
-            //_origheightmap = heightMap;    
+            //_origheightmap = heightMap;
            
             float[] _heightmap;
 
@@ -3520,16 +3520,16 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                                 d.GeomDestroy(g);
                                 //removingHeightField = new float[0];
-                            }                            
+                            }
                         }
                     }
                     else
                     {
                         m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine.  Region has inconsistant data.");
                     }
-                }                
+                }
             }
-        }       
+        }
 
         public override void SetWaterLevel(float baseheight)
         {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
index 569009e..0feb967 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
@@ -225,7 +225,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                 // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened
                 m_log.ErrorFormat(
                     "[{0}]: Event queue thread terminating with exception.  PLEASE REBOOT YOUR SIM - SCRIPT EVENTS WILL NOT WORK UNTIL YOU DO.  Exception is {1}", 
-                    ScriptEngineName, e);                
+                    ScriptEngineName, e);
             }
         }
 
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 8ad916c..3c91b29 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
         {
             InstanceData id = m_ScriptManager.GetScript(localID, itemID);
             if (id == null)
-                return;        
+                return;
 
             if (!id.Disabled)
                 id.Running = true;
@@ -428,7 +428,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
         {
             InstanceData id = m_ScriptManager.GetScript(localID, itemID);
             if (id == null)
-                return;        
+                return;
             
             id.Running = false;
         }
@@ -442,7 +442,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 
             InstanceData id = m_ScriptManager.GetScript(localID, itemID);
             if (id == null)
-                return;        
+                return;
 
             IEventQueue eq = World.RequestModuleInterface<IEventQueue>();
             if (eq == null)
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 9c1cd4d..6ac209e 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -520,13 +520,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                 ExeStage = 5;           //        ;^) Ewe Loon, for debuging
             }
             catch (Exception e)         //        ;^) Ewe Loon, From here down tis fix
-            {                          
+            {
                 if ((ExeStage == 3)&&(qParams.Length>0))
                     detparms.Remove(id);
                 SceneObjectPart ob = m_scriptEngine.World.GetSceneObjectPart(localID);
                 m_log.InfoFormat("[Script Error] ,{0},{1},@{2},{3},{4},{5}", ob.Name , FunctionName, ExeStage, e.Message, qParams.Length, detparms.Count);
                 if (ExeStage != 2) throw e;
-            }            
+            }
         }
 
         public uint GetLocalID(UUID itemID)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ba42678..0bd6546 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.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;
 using System.Collections.Generic;
@@ -50,6 +50,9 @@ using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
+using OpenSim.Services.Interfaces;
+
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 using AssetLandmark = OpenSim.Framework.AssetLandmark;
 
@@ -4996,6 +4999,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (end > src.Length)
                 end = src.Length;
 
+            if (stride == 0)
+                stride = 1;
+
             //  There may be one or two ranges to be considered
 
             if (start != end)
@@ -5022,9 +5028,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 //  A negative stride reverses the direction of the
                 //  scan producing an inverted list as a result.
 
-                if (stride == 0)
-                    stride = 1;
-
                 if (stride > 0)
                 {
                     for (int i = 0; i < src.Length; i += stride)
@@ -5048,7 +5051,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                result.Add(src.Data[start]);
+                if (start%stride == 0)
+                {
+                    result.Add(src.Data[start]);
+                }
             }
 
             return result;
@@ -5226,12 +5232,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
-            List<SimpleRegionInfo> neighbors = World.CommsManager.GridService.RequestNeighbours(World.RegionInfo.RegionLocX, World.RegionInfo.RegionLocY);
+            List<GridRegion> neighbors = World.GridService.GetNeighbours(World.RegionInfo.ScopeID, World.RegionInfo.RegionID);
 
             uint neighborX = World.RegionInfo.RegionLocX + (uint)dir.x;
             uint neighborY = World.RegionInfo.RegionLocY + (uint)dir.y;
 
-            foreach (SimpleRegionInfo sri in neighbors)
+            foreach (GridRegion sri in neighbors)
             {
                 if (sri.RegionLocX == neighborX && sri.RegionLocY == neighborY)
                     return 0;
@@ -6321,9 +6327,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, UUID.Zero);
                 IXmlRpcRouter xmlRpcRouter = m_ScriptEngine.World.RequestModuleInterface<IXmlRpcRouter>();
                 if (xmlRpcRouter != null)
+                {
+                    string ExternalHostName = m_ScriptEngine.World.RegionInfo.ExternalHostName;
+                    
                     xmlRpcRouter.RegisterNewReceiver(m_ScriptEngine.ScriptModule, channelID, m_host.UUID, 
-                                                     m_itemID, String.Format("http://{0}:{1}/", System.Environment.MachineName, 
+                                                     m_itemID, String.Format("http://{0}:{1}/", ExternalHostName, 
                                                                              xmlrpcMod.Port.ToString()));
+                }
                 object[] resobj = new object[] 
                     { 
                         new LSL_Integer(1), 
@@ -7834,8 +7844,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String llGetHTTPHeader(LSL_Key request_id, string header)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGetHTTPHeader");
-            return String.Empty;
+             
+           if (m_UrlModule != null)
+               return m_UrlModule.GetHttpHeader(new UUID(request_id), header);
+           return String.Empty;
         }
 
 
@@ -8175,7 +8187,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 string reply = String.Empty;
 
-                RegionInfo info = m_ScriptEngine.World.RequestClosestRegion(simulator);
+                GridRegion info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator);
 
                 switch (data)
                 {
@@ -8202,7 +8214,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             ConditionalScriptSleep(1000);
                             return UUID.Zero.ToString();
                         }
-                        int access = info.RegionSettings.Maturity;
+                        int access = info.Maturity;
                         if (access == 0)
                             reply = "PG";
                         else if (access == 1)
@@ -9113,13 +9125,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         }
 
 
-        public void llHTTPResponse(string url, int status, string body)
+        public void llHTTPResponse(LSL_Key id, int status, string body)
         {
             // Partial implementation: support for parameter flags needed
             //   see http://wiki.secondlife.com/wiki/llHTTPResponse
 
             m_host.AddScriptLPS(1);
-            NotImplemented("llHTTPResponse");
+
+            if (m_UrlModule != null)
+                m_UrlModule.HttpResponse(new UUID(id), status,body);
         }
 
         public void llResetLandBanList()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 726b37a..0b95abc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -48,6 +48,8 @@ using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using System.Text.RegularExpressions;
 
 using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
@@ -599,17 +601,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         if (regionName.Contains(".") && regionName.Contains(":"))
                         {
                             // Try to link the region
-                            RegionInfo regInfo = HGHyperlink.TryLinkRegion(World,
-                                                               presence.ControllingClient,
-                                                               regionName);
-                            // Get the region name
-                            if (regInfo != null)
+                            IHyperlinkService hyperService = World.RequestModuleInterface<IHyperlinkService>();
+                            if (hyperService != null)
                             {
-                                regionName = regInfo.RegionName;
-                            }
-                            else
-                            {
-                                // Might need to ping the client here in case of failure??
+                                GridRegion regInfo = hyperService.TryLinkRegion(presence.ControllingClient,
+                                                                                regionName);
+                                // Get the region name
+                                if (regInfo != null)
+                                {
+                                    regionName = regInfo.RegionName;
+                                }
+                                else
+                                {
+                                    // Might need to ping the client here in case of failure??
+                                }
                             }
                         }
                         presence.ControllingClient.SendTeleportLocationStart();
@@ -1164,6 +1169,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             land.SetMediaUrl(url);
         }
+        
+        public void osSetParcelSIPAddress(string SIPAddress)
+        {
+            // What actually is the difference to the LL function?
+            //
+            CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelMediaURL");
+
+            m_host.AddScriptLPS(1);
+            
+
+            ILandObject land
+                = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
+
+            if (land.landData.OwnerID != m_host.ObjectOwner)
+            {
+                OSSLError("osSetParcelSIPAddress: Sorry, you need to own the land to use this function");
+                return;
+            }
+            
+            // get the voice module
+            IVoiceModule voiceModule = World.RequestModuleInterface<IVoiceModule>();
+            
+            if (voiceModule != null) 
+                voiceModule.setLandSIPAddress(SIPAddress,land.landData.GlobalID);
+            else
+                OSSLError("osSetParcelSIPAddress: No voice module enabled for this land");
+            
+            
+        }
 
         public string osGetScriptEngineName()
         {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 41358e5..a74e8da 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llGroundRepel(double height, int water, double tau);
         LSL_Vector llGroundSlope(LSL_Vector offset);
         LSL_String llHTTPRequest(string url, LSL_List parameters, string body);
-              void llHTTPResponse(string url, int status, string body);
+              void llHTTPResponse(LSL_Key id, int status, string body);
         LSL_String llInsertString(string dst, int position, string src);
               void llInstantMessage(string user, string message);
         LSL_String llIntegerToBase64(int number);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 49aa45a..d8d3c31 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -75,6 +75,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         bool osConsoleCommand(string Command);
         void osSetParcelMediaURL(string url);
         void osSetPrimFloatOnWater(int floatYN);
+        void osSetParcelSIPAddress(string SIPAddress);
 
         // Avatar Info Commands
         string osGetAgentIP(string agent);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 02ae281..a28e97b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -864,9 +864,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llHTTPRequest(url, parameters, body);
         }
 
-        public void llHTTPResponse(string url, int status, string body)
+        public void llHTTPResponse(LSL_Key id, int status, string body)
         {
-            m_LSL_Functions.llHTTPResponse(url, status, body);
+            m_LSL_Functions.llHTTPResponse(id, status, body);
         }
 
         public LSL_String llInsertString(string dst, int position, string src)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 8f52d99..8dcb1f5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osWindActiveModelPluginName();
         }
        
-// Not yet plugged in as available OSSL functions, so commented out        
+// Not yet plugged in as available OSSL functions, so commented out
 //        void osWindParamSet(string plugin, string param, float value)
 //        {
 //            m_OSSL_Functions.osWindParamSet(plugin, param, value);
@@ -183,6 +183,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             m_OSSL_Functions.osSetParcelMediaURL(url);
         }
+        
+        public void osSetParcelSIPAddress(string SIPAddress)
+        {
+            m_OSSL_Functions.osSetParcelSIPAddress(SIPAddress);
+        }
 
         public void osSetPrimFloatOnWater(int floatYN)
         {
@@ -324,7 +329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         
         public string osGetSimulatorVersion()
         {
-           return m_OSSL_Functions.osGetSimulatorVersion();    
+           return m_OSSL_Functions.osGetSimulatorVersion();
         }
         
         public Hashtable osParseJSON(string JSON)
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index cb5664b..fe26429 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -542,23 +542,50 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     break;
                 case enumCompileType.cs:
                 case enumCompileType.lsl:
-                    lock (CScodeProvider)
+                    bool complete = false;
+                    bool retried  = false;
+                    do
                     {
-                        results = CScodeProvider.CompileAssemblyFromSource(
+                        lock (CScodeProvider)
+                        {
+                            results = CScodeProvider.CompileAssemblyFromSource(
                                 parameters, Script);
-                    }
+                        }
+                        // Deal with an occasional segv in the compiler.
+                        // Rarely, if ever, occurs twice in succession.
+                        // Line # == 0 and no file name are indications that
+                        // this is a native stack trace rather than a normal
+                        // error log.
+                        if (results.Errors.Count > 0)
+                        {
+                            if (!retried && (results.Errors[0].FileName == null || results.Errors[0].FileName == String.Empty) &&
+                                results.Errors[0].Line == 0)
+                            {
+                                // System.Console.WriteLine("retrying failed compilation");
+                                retried = true;
+                            }
+                            else
+                            {
+                                complete = true;
+                            }
+                        }
+                        else
+                        {
+                            complete = true;
+                        }
+                    } while (!complete);
                     break;
                 case enumCompileType.js:
                     results = JScodeProvider.CompileAssemblyFromSource(
-                            parameters, Script);
+                        parameters, Script);
                     break;
                 case enumCompileType.yp:
                     results = YPcodeProvider.CompileAssemblyFromSource(
-                            parameters, Script);
+                        parameters, Script);
                     break;
                 default:
                     throw new Exception("Compiler is not able to recongnize "+
-                            "language type \"" + lang.ToString() + "\"");
+                                        "language type \"" + lang.ToString() + "\"");
             }
 
             // Check result
@@ -567,56 +594,62 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             //
             // WARNINGS AND ERRORS
             //
-            int display = 5;
+            bool hadErrors = false;
+            string errtext = String.Empty;
+
             if (results.Errors.Count > 0)
             {
-                string errtext = String.Empty;
                 foreach (CompilerError CompErr in results.Errors)
                 {
-                    // Show 5 errors max
-                    //
-                    if (display <= 0)
-                        break;
-                    display--;
-
-                    string severity = "Error";
-                    if (CompErr.IsWarning)
-                    {
-                        severity = "Warning";
-                    }
+                    string severity = CompErr.IsWarning ? "Warning" : "Error";
 
                     KeyValuePair<int, int> lslPos;
 
-                    lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
+                    // Show 5 errors max, but check entire list for errors
 
-                    string text = CompErr.ErrorText;
+                    if (severity == "Error")
+                    {
+                        lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
+                        string text = CompErr.ErrorText;
+
+                        // Use LSL type names
+                        if (lang == enumCompileType.lsl)
+                            text = ReplaceTypes(CompErr.ErrorText);
+
+                        // The Second Life viewer's script editor begins
+                        // countingn lines and columns at 0, so we subtract 1.
+                        errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
+                                lslPos.Key - 1, lslPos.Value - 1,
+                                CompErr.ErrorNumber, text, severity);
+                        hadErrors = true;
+                    }
+                }
+            }
+
+            if (hadErrors)
+            {
+                throw new Exception(errtext);
+            }
 
-                    // Use LSL type names
-                    if (lang == enumCompileType.lsl)
-                        text = ReplaceTypes(CompErr.ErrorText);
+            //  On today's highly asynchronous systems, the result of
+            //  the compile may not be immediately apparent. Wait a 
+            //  reasonable amount of time before giving up on it.
 
-                    // The Second Life viewer's script editor begins
-                    // countingn lines and columns at 0, so we subtract 1.
-                    errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
-                            lslPos.Key - 1, lslPos.Value - 1,
-                            CompErr.ErrorNumber, text, severity);
+            if (!File.Exists(OutFile))
+            {
+                for (int i=0; i<20 && !File.Exists(OutFile); i++)
+                {
+                    System.Threading.Thread.Sleep(250);
                 }
-                
+                // One final chance...
                 if (!File.Exists(OutFile))
                 {
+                    errtext = String.Empty;
+                    errtext += "No compile error. But not able to locate compiled file.";
                     throw new Exception(errtext);
                 }
             }
 
-            //
-            // NO ERRORS, BUT NO COMPILED FILE
-            //
-            if (!File.Exists(OutFile))
-            {
-                string errtext = String.Empty;
-                errtext += "No compile error. But not able to locate compiled file.";
-                throw new Exception(errtext);
-            }
 //            m_log.DebugFormat("[Compiler] Compiled new assembly "+
 //                    "for {0}", asset);
 
@@ -629,7 +662,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
             if (fi == null)
             {
-                string errtext = String.Empty;
+                errtext = String.Empty;
                 errtext += "No compile error. But not able to stat file.";
                 throw new Exception(errtext);
             }
@@ -644,7 +677,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             }
             catch (Exception)
             {
-                string errtext = String.Empty;
+                errtext = String.Empty;
                 errtext += "No compile error. But not able to open file.";
                 throw new Exception(errtext);
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 650d9fa..97166cf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     "SecondLife.Script");
 
                 //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
-                RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);                
+                RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
 //                lease.Register(this);
             }
             catch (Exception)
@@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
                     permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
                     permsMask = part.TaskInventory[m_ItemID].PermsMask;
-                }                                        
+                }
 
                 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
                 {
@@ -630,7 +630,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         /// <summary>
         /// Process the next event queued for this script
         /// </summary>
-        /// <returns></returns>        
+        /// <returns></returns>
         public object EventProcessor()
         {
             lock (m_Script)
@@ -925,7 +925,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         
         public override string ToString()
         {
-            return String.Format("{0} {1} on {2}", m_ScriptName, m_ItemID, m_PrimName);   
+            return String.Format("{0} {1} on {2}", m_ScriptName, m_ItemID, m_PrimName);
         }
 
         string FormatException(Exception e)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 9a972c2..e695133 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -554,7 +554,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             // We must look for the part outside the m_Scripts lock because GetSceneObjectPart later triggers the
             // m_parts lock on SOG.  At the same time, a scene object that is being deleted will take the m_parts lock
-            // and then later on try to take the m_scripts lock in this class when it calls OnRemoveScript()            
+            // and then later on try to take the m_scripts lock in this class when it calls OnRemoveScript()
             SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
             if (part == null)
             {
@@ -562,7 +562,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n";
                 m_ScriptFailCount++;
                 return false;
-            }     
+            }
 
             TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
             if (item == null)
@@ -692,7 +692,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                 AppDomain.CreateDomain(
                                     m_Scene.RegionInfo.RegionID.ToString(),
                                     evidence, appSetup);
-/*                            
+/*
                             PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
                             AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
                             PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
@@ -925,7 +925,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             return new XWorkItem(m_ThreadPool.QueueWorkItem(
                                      new WorkItemCallback(this.ProcessEventHandler),
                                      parms));
-        }     
+        }
         
         /// <summary>
         /// Process a previously posted script event.
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 519668a..a03cc4c 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.UserStatistics
             try
             {
                 cnfg = config.Configs["WebStats"];
-                enabled = cnfg.GetBoolean("enabled", false);                              
+                enabled = cnfg.GetBoolean("enabled", false);
             } 
             catch (Exception)
             {
@@ -137,7 +137,7 @@ namespace OpenSim.Region.UserStatistics
 
                 m_simstatsCounters.Add(scene.RegionInfo.RegionID, new USimStatsData(scene.RegionInfo.RegionID));
                 scene.StatsReporter.OnSendStatsResult += ReceiveClassicSimStatsPacket;
-            }            
+            }
         }
 
         public void ReceiveClassicSimStatsPacket(SimStats stats)
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
index 2db9661..3d2d9d2 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
@@ -179,7 +179,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Compilers
                 }
             }
 
-            // TODO: Process errors         
+            // TODO: Process errors
             return OutFile;
         }
 
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
index 3259686..afa2300 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
@@ -36,7 +36,7 @@ using OpenSim.ScriptEngine.Shared;
 namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
 {
     public class BaseClassFactory
-    {        
+    {
 
 
         public static void MakeBaseClass(ScriptStructure script)
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs
index f3b1496..3c20f20 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs
@@ -115,7 +115,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
             script.AppDomain = FreeAppDomain.CurrentAppDomain;
 
             // Create instance of script
-            ScriptAssemblies.IScript mbrt = (ScriptAssemblies.IScript)               
+            ScriptAssemblies.IScript mbrt = (ScriptAssemblies.IScript)
                 FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap(
                                script.AssemblyFileName, "ScriptAssemblies.Script");
             //, true, BindingFlags.CreateInstance, null);
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 791e1ef..ed0210f 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Reflection;
 using OpenSim.Framework;
@@ -40,17 +41,40 @@ namespace OpenSim.Server.Base
     {
         // Logger
         //
-        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 
+        private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 
 
         // The http server instance
         //
         protected BaseHttpServer m_HttpServer = null;
+        protected uint m_Port = 0;
+        protected Dictionary<uint, BaseHttpServer> m_Servers =
+            new Dictionary<uint, BaseHttpServer>();
 
         public IHttpServer HttpServer
         {
             get { return m_HttpServer; }
         }
 
+        public uint DefaultPort
+        {
+            get { return m_Port; }
+        }
+
+        public IHttpServer GetHttpServer(uint port)
+        {
+            m_Log.InfoFormat("[SERVER]: Requested port {0}", port);
+            if (port == m_Port)
+                return HttpServer;
+
+            if (m_Servers.ContainsKey(port))
+                return m_Servers[port];
+
+            m_Servers[port] = new BaseHttpServer(port);
+            m_Servers[port].Start();
+
+            return m_Servers[port];
+        }
+
         // Handle all the automagical stuff
         //
         public HttpServerBase(string prompt, string[] args) : base(prompt, args)
@@ -74,6 +98,8 @@ namespace OpenSim.Server.Base
                 Thread.CurrentThread.Abort();
             }
 
+            m_Port = port;
+
             m_HttpServer = new BaseHttpServer(port);
 
             MainServer.Instance = m_HttpServer;
diff --git a/OpenSim/Server/Base/ProtocolVersions.cs b/OpenSim/Server/Base/ProtocolVersions.cs
new file mode 100644
index 0000000..8db5bb6
--- /dev/null
+++ b/OpenSim/Server/Base/ProtocolVersions.cs
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OpenSim.Server.Base
+{
+    public class ProtocolVersions
+    {
+        /// <value>
+        /// This is the external protocol versions.  It is separate from the OpenSimulator project version.
+        /// 
+        /// These version numbers should be increased by 1 every time a code
+        /// change in the Service.Connectors and Server.Handlers, espectively, 
+        /// makes the previous OpenSimulator revision incompatible
+        /// with the new revision. 
+        /// 
+        /// Changes which are compatible with an older revision (e.g. older revisions experience degraded functionality
+        /// but not outright failure) do not need a version number increment.
+        /// 
+        /// Having this version number allows the grid service to reject connections from regions running a version
+        /// of the code that is too old. 
+        ///
+        /// </value>
+        
+        // The range of acceptable servers for client-side connectors
+        public readonly static int ClientProtocolVersionMin = 0;
+        public readonly static int ClientProtocolVersionMax = 0;
+
+        // The range of acceptable clients in server-side handlers
+        public readonly static int ServerProtocolVersionMin = 0;
+        public readonly static int ServerProtocolVersionMax = 0;
+    }
+}
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 0a36bbe..9beadd8 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -141,7 +141,9 @@ namespace OpenSim.Server.Base
                             }
                             catch (Exception e)
                             {
-                                m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
+                                if (!(e is System.MissingMethodException))
+                                    m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
+                                return null;
                             }
 
                             return plug;
@@ -183,5 +185,121 @@ namespace OpenSim.Server.Base
 
             return result;
         }
+
+        public static string BuildQueryString(Dictionary<string, string> data)
+        {
+            string qstring = String.Empty;
+
+            foreach (KeyValuePair<string, string> kvp in data)
+            {
+                string part;
+                if (kvp.Value != String.Empty)
+                {
+                    part = System.Web.HttpUtility.UrlEncode(kvp.Key) +
+                            "=" + System.Web.HttpUtility.UrlEncode(kvp.Value);
+                }
+                else
+                {
+                    part = System.Web.HttpUtility.UrlEncode(kvp.Key);
+                }
+
+                if (qstring != String.Empty)
+                    qstring += "&";
+
+                qstring += part;
+            }
+
+            return qstring;
+        }
+
+        public static string BuildXmlResponse(Dictionary<string, object> data)
+        {
+            XmlDocument doc = new XmlDocument();
+
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+
+            doc.AppendChild(xmlnode);
+
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+
+            doc.AppendChild(rootElement);
+
+            BuildXmlData(rootElement, data);
+
+            return doc.InnerXml;
+        }
+
+        private static void BuildXmlData(XmlElement parent, Dictionary<string, object> data)
+        {
+            foreach (KeyValuePair<string, object> kvp in data)
+            {
+                XmlElement elem = parent.OwnerDocument.CreateElement("",
+                        kvp.Key, "");
+
+                if (kvp.Value is Dictionary<string, object>)
+                {
+                    XmlAttribute type = parent.OwnerDocument.CreateAttribute("",
+                        "type", "");
+                    type.Value = "List";
+
+                    elem.Attributes.Append(type);
+
+                    BuildXmlData(elem, (Dictionary<string, object>)kvp.Value);
+                }
+                else
+                {
+                    elem.AppendChild(parent.OwnerDocument.CreateTextNode(
+                            kvp.Value.ToString()));
+                }
+
+                parent.AppendChild(elem);
+            }
+        }
+
+        public static Dictionary<string, object> ParseXmlResponse(string data)
+        {
+            //m_log.DebugFormat("[XXX]: received xml string: {0}", data);
+
+            Dictionary<string, object> ret = new Dictionary<string, object>();
+
+            XmlDocument doc = new XmlDocument();
+
+            doc.LoadXml(data);
+            
+            XmlNodeList rootL = doc.GetElementsByTagName("ServerResponse");
+
+            if (rootL.Count != 1)
+                return ret;
+
+            XmlNode rootNode = rootL[0];
+
+            ret = ParseElement(rootNode);
+
+            return ret;
+        }
+
+        private static Dictionary<string, object> ParseElement(XmlNode element)
+        {
+            Dictionary<string, object> ret = new Dictionary<string, object>();
+
+            XmlNodeList partL = element.ChildNodes;
+
+            foreach (XmlNode part in partL)
+            {
+                XmlNode type = part.Attributes.GetNamedItem("type");
+                if (type == null || type.Value != "List")
+                {
+                    ret[part.Name] = part.InnerText;
+                }
+                else
+                {
+                    ret[part.Name] = ParseElement(part);
+                }
+            }
+
+            return ret;
+        }
     }
 }
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index 7c74e05..f7eb292 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -37,13 +37,17 @@ namespace OpenSim.Server.Handlers.Asset
     public class AssetServiceConnector : ServiceConnector
     {
         private IAssetService m_AssetService;
+        private string m_ConfigName = "AssetService";
 
-        public AssetServiceConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public AssetServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["AssetService"];
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string assetService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
@@ -55,7 +59,6 @@ namespace OpenSim.Server.Handlers.Asset
             m_AssetService =
                     ServerUtils.LoadPlugin<IAssetService>(assetService, args);
 
-            //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no"));
             server.AddStreamHandler(new AssetServerGetHandler(m_AssetService));
             server.AddStreamHandler(new AssetServerPostHandler(m_AssetService));
             server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService));
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
index 589dc3b..2abef0a 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
@@ -37,13 +37,17 @@ namespace OpenSim.Server.Handlers.Authentication
     public class AuthenticationServiceConnector : ServiceConnector
     {
         private IAuthenticationService m_AuthenticationService;
+        private string m_ConfigName = "AuthenticationService";
 
-        public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public AuthenticationServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["AuthenticationService"];
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string authenticationService = serverConfig.GetString("AuthenticationServiceModule",
                     String.Empty);
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
index 6cf7d56..490a13a 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Server.Handlers.Authentication
 
             doc.AppendChild(xmlnode);
 
-            XmlElement rootElement = doc.CreateElement("", "Authentication",
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
                     "");
 
             doc.AppendChild(rootElement);
@@ -179,7 +179,7 @@ namespace OpenSim.Server.Handlers.Authentication
 
             doc.AppendChild(xmlnode);
 
-            XmlElement rootElement = doc.CreateElement("", "Authentication",
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
                     "");
 
             doc.AppendChild(rootElement);
@@ -201,7 +201,7 @@ namespace OpenSim.Server.Handlers.Authentication
 
             doc.AppendChild(xmlnode);
 
-            XmlElement rootElement = doc.CreateElement("", "Authentication",
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
                     "");
 
             doc.AppendChild(rootElement);
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
index 0d9f239..20fd0f7 100644
--- a/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
@@ -37,13 +37,16 @@ namespace OpenSim.Server.Handlers.Authorization
     public class AuthorizationServerConnector : ServiceConnector
     {
         private IAuthorizationService m_AuthorizationService;
+        private string m_ConfigName = "AuthorizationService";
 
-        public AuthorizationServerConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public AuthorizationServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["AuthorizationService"];
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string authorizationService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
index 69acd25..f987de4 100644
--- a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Server.Handlers.Authorization
 {
     public class AuthorizationServerPostHandler : BaseStreamHandler
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IAuthorizationService m_AuthorizationService;
 
diff --git a/OpenSim/Server/Handlers/Base/ServerConnector.cs b/OpenSim/Server/Handlers/Base/ServerConnector.cs
index 62fe773..71876da 100644
--- a/OpenSim/Server/Handlers/Base/ServerConnector.cs
+++ b/OpenSim/Server/Handlers/Base/ServerConnector.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Server.Handlers.Base
 
     public class ServiceConnector : IServiceConnector
     {
-        public ServiceConnector(IConfigSource config, IHttpServer server)
+        public ServiceConnector(IConfigSource config, IHttpServer server, string configName)
         {
         }
     }
diff --git a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
index a4ab0d3..07bafc8 100644
--- a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
+++ b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
@@ -37,19 +37,23 @@ namespace OpenSim.Server.Handlers.Freeswitch
     public class FreeswitchServerConnector : ServiceConnector
     {
         private IFreeswitchService m_FreeswitchService;
+        private string m_ConfigName = "FreeswitchService";
 
-        public FreeswitchServerConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public FreeswitchServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["FreeswitchService"];
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string freeswitchService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
 
             if (freeswitchService == String.Empty)
-                throw new Exception("No FreeswitchService in config file");
+                throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
             m_FreeswitchService =
diff --git a/OpenSim/Services/Grid/GridService.cs b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
index 47710d8..14daf12 100644
--- a/OpenSim/Services/Grid/GridService.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
@@ -25,55 +25,37 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
-using OpenMetaverse;
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
 
-namespace OpenSim.Services.Interfaces
+namespace OpenSim.Server.Handlers.Grid
 {
-    public class GridService : IGridService
+    public class GridServiceConnector : ServiceConnector
     {
-        bool RegisterRegion(UUID scopeID, RegionInfo regionInfos);
-        {
-            return false;
-        }
-
-        bool DeregisterRegion(UUID regionID);   
-        {
-            return false;
-        }
-
-        List<SimpleRegionInfo> RequestNeighbours(UUID scopeID, uint x, uint y)
-        {
-            return new List<SimpleRegionInfo>()
-        }
+        private IGridService m_GridService;
+        private string m_ConfigName = "GridService";
 
-        RegionInfo RequestNeighbourInfo(UUID regionID)
+        public GridServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            return null;
-        }
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
 
-        RegionInfo RequestClosestRegion(UUID scopeID, string regionName)
-        {
-            return null;
-        }
+            string gridService = serverConfig.GetString("LocalServiceModule",
+                    String.Empty);
 
-        List<MapBlockData> RequestNeighbourMapBlocks(UUID scopeID, int minX,
-                int minY, int maxX, int maxY)
-        {
-            return new List<MapBlockData>();
-        }
+            if (gridService == String.Empty)
+                throw new Exception("No LocalServiceModule in config file");
 
-        LandData RequestLandData(UUID scopeID, ulong regionHandle,
-                uint x, uint y)
-        {
-            return null;
-        }
+            Object[] args = new Object[] { config };
+            m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
 
-        List<RegionInfo> RequestNamedRegions(UUID scopeID, string name,
-                int maxNumber)
-        {
-            return new List<RegionInfo>();
+            server.AddStreamHandler(new GridServerPostHandler(m_GridService));
         }
     }
 }
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
new file mode 100644
index 0000000..e22328d
--- /dev/null
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -0,0 +1,451 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 Nini.Config;
+using log4net;
+using System;
+using System.Reflection;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+using System.Xml.Serialization;
+using System.Collections.Generic;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse;
+
+namespace OpenSim.Server.Handlers.Grid
+{
+    public class GridServerPostHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IGridService m_GridService;
+
+        public GridServerPostHandler(IGridService service) :
+                base("POST", "/grid")
+        {
+            m_GridService = service;
+        }
+
+        public override byte[] Handle(string path, Stream requestData,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            StreamReader sr = new StreamReader(requestData);
+            string body = sr.ReadToEnd();
+            sr.Close();
+            body = body.Trim();
+
+            //m_log.DebugFormat("[XXX]: query String: {0}", body);
+
+            Dictionary<string, string> request =
+                    ServerUtils.ParseQueryString(body);
+
+            if (!request.ContainsKey("METHOD"))
+                return FailureResult();
+
+            string method = request["METHOD"];
+
+            switch (method)
+            {
+                case "register":
+                    return Register(request);
+
+                case "deregister":
+                    return Deregister(request);
+
+                case "get_neighbours":
+                    return GetNeighbours(request);
+
+                case "get_region_by_uuid":
+                    return GetRegionByUUID(request);
+
+                case "get_region_by_position":
+                    return GetRegionByPosition(request);
+
+                case "get_region_by_name":
+                    return GetRegionByName(request);
+
+                case "get_regions_by_name":
+                    return GetRegionsByName(request);
+
+                case "get_region_range":
+                    return GetRegionRange(request);
+
+            }
+
+            m_log.DebugFormat("[GRID HANDLER]: unknown method {0} request {1}", method.Length, method);
+            return FailureResult();
+
+        }
+
+        #region Method-specific handlers
+
+        byte[] Register(Dictionary<string, string> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request["SCOPEID"] != null)
+                UUID.TryParse(request["SCOPEID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to register region");
+
+            int versionNumberMin = 0, versionNumberMax = 0;
+            if (request.ContainsKey("VERSIONMIN"))
+                Int32.TryParse(request["VERSIONMIN"], out versionNumberMin);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no minimum protocol version in request to register region");
+
+            if (request.ContainsKey("VERSIONMAX"))
+                Int32.TryParse(request["VERSIONMAX"], out versionNumberMax);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no maximum protocol version in request to register region");
+
+            // Check the protocol version
+            if ((versionNumberMin > ProtocolVersions.ServerProtocolVersionMax && versionNumberMax < ProtocolVersions.ServerProtocolVersionMax))
+            {
+                // Can't do, there is no overlap in the acceptable ranges
+                return FailureResult();
+            }
+
+            Dictionary<string, object> rinfoData = new Dictionary<string, object>();
+            foreach (KeyValuePair<string, string> kvp in request)
+                rinfoData[kvp.Key] = kvp.Value;
+            GridRegion rinfo = new GridRegion(rinfoData);
+
+            bool result = m_GridService.RegisterRegion(scopeID, rinfo);
+
+            if (result)
+                return SuccessResult();
+            else
+                return FailureResult();
+        }
+
+        byte[] Deregister(Dictionary<string, string> request)
+        {
+            UUID regionID = UUID.Zero;
+            if (request["REGIONID"] != null)
+                UUID.TryParse(request["REGIONID"], out regionID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no regionID in request to deregister region");
+
+            bool result = m_GridService.DeregisterRegion(regionID);
+
+            if (result)
+                return SuccessResult();
+            else
+                return FailureResult();
+
+        }
+
+        byte[] GetNeighbours(Dictionary<string, string> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request["SCOPEID"] != null)
+                UUID.TryParse(request["SCOPEID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get neighbours");
+
+            UUID regionID = UUID.Zero;
+            if (request["REGIONID"] != null)
+                UUID.TryParse(request["REGIONID"], out regionID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours");
+
+            List<GridRegion> rinfos = m_GridService.GetNeighbours(scopeID, regionID);
+            //m_log.DebugFormat("[GRID HANDLER]: neighbours for region {0}: {1}", regionID, rinfos.Count);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((rinfos == null) || ((rinfos != null) && (rinfos.Count == 0)))
+                result["result"] = "null";
+            else
+            {
+                int i = 0;
+                foreach (GridRegion rinfo in rinfos)
+                {
+                    Dictionary<string, object> rinfoDict = rinfo.ToKeyValuePairs();
+                    result["region" + i] = rinfoDict;
+                    i++;
+                }
+            }
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+
+        }
+
+        byte[] GetRegionByUUID(Dictionary<string, string> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request["SCOPEID"] != null)
+                UUID.TryParse(request["SCOPEID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get neighbours");
+
+            UUID regionID = UUID.Zero;
+            if (request["REGIONID"] != null)
+                UUID.TryParse(request["REGIONID"], out regionID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours");
+
+            GridRegion rinfo = m_GridService.GetRegionByUUID(scopeID, regionID);
+            //m_log.DebugFormat("[GRID HANDLER]: neighbours for region {0}: {1}", regionID, rinfos.Count);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if (rinfo == null)
+                result["result"] = "null";
+            else
+                result["result"] = rinfo.ToKeyValuePairs();
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
+        byte[] GetRegionByPosition(Dictionary<string, string> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request["SCOPEID"] != null)
+                UUID.TryParse(request["SCOPEID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region by position");
+
+            int x = 0, y = 0;
+            if (request["X"] != null)
+                Int32.TryParse(request["X"], out x);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no X in request to get region by position");
+            if (request["Y"] != null)
+                Int32.TryParse(request["Y"], out y);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no Y in request to get region by position");
+
+            GridRegion rinfo = m_GridService.GetRegionByPosition(scopeID, x, y);
+            //m_log.DebugFormat("[GRID HANDLER]: neighbours for region {0}: {1}", regionID, rinfos.Count);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if (rinfo == null)
+                result["result"] = "null";
+            else
+                result["result"] = rinfo.ToKeyValuePairs();
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
+        byte[] GetRegionByName(Dictionary<string, string> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request["SCOPEID"] != null)
+                UUID.TryParse(request["SCOPEID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region by name");
+
+            string regionName = string.Empty;
+            if (request["NAME"] != null)
+                regionName = request["NAME"];
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no name in request to get region by name");
+
+            GridRegion rinfo = m_GridService.GetRegionByName(scopeID, regionName);
+            //m_log.DebugFormat("[GRID HANDLER]: neighbours for region {0}: {1}", regionID, rinfos.Count);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if (rinfo == null)
+                result["result"] = "null";
+            else
+                result["result"] = rinfo.ToKeyValuePairs();
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
+        byte[] GetRegionsByName(Dictionary<string, string> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request["SCOPEID"] != null)
+                UUID.TryParse(request["SCOPEID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get regions by name");
+
+            string regionName = string.Empty;
+            if (request["NAME"] != null)
+                regionName = request["NAME"];
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no NAME in request to get regions by name");
+
+            int max = 0;
+            if (request["MAX"] != null)
+                Int32.TryParse(request["MAX"], out max);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no MAX in request to get regions by name");
+
+            List<GridRegion> rinfos = m_GridService.GetRegionsByName(scopeID, regionName, max);
+            //m_log.DebugFormat("[GRID HANDLER]: neighbours for region {0}: {1}", regionID, rinfos.Count);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((rinfos == null) || ((rinfos != null) && (rinfos.Count == 0)))
+                result["result"] = "null";
+            else
+            {
+                int i = 0;
+                foreach (GridRegion rinfo in rinfos)
+                {
+                    Dictionary<string, object> rinfoDict = rinfo.ToKeyValuePairs();
+                    result["region" + i] = rinfoDict;
+                    i++;
+                }
+            }
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
+        byte[] GetRegionRange(Dictionary<string, string> request)
+        {
+            //m_log.DebugFormat("[GRID HANDLER]: GetRegionRange");
+            UUID scopeID = UUID.Zero;
+            if (request.ContainsKey("SCOPEID"))
+                UUID.TryParse(request["SCOPEID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region range");
+
+            int xmin = 0, xmax = 0, ymin = 0, ymax = 0;
+            if (request.ContainsKey("XMIN"))
+                Int32.TryParse(request["XMIN"], out xmin);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no XMIN in request to get region range");
+            if (request.ContainsKey("XMAX"))
+                Int32.TryParse(request["XMAX"], out xmax);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no XMAX in request to get region range");
+            if (request.ContainsKey("YMIN"))
+                Int32.TryParse(request["YMIN"], out ymin);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no YMIN in request to get region range");
+            if (request.ContainsKey("YMAX"))
+                Int32.TryParse(request["YMAX"], out ymax);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no YMAX in request to get region range");
+
+
+            List<GridRegion> rinfos = m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((rinfos == null) || ((rinfos != null) && (rinfos.Count == 0)))
+                result["result"] = "null";
+            else
+            {
+                int i = 0;
+                foreach (GridRegion rinfo in rinfos)
+                {
+                    Dictionary<string, object> rinfoDict = rinfo.ToKeyValuePairs();
+                    result["region" + i] = rinfoDict;
+                    i++;
+                }
+            }
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
+        #endregion
+
+        #region Misc
+
+        private byte[] SuccessResult()
+        {
+            XmlDocument doc = new XmlDocument();
+
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+
+            doc.AppendChild(xmlnode);
+
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+
+            doc.AppendChild(rootElement);
+
+            XmlElement result = doc.CreateElement("", "Result", "");
+            result.AppendChild(doc.CreateTextNode("Success"));
+
+            rootElement.AppendChild(result);
+
+            return DocToBytes(doc);
+        }
+
+        private byte[] FailureResult()
+        {
+            XmlDocument doc = new XmlDocument();
+
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+
+            doc.AppendChild(xmlnode);
+
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+
+            doc.AppendChild(rootElement);
+
+            XmlElement result = doc.CreateElement("", "Result", "");
+            result.AppendChild(doc.CreateTextNode("Failure"));
+
+            rootElement.AppendChild(result);
+
+            return DocToBytes(doc);
+        }
+
+        private byte[] DocToBytes(XmlDocument doc)
+        {
+            MemoryStream ms = new MemoryStream();
+            XmlTextWriter xw = new XmlTextWriter(ms, null);
+            xw.Formatting = Formatting.Indented;
+            doc.WriteTo(xw);
+            xw.Flush();
+
+            return ms.ToArray();
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
new file mode 100644
index 0000000..115ac29
--- /dev/null
+++ b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Net;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+using OpenMetaverse;
+using log4net;
+using Nwc.XmlRpc;
+
+namespace OpenSim.Server.Handlers.Grid
+{
+    public class HypergridServiceInConnector : ServiceConnector
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private List<GridRegion> m_RegionsOnSim = new List<GridRegion>();
+        private IHyperlinkService m_HyperlinkService;
+
+        public HypergridServiceInConnector(IConfigSource config, IHttpServer server, IHyperlinkService hyperService) :
+                base(config, server, String.Empty)
+        {
+            m_HyperlinkService = hyperService;
+            server.AddXmlRPCHandler("link_region", LinkRegionRequest, false);
+            server.AddXmlRPCHandler("expect_hg_user", ExpectHGUser, false);
+        }
+
+        public void AddRegion(GridRegion rinfo)
+        {
+            m_RegionsOnSim.Add(rinfo);
+        }
+
+        public void RemoveRegion(GridRegion rinfo)
+        {
+            if (m_RegionsOnSim.Contains(rinfo))
+                m_RegionsOnSim.Remove(rinfo);
+        }
+
+        /// <summary>
+        /// Someone wants to link to us
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public XmlRpcResponse LinkRegionRequest(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            //string host = (string)requestData["host"];
+            //string portstr = (string)requestData["port"];
+            string name = (string)requestData["region_name"];
+
+            m_log.DebugFormat("[HGrid]: Hyperlink request");
+
+            GridRegion regInfo = null;
+            foreach (GridRegion r in m_RegionsOnSim)
+            {
+                if ((r.RegionName != null) && (name != null) && (r.RegionName.ToLower() == name.ToLower()))
+                {
+                    regInfo = r;
+                    break;
+                }
+            }
+
+            if (regInfo == null)
+                regInfo = m_RegionsOnSim[0]; // Send out the first region
+
+            Hashtable hash = new Hashtable();
+            hash["uuid"] = regInfo.RegionID.ToString();
+            m_log.Debug(">> Here " + regInfo.RegionID);
+            hash["handle"] = regInfo.RegionHandle.ToString();
+            hash["region_image"] = regInfo.TerrainImage.ToString();
+            hash["region_name"] = regInfo.RegionName;
+            hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
+            //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port);
+
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = hash;
+            return response;
+        }
+
+        /// <summary>
+        /// Received from other HGrid nodes when a user wants to teleport here.  This call allows
+        /// the region to prepare for direct communication from the client.  Sends back an empty
+        /// xmlrpc response on completion.
+        /// This is somewhat similar to OGS1's ExpectUser, but with the additional task of
+        /// registering the user in the local user cache.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public XmlRpcResponse ExpectHGUser(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            ForeignUserProfileData userData = new ForeignUserProfileData();
+
+            userData.FirstName = (string)requestData["firstname"];
+            userData.SurName = (string)requestData["lastname"];
+            userData.ID = new UUID((string)requestData["agent_id"]);
+            UUID sessionID = new UUID((string)requestData["session_id"]);
+            userData.HomeLocation = new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
+                                  (float)Convert.ToDecimal((string)requestData["startpos_y"]),
+                                  (float)Convert.ToDecimal((string)requestData["startpos_z"]));
+
+            userData.UserServerURI = (string)requestData["userserver_id"];
+            userData.UserAssetURI = (string)requestData["assetserver_id"];
+            userData.UserInventoryURI = (string)requestData["inventoryserver_id"];
+
+            m_log.DebugFormat("[HGrid]: Prepare for connection from {0} {1} (@{2}) UUID={3}",
+                              userData.FirstName, userData.SurName, userData.UserServerURI, userData.ID);
+
+            ulong userRegionHandle = 0;
+            int userhomeinternalport = 0;
+            if (requestData.ContainsKey("region_uuid"))
+            {
+                UUID uuid = UUID.Zero;
+                UUID.TryParse((string)requestData["region_uuid"], out uuid);
+                userData.HomeRegionID = uuid;
+                userRegionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
+                userData.UserHomeAddress = (string)requestData["home_address"];
+                userData.UserHomePort = (string)requestData["home_port"];
+                userhomeinternalport = Convert.ToInt32((string)requestData["internal_port"]);
+
+                m_log.Debug("[HGrid]: home_address: " + userData.UserHomeAddress +
+                           "; home_port: " + userData.UserHomePort);
+            }
+            else
+                m_log.WarnFormat("[HGrid]: User has no home region information");
+
+            XmlRpcResponse resp = new XmlRpcResponse();
+
+            // Let's check if someone is trying to get in with a stolen local identity.
+            // The need for this test is a consequence of not having truly global names :-/
+            bool comingHome = false;
+            if (m_HyperlinkService.CheckUserAtEntry(userData.ID, sessionID, out comingHome) == false)
+            {
+                m_log.WarnFormat("[HGrid]: Access denied to foreign user.");
+                Hashtable respdata = new Hashtable();
+                respdata["success"] = "FALSE";
+                respdata["reason"] = "Foreign user has the same ID as a local user, or logins disabled.";
+                resp.Value = respdata;
+                return resp;
+            }
+
+            // Finally, everything looks ok
+            //m_log.Debug("XXX---- EVERYTHING OK ---XXX");
+
+            if (!comingHome)
+            {
+                // We don't do this if the user is coming to the home grid
+                GridRegion home = new GridRegion();
+                home.RegionID = userData.HomeRegionID;
+                home.ExternalHostName = userData.UserHomeAddress;
+                home.HttpPort = Convert.ToUInt32(userData.UserHomePort);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(userRegionHandle, out x, out y);
+                home.RegionLocX = (int)x;
+                home.RegionLocY = (int)y;
+                home.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)userhomeinternalport);
+
+                m_HyperlinkService.AcceptUser(userData, home);
+            }
+            // else the user is coming to a non-home region of the home grid
+            // We simply drop this user information altogether
+ 
+            Hashtable respdata2 = new Hashtable();
+            respdata2["success"] = "TRUE";
+            resp.Value = respdata2;
+
+            return resp;
+        }
+
+    }
+}
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index 998b322..ca45263 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -54,19 +54,20 @@ namespace OpenSim.Server.Handlers.Inventory
         //private AuthedSessionCache m_session_cache = new AuthedSessionCache(INVENTORY_DEFAULT_SESSION_TIME);
 
         private string m_userserver_url;
+        private string m_ConfigName = "InventoryService";
 
-        public InventoryServiceInConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public InventoryServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["InventoryService"];
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'InventoryService' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string inventoryService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
 
             if (inventoryService == String.Empty)
-                throw new Exception("No InventoryService in config file");
+                throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
             m_InventoryService =
diff --git a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs
index 10e3b47..d368bd3 100644
--- a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Land
         // TODO : private IAuthenticationService m_AuthenticationService;
 
         public LandServiceInConnector(IConfigSource source, IHttpServer server, ILandService service, IScene scene) :
-                base(source, server)
+                base(source, server, String.Empty)
         {
             m_LandService = service;
             if (m_LandService == null)
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
index c0933a8..d6ef22e 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
@@ -36,6 +36,7 @@ using OpenSim.Server.Handlers.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
@@ -148,11 +149,14 @@ namespace OpenSim.Server.Handlers.Neighbour
             }
 
             // Finally!
-            bool success = m_NeighbourService.HelloNeighbour(regionhandle, aRegion);
-
+            GridRegion thisRegion = m_NeighbourService.HelloNeighbour(regionhandle, aRegion);
+            
             OSDMap resp = new OSDMap(1);
 
-            resp["success"] = OSD.FromBoolean(success);
+            if (thisRegion != null)
+                resp["success"] = OSD.FromBoolean(true);
+            else
+                resp["success"] = OSD.FromBoolean(false);
 
             httpResponse.StatusCode = (int)HttpStatusCode.OK;
 
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
index b3a91cf..ac2e75f 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Neighbour
         private IAuthenticationService m_AuthenticationService = null;
 
         public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) :
-                base(source, server)
+                base(source, server, String.Empty)
         {
 
             m_NeighbourService = nService;
diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
index 0bb4713..fe93fa5 100644
--- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Server.Handlers.Simulation
         private IAuthenticationService m_AuthenticationService;
 
         public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) :
-                base(config, server)
+                base(config, server, String.Empty)
         {
             IConfig serverConfig = config.Configs["SimulationService"];
             if (serverConfig == null)
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 77dfebb..a7b33c9 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -30,6 +30,7 @@ using log4net;
 using System.Reflection;
 using System;
 using System.Collections.Generic;
+using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Base;
 using OpenSim.Server.Handlers.Base;
 
@@ -60,22 +61,59 @@ namespace OpenSim.Server
             string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
             string[] conns = connList.Split(new char[] {',', ' '});
 
-            foreach (string conn in conns)
+            int i = 0;
+            foreach (string c in conns)
             {
-                if (conn == String.Empty)
+                if (c == String.Empty)
                     continue;
 
+                string configName = String.Empty;
+                string conn = c;
+                uint port = 0;
+
+                string[] split1 = conn.Split(new char[] {'/'});
+                if (split1.Length > 1)
+                {
+                    conn = split1[1];
+
+                    string[] split2 = split1[0].Split(new char[] {'@'});
+                    if (split2.Length > 1)
+                    {
+                        configName = split2[0];
+                        port = Convert.ToUInt32(split2[1]);
+                    }
+                    else
+                    {
+                        port = Convert.ToUInt32(split1[0]);
+                    }
+                }
                 string[] parts = conn.Split(new char[] {':'});
                 string friendlyName = parts[0];
                 if (parts.Length > 1)
                     friendlyName = parts[1];
 
-                m_log.InfoFormat("[SERVER]: Loading {0}", friendlyName);
+                IHttpServer server = m_Server.HttpServer;
+                if (port != 0)
+                    server = m_Server.GetHttpServer(port);
 
-                Object[] modargs = new Object[] { m_Server.Config, m_Server.HttpServer };
-                IServiceConnector connector =
-                        ServerUtils.LoadPlugin<IServiceConnector>(conn,
+                if (port != m_Server.DefaultPort)
+                    m_log.InfoFormat("[SERVER]: Loading {0} on port {1}", friendlyName, port);
+                else
+                    m_log.InfoFormat("[SERVER]: Loading {0}", friendlyName);
+
+                IServiceConnector connector = null;
+
+                Object[] modargs = new Object[] { m_Server.Config, server,
+                    configName };
+                connector = ServerUtils.LoadPlugin<IServiceConnector>(conn,
                         modargs);
+                if (connector == null)
+                {
+                    modargs = new Object[] { m_Server.Config, server };
+                    connector =
+                            ServerUtils.LoadPlugin<IServiceConnector>(conn,
+                            modargs);
+                }
 
                 if (connector != null)
                 {
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 88a905c..ebfd47a 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Services.AssetService
             AssetBase asset = Get(args[2]);
 
             if (asset == null || asset.Data.Length == 0)
-            {   
+            {
                 MainConsole.Instance.Output("Asset not found");
                 return;
             }
@@ -195,7 +195,7 @@ namespace OpenSim.Services.AssetService
             AssetBase asset = Get(args[2]);
 
             if (asset == null || asset.Data.Length == 0)
-            {   
+            {
                 MainConsole.Instance.Output("Asset not found");
                 return;
             }
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index 8904461..dcf090e 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -43,9 +43,9 @@ namespace OpenSim.Services.AuthenticationService
     //
     public class AuthenticationServiceBase : ServiceBase
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//                LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
  
         protected IAuthenticationData m_Database;
 
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 6c99b66..d65665a 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -47,9 +47,9 @@ namespace OpenSim.Services.AuthenticationService
     public class PasswordAuthenticationService :
             AuthenticationServiceBase, IAuthenticationService
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//                LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
  
         public PasswordAuthenticationService(IConfigSource config) :
                 base(config)
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
index 8831c8a..d1a5b0f 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
@@ -43,9 +43,9 @@ namespace OpenSim.Services.AuthenticationService
     public class WebkeyAuthenticationService :
             AuthenticationServiceBase, IAuthenticationService
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//                LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
  
         public WebkeyAuthenticationService(IConfigSource config) :
                 base(config)
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
new file mode 100644
index 0000000..50e817e
--- /dev/null
+++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 log4net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Connectors
+{
+    public class AuthenticationServicesConnector : IAuthenticationService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_ServerURI = String.Empty;
+
+        public AuthenticationServicesConnector()
+        {
+        }
+
+        public AuthenticationServicesConnector(string serverURI)
+        {
+            m_ServerURI = serverURI.TrimEnd('/');
+        }
+
+        public AuthenticationServicesConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig assetConfig = source.Configs["AuthenticationService"];
+            if (assetConfig == null)
+            {
+                m_log.Error("[USER CONNECTOR]: AuthenticationService missing from OpanSim.ini");
+                throw new Exception("Authentication connector init error");
+            }
+
+            string serviceURI = assetConfig.GetString("AuthenticationServerURI",
+                    String.Empty);
+
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[USER CONNECTOR]: No Server URI named in section AuthenticationService");
+                throw new Exception("Authentication connector init error");
+            }
+            m_ServerURI = serviceURI;
+        }
+
+        public string Authenticate(UUID principalID, string password, int lifetime)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            sendData["LIFETIME"] = lifetime.ToString();
+            sendData["PRINCIPAL"] = principalID.ToString();
+            sendData["PASSWORD"] = password;
+
+            sendData["METHOD"] = "authenticate";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/auth/plain",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
+                    reply);
+
+            if (replyData["Result"].ToString() != "Success")
+                return String.Empty;
+
+            return replyData["Token"].ToString();
+        }
+
+        public bool Verify(UUID principalID, string token, int lifetime)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            sendData["LIFETIME"] = lifetime.ToString();
+            sendData["PRINCIPAL"] = principalID.ToString();
+            sendData["TOKEN"] = token;
+
+            sendData["METHOD"] = "verify";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/auth/plain",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
+                    reply);
+
+            if (replyData["Result"].ToString() != "Success")
+                return false;
+
+            return true;
+        }
+
+        public bool Release(UUID principalID, string token)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            sendData["PRINCIPAL"] = principalID.ToString();
+            sendData["TOKEN"] = token;
+
+            sendData["METHOD"] = "release";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/auth/plain",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
+                    reply);
+
+            if (replyData["Result"].ToString() != "Success")
+                return false;
+
+            return true;
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
index 3167352..7926efb 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors
             message = response.Message;
             
             return response.IsAuthorized;
-        }      
+        }
 
     }
 }
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
new file mode 100644
index 0000000..ba46b0d
--- /dev/null
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -0,0 +1,449 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 log4net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Connectors
+{
+    public class GridServicesConnector : IGridService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_ServerURI = String.Empty;
+
+        public GridServicesConnector()
+        {
+        }
+
+        public GridServicesConnector(string serverURI)
+        {
+            m_ServerURI = serverURI.TrimEnd('/');
+        }
+
+        public GridServicesConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["GridService"];
+            if (gridConfig == null)
+            {
+                m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
+                throw new Exception("Grid connector init error");
+            }
+
+            string serviceURI = gridConfig.GetString("GridServerURI",
+                    String.Empty);
+
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService");
+                throw new Exception("Grid connector init error");
+            }
+            m_ServerURI = serviceURI;
+        }
+
+
+        #region IGridService
+
+        public virtual bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
+        {
+            Dictionary<string, object> rinfo = regionInfo.ToKeyValuePairs();
+            Dictionary<string, string> sendData = new Dictionary<string,string>();
+            foreach (KeyValuePair<string, object> kvp in rinfo)
+                sendData[kvp.Key] = (string)kvp.Value;
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "register";
+
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            //m_log.DebugFormat("[GRID CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/grid",
+                        reqString);
+                if (reply != string.Empty)
+                {
+                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                    if ((replyData["Result"] != null) && (replyData["Result"].ToString().ToLower() == "success"))
+                        return true;
+                }
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: RegisterRegion received null reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
+            }
+
+            return false;
+        }
+
+        public virtual bool DeregisterRegion(UUID regionID)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["REGIONID"] = regionID.ToString();
+
+            sendData["METHOD"] = "deregister";
+
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/grid",
+                        ServerUtils.BuildQueryString(sendData));
+
+                if (reply != string.Empty)
+                {
+                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                    if ((replyData["Result"] != null) && (replyData["Result"].ToString().ToLower() == "success"))
+                        return true;
+                }
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: DeregisterRegion received null reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
+            }
+
+            return false;
+        }
+
+        public virtual List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["REGIONID"] = regionID.ToString();
+
+            sendData["METHOD"] = "get_neighbours";
+
+            List<GridRegion> rinfos = new List<GridRegion>();
+
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            string reply = string.Empty;
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/grid",
+                        reqString);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
+                return rinfos;
+            }
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            if (replyData != null)
+            {
+                Dictionary<string, object>.ValueCollection rinfosList = replyData.Values;
+                //m_log.DebugFormat("[GRID CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count);
+                foreach (object r in rinfosList)
+                {
+                    if (r is Dictionary<string, object>)
+                    {
+                        GridRegion rinfo = new GridRegion((Dictionary<string, object>)r);
+                        rinfos.Add(rinfo);
+                    }
+                    else
+                        m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received invalid response type {2}",
+                            scopeID, regionID, r.GetType());
+                }
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received null response",
+                    scopeID, regionID);
+
+            return rinfos;
+        }
+
+        public virtual GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["REGIONID"] = regionID.ToString();
+
+            sendData["METHOD"] = "get_region_by_uuid";
+
+            string reply = string.Empty;
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/grid",
+                        ServerUtils.BuildQueryString(sendData));
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
+                return null;
+            }
+
+            GridRegion rinfo = null;
+
+            if (reply != string.Empty)
+            {
+                Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                if ((replyData != null) && (replyData["result"] != null))
+                {
+                    if (replyData["result"] is Dictionary<string, object>)
+                        rinfo = new GridRegion((Dictionary<string, object>)replyData["result"]);
+                    //else
+                    //    m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByUUID {0}, {1} received null response",
+                    //        scopeID, regionID);
+                }
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByUUID {0}, {1} received null response",
+                        scopeID, regionID);
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByUUID received null reply");
+
+            return rinfo;
+        }
+
+        public virtual GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["X"] = x.ToString();
+            sendData["Y"] = y.ToString();
+
+            sendData["METHOD"] = "get_region_by_position";
+            string reply = string.Empty;
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/grid",
+                        ServerUtils.BuildQueryString(sendData));
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
+                return null;
+            }
+
+            GridRegion rinfo = null;
+            if (reply != string.Empty)
+            {
+                Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                if ((replyData != null) && (replyData["result"] != null))
+                {
+                    if (replyData["result"] is Dictionary<string, object>)
+                        rinfo = new GridRegion((Dictionary<string, object>)replyData["result"]);
+                    else
+                        m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received invalid response",
+                            scopeID, x, y);
+                }
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received null response",
+                        scopeID, x, y);
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition received null reply");
+
+            return rinfo;
+        }
+
+        public virtual GridRegion GetRegionByName(UUID scopeID, string regionName)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["NAME"] = regionName;
+
+            sendData["METHOD"] = "get_region_by_name";
+            string reply = string.Empty;
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/grid",
+                        ServerUtils.BuildQueryString(sendData));
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
+                return null;
+            }
+
+            GridRegion rinfo = null;
+            if (reply != string.Empty)
+            {
+                Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                if ((replyData != null) && (replyData["result"] != null))
+                {
+                    if (replyData["result"] is Dictionary<string, object>)
+                        rinfo = new GridRegion((Dictionary<string, object>)replyData["result"]);
+                }
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1} received null response",
+                        scopeID, regionName);
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByName received null reply");
+
+            return rinfo;
+        }
+
+        public virtual List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["NAME"] = name;
+            sendData["MAX"] = maxNumber.ToString();
+
+            sendData["METHOD"] = "get_regions_by_name";
+            List<GridRegion> rinfos = new List<GridRegion>();
+            string reply = string.Empty;
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/grid",
+                        ServerUtils.BuildQueryString(sendData));
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
+                return rinfos;
+            }
+
+            if (reply != string.Empty)
+            {
+                Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                if (replyData != null)
+                {
+                    Dictionary<string, object>.ValueCollection rinfosList = replyData.Values;
+                    foreach (object r in rinfosList)
+                    {
+                        if (r is Dictionary<string, object>)
+                        {
+                            GridRegion rinfo = new GridRegion((Dictionary<string, object>)r);
+                            rinfos.Add(rinfo);
+                        }
+                        else
+                            m_log.DebugFormat("[GRID CONNECTOR]: GetRegionsByName {0}, {1}, {2} received invalid response",
+                                scopeID, name, maxNumber);
+                    }
+                }
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: GetRegionsByName {0}, {1}, {2} received null response",
+                        scopeID, name, maxNumber);
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionsByName received null reply");
+
+            return rinfos;
+        }
+
+        public virtual List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["XMIN"] = xmin.ToString();
+            sendData["XMAX"] = xmax.ToString();
+            sendData["YMIN"] = ymin.ToString();
+            sendData["YMAX"] = ymax.ToString();
+
+            sendData["METHOD"] = "get_region_range";
+
+            List<GridRegion> rinfos = new List<GridRegion>();
+            string reply = string.Empty;
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/grid",
+                        ServerUtils.BuildQueryString(sendData));
+
+                //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
+                return rinfos;
+            }
+
+            if (reply != string.Empty)
+            {
+                Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                if (replyData != null)
+                {
+                    Dictionary<string, object>.ValueCollection rinfosList = replyData.Values;
+                    foreach (object r in rinfosList)
+                    {
+                        if (r is Dictionary<string, object>)
+                        {
+                            GridRegion rinfo = new GridRegion((Dictionary<string, object>)r);
+                            rinfos.Add(rinfo);
+                        }
+                    }
+                }
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: GetRegionRange {0}, {1}-{2} {3}-{4} received null response",
+                        scopeID, xmin, xmax, ymin, ymax);
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionRange received null reply");
+
+            return rinfos;
+        }
+
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
new file mode 100644
index 0000000..3d7f112
--- /dev/null
+++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Net;
+using System.Reflection;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+using OpenSim.Framework;
+
+using OpenMetaverse;
+using OpenMetaverse.Imaging;
+using log4net;
+using Nwc.XmlRpc;
+
+namespace OpenSim.Services.Connectors.Grid
+{
+    public class HypergridServiceConnector
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IAssetService m_AssetService;
+
+        public HypergridServiceConnector(IAssetService assService)
+        {
+            m_AssetService = assService;
+        }
+
+        public UUID LinkRegion(GridRegion info, out ulong realHandle)
+        {
+            UUID uuid = UUID.Zero;
+            realHandle = 0;
+
+            Hashtable hash = new Hashtable();
+            hash["region_name"] = info.RegionName;
+
+            IList paramList = new ArrayList();
+            paramList.Add(hash);
+
+            XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
+            string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
+            m_log.Debug("[HGrid]: Linking to " + uri);
+            XmlRpcResponse response = null;
+            try
+            {
+                response = request.Send(uri, 10000);
+            }
+            catch (Exception e)
+            {
+                m_log.Debug("[HGrid]: Exception " + e.Message);
+                return uuid;
+            }
+
+            if (response.IsFault)
+            {
+                m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString);
+            }
+            else
+            {
+                hash = (Hashtable)response.Value;
+                //foreach (Object o in hash)
+                //    m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
+                try
+                {
+                    UUID.TryParse((string)hash["uuid"], out uuid);
+                    m_log.Debug(">> HERE, uuid: " + uuid);
+                    info.RegionID = uuid;
+                    if ((string)hash["handle"] != null)
+                    {
+                        realHandle = Convert.ToUInt64((string)hash["handle"]);
+                        m_log.Debug(">> HERE, realHandle: " + realHandle);
+                    }
+                    //if (hash["region_image"] != null)
+                    //{
+                    //    UUID img = UUID.Zero;
+                    //    UUID.TryParse((string)hash["region_image"], out img);
+                    //    info.RegionSettings.TerrainImageID = img;
+                    //}
+                    if (hash["region_name"] != null)
+                    {
+                        info.RegionName = (string)hash["region_name"];
+                        //m_log.Debug(">> " + info.RegionName);
+                    }
+                    if (hash["internal_port"] != null)
+                    {
+                        int port = Convert.ToInt32((string)hash["internal_port"]);
+                        info.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
+                        //m_log.Debug(">> " + info.InternalEndPoint.ToString());
+                    }
+
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[HGrid]: Got exception while parsing hyperlink response " + e.StackTrace);
+                }
+            }
+            return uuid;
+        }
+
+        public void GetMapImage(GridRegion info)
+        {
+            try
+            {
+                string regionimage = "regionImage" + info.RegionID.ToString();
+                regionimage = regionimage.Replace("-", "");
+
+                WebClient c = new WebClient();
+                string uri = "http://" + info.ExternalHostName + ":" + info.HttpPort + "/index.php?method=" + regionimage;
+                //m_log.Debug("JPEG: " + uri);
+                c.DownloadFile(uri, info.RegionID.ToString() + ".jpg");
+                Bitmap m = new Bitmap(info.RegionID.ToString() + ".jpg");
+                //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
+                byte[] imageData = OpenJPEG.EncodeFromImage(m, true);
+                AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString());
+                
+                // !!! for now
+                //info.RegionSettings.TerrainImageID = ass.FullID;
+
+                ass.Type = (int)AssetType.Texture;
+                ass.Temporary = true;
+                ass.Local = true;
+                ass.Data = imageData;
+
+                m_AssetService.Store(ass);
+
+            }
+            catch // LEGIT: Catching problems caused by OpenJPEG p/invoke
+            {
+                m_log.Warn("[HGrid]: Failed getting/storing map image, because it is probably already in the cache");
+            }
+        }
+
+        public bool InformRegionOfUser(GridRegion regInfo, AgentCircuitData agentData, GridRegion home, string userServer, string assetServer, string inventoryServer)
+        {
+            string capsPath = agentData.CapsPath;
+            Hashtable loginParams = new Hashtable();
+            loginParams["session_id"] = agentData.SessionID.ToString();
+
+            loginParams["firstname"] = agentData.firstname;
+            loginParams["lastname"] = agentData.lastname;
+
+            loginParams["agent_id"] = agentData.AgentID.ToString();
+            loginParams["circuit_code"] = agentData.circuitcode.ToString();
+            loginParams["startpos_x"] = agentData.startpos.X.ToString();
+            loginParams["startpos_y"] = agentData.startpos.Y.ToString();
+            loginParams["startpos_z"] = agentData.startpos.Z.ToString();
+            loginParams["caps_path"] = capsPath;
+
+            if (home != null)
+            {
+                loginParams["region_uuid"] = home.RegionID.ToString();
+                loginParams["regionhandle"] = home.RegionHandle.ToString();
+                loginParams["home_address"] = home.ExternalHostName;
+                loginParams["home_port"] = home.HttpPort.ToString();
+                loginParams["internal_port"] = home.InternalEndPoint.Port.ToString();
+
+                m_log.Debug("  ---------     Home     -------");
+                m_log.Debug("  >> " + loginParams["home_address"] + " <<");
+                m_log.Debug("  >> " + loginParams["region_uuid"] + " <<");
+                m_log.Debug("  >> " + loginParams["regionhandle"] + " <<");
+                m_log.Debug("  >> " + loginParams["home_port"] + " <<");
+                m_log.Debug("  --------- ------------ -------");
+            }
+            else
+                m_log.WarnFormat("[HGrid]: Home region not found for {0} {1}", agentData.firstname, agentData.lastname);
+
+            loginParams["userserver_id"] = userServer;
+            loginParams["assetserver_id"] = assetServer;
+            loginParams["inventoryserver_id"] = inventoryServer;
+
+
+            ArrayList SendParams = new ArrayList();
+            SendParams.Add(loginParams);
+
+            // Send
+            string uri = "http://" + regInfo.ExternalHostName + ":" + regInfo.HttpPort + "/";
+            //m_log.Debug("XXX uri: " + uri);
+            XmlRpcRequest request = new XmlRpcRequest("expect_hg_user", SendParams);
+            XmlRpcResponse reply;
+            try
+            {
+                reply = request.Send(uri, 6000);
+            }
+            catch (Exception e)
+            {
+                m_log.Warn("[HGrid]: Failed to notify region about user. Reason: " + e.Message);
+                return false;
+            }
+
+            if (!reply.IsFault)
+            {
+                bool responseSuccess = true;
+                if (reply.Value != null)
+                {
+                    Hashtable resp = (Hashtable)reply.Value;
+                    if (resp.ContainsKey("success"))
+                    {
+                        if ((string)resp["success"] == "FALSE")
+                        {
+                            responseSuccess = false;
+                        }
+                    }
+                }
+                if (responseSuccess)
+                {
+                    m_log.Info("[HGrid]: Successfully informed remote region about user " + agentData.AgentID);
+                    return true;
+                }
+                else
+                {
+                    m_log.ErrorFormat("[HGrid]: Region responded that it is not available to receive clients");
+                    return false;
+                }
+            }
+            else
+            {
+                m_log.ErrorFormat("[HGrid]: XmlRpc request to region failed with message {0}, code {1} ", reply.FaultString, reply.FaultCode);
+                return false;
+            }
+        }
+
+    }
+}
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index cef678d..5443891 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -236,42 +236,8 @@ namespace OpenSim.Services.Connectors
             }
             catch (Exception e)
             {
-                // Maybe we're talking to an old inventory server. Try this other thing.
-                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1} (old server?). Trying GetInventory.",
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1} (old server?).",
                      e.Source, e.Message);
-
-                InventoryCollection inventory;
-                List<InventoryFolderBase> folders = null;
-                try
-                {
-                    inventory = SynchronousRestSessionObjectPoster<Guid, InventoryCollection>.BeginPostObject(
-                        "POST", m_ServerURI + "/GetInventory/", new Guid(userID), sessionID.ToString(), userID.ToString());
-                    if (inventory != null)
-                        folders = inventory.Folders;
-                }
-                catch (Exception ex)
-                {
-                    m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetInventory operation also failed, {0} {1}. Giving up.",
-                         e.Source, ex.Message);
-                    return new InventoryCollection();
-                }
-
-                if ((folders != null) && (folders.Count > 0))
-                {
-                    m_log.DebugFormat("[INVENTORY CONNECTOR]: Received entire inventory ({0} folders) for user {1}",
-                        folders.Count, userID);
-
-                    folders = folders.FindAll(delegate(InventoryFolderBase f) { return f.ParentID == folderID; });
-                    List<InventoryItemBase> items = inventory.Items;
-                    if (items != null)
-                    {
-                        items = items.FindAll(delegate(InventoryItemBase i) { return i.Folder == folderID; });
-                    }
-
-                    inventory.Items = items;
-                    inventory.Folders = folders;
-                    return inventory;
-                }
             }
 
             InventoryCollection nullCollection = new InventoryCollection();
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
index 0243f1f..06bc11c 100644
--- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
@@ -38,6 +38,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Services.Interfaces;
 using OpenMetaverse;
 using Nwc.XmlRpc;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Services.Connectors
 {
@@ -47,20 +48,20 @@ namespace OpenSim.Services.Connectors
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected IGridServices m_MapService = null;
+        protected IGridService m_GridService = null;
 
         public LandServicesConnector()
         {
         }
 
-        public LandServicesConnector(IGridServices gridServices)
+        public LandServicesConnector(IGridService gridServices)
         {
             Initialise(gridServices);
         }
 
-        public virtual void Initialise(IGridServices gridServices)
+        public virtual void Initialise(IGridService gridServices)
         {
-            m_MapService = gridServices;
+            m_GridService = gridServices;
         }
 
         public virtual LandData GetLandData(ulong regionHandle, uint x, uint y)
@@ -76,7 +77,9 @@ namespace OpenSim.Services.Connectors
 
             try
             {
-                RegionInfo info = m_MapService.RequestNeighbourInfo(regionHandle);
+                uint xpos = 0, ypos = 0;
+                Utils.LongToUInts(regionHandle, out xpos, out ypos);
+                GridRegion info = m_GridService.GetRegionByPosition(UUID.Zero, (int)xpos, (int)ypos);
                 if (info != null) // just to be sure
                 {
                     XmlRpcRequest request = new XmlRpcRequest("land_data", paramList);
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
index 7fff537..145f212 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
@@ -41,6 +41,8 @@ using OpenSim.Services.Interfaces;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
 namespace OpenSim.Services.Connectors
 {
     public class NeighbourServicesConnector : INeighbourService
@@ -49,37 +51,39 @@ namespace OpenSim.Services.Connectors
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected IGridServices m_MapService = null;
+        protected IGridService m_GridService = null;
 
         public NeighbourServicesConnector()
         {
         }
 
-        public NeighbourServicesConnector(IGridServices gridServices)
+        public NeighbourServicesConnector(IGridService gridServices)
         {
             Initialise(gridServices);
         }
 
-        public virtual void Initialise(IGridServices gridServices)
+        public virtual void Initialise(IGridService gridServices)
         {
-            m_MapService = gridServices;
+            m_GridService = gridServices;
         }
 
-        public virtual bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
+        public virtual GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
         {
-            RegionInfo regInfo = m_MapService.RequestNeighbourInfo(regionHandle);
+            uint x = 0, y = 0;
+            Utils.LongToUInts(regionHandle, out x, out y);
+            GridRegion regInfo = m_GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
             if ((regInfo != null) &&
                 // Don't remote-call this instance; that's a startup hickup
                 !((regInfo.ExternalHostName == thisRegion.ExternalHostName) && (regInfo.HttpPort == thisRegion.HttpPort)))
             {
-                return DoHelloNeighbourCall(regInfo, thisRegion);
+                DoHelloNeighbourCall(regInfo, thisRegion);
             }
             //else
             //    m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
-            return false;
+            return regInfo;
         }
 
-        public bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion)
+        public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion)
         {
             string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/";
             //m_log.Debug("   >>> DoHelloNeighbourCall <<< " + uri);
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
new file mode 100644
index 0000000..991acf2
--- /dev/null
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 System.Net;
+using System.Reflection;
+using Nini.Config;
+using log4net;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Data;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenMetaverse;
+
+namespace OpenSim.Services.GridService
+{
+    public class GridService : GridServiceBase, IGridService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        public GridService(IConfigSource config)
+            : base(config)
+        {
+            m_log.DebugFormat("[GRID SERVICE]: Starting...");
+        }
+
+        #region IGridService
+
+        public bool RegisterRegion(UUID scopeID, GridRegion regionInfos)
+        {
+            // This needs better sanity testing. What if regionInfo is registering in
+            // overlapping coords?
+            RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
+            if ((region != null) && (region.RegionID != regionInfos.RegionID))
+            {
+                m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.", 
+                    regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
+                return false;
+            }
+            if ((region != null) && (region.RegionID == regionInfos.RegionID) && 
+                ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
+            {
+                // Region reregistering in other coordinates. Delete the old entry
+                m_Database.Delete(regionInfos.RegionID);
+            }
+
+            // Everything is ok, let's register
+            RegionData rdata = RegionInfo2RegionData(regionInfos);
+            rdata.ScopeID = scopeID;
+            m_Database.Store(rdata);
+            return true;
+        }
+
+        public bool DeregisterRegion(UUID regionID)
+        {
+            return m_Database.Delete(regionID);
+        }
+
+        public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
+        {
+            List<GridRegion> rinfos = new List<GridRegion>();
+            RegionData region = m_Database.Get(regionID, scopeID);
+            if (region != null)
+            {
+                // Not really? Maybe?
+                List<RegionData> rdatas = m_Database.Get(region.posX - (int)Constants.RegionSize, region.posY - (int)Constants.RegionSize, 
+                    region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID);
+
+                foreach (RegionData rdata in rdatas)
+                    if (rdata.RegionID != regionID)
+                        rinfos.Add(RegionData2RegionInfo(rdata));
+
+            }
+            return rinfos;
+        }
+
+        public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
+        {
+            RegionData rdata = m_Database.Get(regionID, scopeID);
+            if (rdata != null)
+                return RegionData2RegionInfo(rdata);
+
+            return null;
+        }
+
+        public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
+        {
+            int snapX = (int)(x / Constants.RegionSize) * (int)Constants.RegionSize;
+            int snapY = (int)(y / Constants.RegionSize) * (int)Constants.RegionSize;
+            RegionData rdata = m_Database.Get(snapX, snapY, scopeID);
+            if (rdata != null)
+                return RegionData2RegionInfo(rdata);
+
+            return null;
+        }
+
+        public GridRegion GetRegionByName(UUID scopeID, string regionName)
+        {
+            List<RegionData> rdatas = m_Database.Get(regionName + "%", scopeID);
+            if ((rdatas != null) && (rdatas.Count > 0))
+                return RegionData2RegionInfo(rdatas[0]); // get the first
+
+            return null;
+        }
+
+        public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
+        {
+            List<RegionData> rdatas = m_Database.Get("%" + name + "%", scopeID);
+
+            int count = 0;
+            List<GridRegion> rinfos = new List<GridRegion>();
+
+            if (rdatas != null)
+            {
+                foreach (RegionData rdata in rdatas)
+                {
+                    if (count++ < maxNumber)
+                        rinfos.Add(RegionData2RegionInfo(rdata));
+                }
+            }
+
+            return rinfos;
+        }
+
+        public List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
+        {
+            int xminSnap = (int)(xmin / Constants.RegionSize) * (int)Constants.RegionSize;
+            int xmaxSnap = (int)(xmax / Constants.RegionSize) * (int)Constants.RegionSize;
+            int yminSnap = (int)(ymin / Constants.RegionSize) * (int)Constants.RegionSize;
+            int ymaxSnap = (int)(ymax / Constants.RegionSize) * (int)Constants.RegionSize;
+
+            List<RegionData> rdatas = m_Database.Get(xminSnap, yminSnap, xmaxSnap, ymaxSnap, scopeID);
+            List<GridRegion> rinfos = new List<GridRegion>();
+            foreach (RegionData rdata in rdatas)
+                rinfos.Add(RegionData2RegionInfo(rdata));
+
+            return rinfos;
+        }
+
+        #endregion
+
+        #region Data structure conversions
+
+        protected RegionData RegionInfo2RegionData(GridRegion rinfo)
+        {
+            RegionData rdata = new RegionData();
+            rdata.posX = (int)rinfo.RegionLocX;
+            rdata.posY = (int)rinfo.RegionLocY;
+            rdata.RegionID = rinfo.RegionID;
+            rdata.RegionName = rinfo.RegionName;
+            rdata.Data = rinfo.ToKeyValuePairs();
+            rdata.Data["regionHandle"] = Utils.UIntsToLong((uint)rdata.posX, (uint)rdata.posY);
+            return rdata;
+        }
+
+        protected GridRegion RegionData2RegionInfo(RegionData rdata)
+        {
+            GridRegion rinfo = new GridRegion(rdata.Data);
+            rinfo.RegionLocX = rdata.posX;
+            rinfo.RegionLocY = rdata.posY;
+            rinfo.RegionID = rdata.RegionID;
+            rinfo.RegionName = rdata.RegionName;
+            rinfo.ScopeID = rdata.ScopeID;
+
+            return rinfo;
+        }
+
+        #endregion 
+
+    }
+}
diff --git a/OpenSim/Services/GridService/GridServiceBase.cs b/OpenSim/Services/GridService/GridServiceBase.cs
new file mode 100644
index 0000000..444f79b
--- /dev/null
+++ b/OpenSim/Services/GridService/GridServiceBase.cs
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Data;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Base;
+
+namespace OpenSim.Services.GridService
+{
+    public class GridServiceBase : ServiceBase
+    {
+        protected IRegionData m_Database = null;
+
+        public GridServiceBase(IConfigSource config)
+            : base(config)
+        {
+            string dllName = String.Empty;
+            string connString = String.Empty;
+            string realm = "regions";
+
+            //
+            // Try reading the [DatabaseService] section, if it exists
+            //
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
+            {
+                if (dllName == String.Empty)
+                    dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                if (connString == String.Empty)
+                    connString = dbConfig.GetString("ConnectionString", String.Empty);
+            }
+
+            //
+            // [GridService] section overrides [DatabaseService], if it exists
+            //
+            IConfig gridConfig = config.Configs["GridService"];
+            if (gridConfig != null)
+            {
+                dllName = gridConfig.GetString("StorageProvider", dllName);
+                connString = gridConfig.GetString("ConnectionString", connString);
+                realm = gridConfig.GetString("Realm", realm);
+            }
+            
+            //
+            // We tried, but this doesn't exist. We can't proceed.
+            //
+            if (dllName.Equals(String.Empty))
+                throw new Exception("No StorageProvider configured");
+
+            m_Database = LoadPlugin<IRegionData>(dllName, new Object[] { connString, realm });
+            if (m_Database == null)
+                throw new Exception("Could not find a storage interface in the given module");
+
+        }
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index ac4539a..2290530 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -25,8 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework;
+using System;
 using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Services.Interfaces
@@ -39,7 +42,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="regionInfos"> </param>
         /// <returns></returns>
         /// <exception cref="System.Exception">Thrown if region registration failed</exception>
-        bool RegisterRegion(UUID scopeID, RegionInfo regionInfos);
+        bool RegisterRegion(UUID scopeID, GridRegion regionInfos);
 
         /// <summary>
         /// Deregister a region with the grid service.
@@ -47,21 +50,28 @@ namespace OpenSim.Services.Interfaces
         /// <param name="regionID"></param>
         /// <returns></returns>
         /// <exception cref="System.Exception">Thrown if region deregistration failed</exception>
-        bool DeregisterRegion(UUID regionID);   
+        bool DeregisterRegion(UUID regionID);
 
         /// <summary>
-        /// Get information about the regions neighbouring the given co-ordinates.
+        /// Get information about the regions neighbouring the given co-ordinates (in meters).
         /// </summary>
         /// <param name="x"></param>
         /// <param name="y"></param>
         /// <returns></returns>
-        List<SimpleRegionInfo> GetNeighbours(UUID scopeID, uint x, uint y);
+        List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID);
 
-        SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID);
+        GridRegion GetRegionByUUID(UUID scopeID, UUID regionID);
+
+        /// <summary>
+        /// Get the region at the given position (in meters)
+        /// </summary>
+        /// <param name="scopeID"></param>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        GridRegion GetRegionByPosition(UUID scopeID, int x, int y);
 
-        SimpleRegionInfo GetRegionByPosition(UUID scopeID, int x, int y);
-        
-        SimpleRegionInfo GetRegionByName(UUID scopeID, string regionName);
+        GridRegion GetRegionByName(UUID scopeID, string regionName);
 
         /// <summary>
         /// Get information about regions starting with the provided name. 
@@ -76,11 +86,266 @@ namespace OpenSim.Services.Interfaces
         /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the
         /// grid-server couldn't be contacted or returned an error, return null. 
         /// </returns>
-        List<SimpleRegionInfo> GetRegionsByName(UUID scopeID, string name, int maxNumber);
+        List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber);
+
+        List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax);
+
+    }
+
+    public class GridRegion
+    {
+
+        /// <summary>
+        /// The port by which http communication occurs with the region 
+        /// </summary>
+        public uint HttpPort
+        {
+            get { return m_httpPort; }
+            set { m_httpPort = value; }
+        }
+        protected uint m_httpPort;
+
+        /// <summary>
+        /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
+        /// </summary>
+        public string ServerURI
+        {
+            get { return m_serverURI; }
+            set { m_serverURI = value; }
+        }
+        protected string m_serverURI;
+
+        public string RegionName
+        {
+            get { return m_regionName; }
+            set { m_regionName = value; }
+        }
+        protected string m_regionName = String.Empty;
+
+        protected string m_externalHostName;
+
+        protected IPEndPoint m_internalEndPoint;
+
+        public int RegionLocX
+        {
+            get { return m_regionLocX; }
+            set { m_regionLocX = value; }
+        }
+        protected int m_regionLocX;
+
+        public int RegionLocY
+        {
+            get { return m_regionLocY; }
+            set { m_regionLocY = value; }
+        }
+        protected int m_regionLocY;
+
+        public UUID RegionID = UUID.Zero;
+        public UUID ScopeID = UUID.Zero;
+
+        public UUID TerrainImage = UUID.Zero;
+        public byte Access;
+        public int  Maturity;
+        public string RegionSecret;
+
+        public GridRegion()
+        {
+        }
+
+        public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri)
+        {
+            m_regionLocX = regionLocX;
+            m_regionLocY = regionLocY;
 
+            m_internalEndPoint = internalEndPoint;
+            m_externalHostName = externalUri;
+        }
 
-        // Not sure about these two (diva)
+        public GridRegion(int regionLocX, int regionLocY, string externalUri, uint port)
+        {
+            m_regionLocX = regionLocX;
+            m_regionLocY = regionLocY;
 
+            m_externalHostName = externalUri;
 
+            m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)port);
+        }
+
+        public GridRegion(uint xcell, uint ycell)
+        {
+            m_regionLocX = (int)(xcell * Constants.RegionSize);
+            m_regionLocY = (int)(ycell * Constants.RegionSize);
+        }
+
+        public GridRegion(RegionInfo ConvertFrom)
+        {
+            m_regionName = ConvertFrom.RegionName;
+            m_regionLocX = (int)(ConvertFrom.RegionLocX * Constants.RegionSize);
+            m_regionLocY = (int)(ConvertFrom.RegionLocY * Constants.RegionSize);
+            m_internalEndPoint = ConvertFrom.InternalEndPoint;
+            m_externalHostName = ConvertFrom.ExternalHostName;
+            m_httpPort = ConvertFrom.HttpPort;
+            RegionID = ConvertFrom.RegionID;
+            ServerURI = ConvertFrom.ServerURI;
+            TerrainImage = ConvertFrom.RegionSettings.TerrainImageID;
+            Access = ConvertFrom.AccessLevel;
+            Maturity = ConvertFrom.RegionSettings.Maturity;
+            RegionSecret = ConvertFrom.regionSecret;
+        }
+
+        public GridRegion(GridRegion ConvertFrom)
+        {
+            m_regionName = ConvertFrom.RegionName;
+            m_regionLocX = ConvertFrom.RegionLocX;
+            m_regionLocY = ConvertFrom.RegionLocY;
+            m_internalEndPoint = ConvertFrom.InternalEndPoint;
+            m_externalHostName = ConvertFrom.ExternalHostName;
+            m_httpPort = ConvertFrom.HttpPort;
+            RegionID = ConvertFrom.RegionID;
+            ServerURI = ConvertFrom.ServerURI;
+            TerrainImage = ConvertFrom.TerrainImage;
+            Access = ConvertFrom.Access;
+            Maturity = ConvertFrom.Maturity;
+            RegionSecret = ConvertFrom.RegionSecret;
+        }
+
+        /// <value>
+        /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw.
+        ///
+        /// XXX Isn't this really doing too much to be a simple getter, rather than an explict method?
+        /// </value>
+        public IPEndPoint ExternalEndPoint
+        {
+            get
+            {
+                // Old one defaults to IPv6
+                //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port);
+
+                IPAddress ia = null;
+                // If it is already an IP, don't resolve it - just return directly
+                if (IPAddress.TryParse(m_externalHostName, out ia))
+                    return new IPEndPoint(ia, m_internalEndPoint.Port);
+
+                // Reset for next check
+                ia = null;
+                try
+                {
+                    foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
+                    {
+                        if (ia == null)
+                            ia = Adr;
+
+                        if (Adr.AddressFamily == AddressFamily.InterNetwork)
+                        {
+                            ia = Adr;
+                            break;
+                        }
+                    }
+                }
+                catch (SocketException e)
+                {
+                    throw new Exception(
+                        "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" +
+                        e + "' attached to this exception", e);
+                }
+
+                return new IPEndPoint(ia, m_internalEndPoint.Port);
+            }
+
+            set { m_externalHostName = value.ToString(); }
+        }
+
+        public string ExternalHostName
+        {
+            get { return m_externalHostName; }
+            set { m_externalHostName = value; }
+        }
+
+        public IPEndPoint InternalEndPoint
+        {
+            get { return m_internalEndPoint; }
+            set { m_internalEndPoint = value; }
+        }
+
+        public ulong RegionHandle
+        {
+            get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); }
+        }
+
+        public int getInternalEndPointPort()
+        {
+            return m_internalEndPoint.Port;
+        }
+
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> kvp = new Dictionary<string, object>();
+            kvp["uuid"] = RegionID.ToString();
+            kvp["locX"] = RegionLocX.ToString();
+            kvp["locY"] = RegionLocY.ToString();
+            kvp["regionName"] = RegionName;
+            kvp["serverIP"] = ExternalHostName; //ExternalEndPoint.Address.ToString();
+            kvp["serverHttpPort"] = HttpPort.ToString();
+            kvp["serverURI"] = ServerURI;
+            kvp["serverPort"] = InternalEndPoint.Port.ToString();
+            kvp["regionMapTexture"] = TerrainImage.ToString();
+            kvp["access"] = Access.ToString();
+            kvp["regionSecret"] = RegionSecret;
+            // Maturity doesn't seem to exist in the DB
+            return kvp;
+        }
+
+        public GridRegion(Dictionary<string, object> kvp)
+        {
+            if (kvp.ContainsKey("uuid"))
+                RegionID = new UUID((string)kvp["uuid"]);
+
+            if (kvp.ContainsKey("locX"))
+                RegionLocX = Convert.ToInt32((string)kvp["locX"]);
+
+            if (kvp.ContainsKey("locY"))
+                RegionLocY = Convert.ToInt32((string)kvp["locY"]);
+
+            if (kvp.ContainsKey("regionName"))
+                RegionName = (string)kvp["regionName"];
+
+            if (kvp.ContainsKey("serverIP"))
+            {
+                //int port = 0;
+                //Int32.TryParse((string)kvp["serverPort"], out port);
+                //IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["serverIP"]), port);
+                ExternalHostName = (string)kvp["serverIP"];
+            }
+            else
+                ExternalHostName = "127.0.0.1";
+
+            if (kvp.ContainsKey("serverPort"))
+            {
+                Int32 port = 0;
+                Int32.TryParse((string)kvp["serverPort"], out port);
+                InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
+            }
+
+            if (kvp.ContainsKey("serverHttpPort"))
+            {
+                UInt32 port = 0;
+                UInt32.TryParse((string)kvp["serverHttpPort"], out port);
+                HttpPort = port;
+            }
+
+            if (kvp.ContainsKey("serverURI"))
+                ServerURI = (string)kvp["serverURI"];
+
+            if (kvp.ContainsKey("regionMapTexture"))
+                UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage);
+
+            if (kvp.ContainsKey("access"))
+                Access = Byte.Parse((string)kvp["access"]);
+
+            if (kvp.ContainsKey("regionSecret"))
+                RegionSecret =(string)kvp["regionSecret"];
+
+        }
     }
+
 }
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Services/Interfaces/IHyperlink.cs
index ad5281d..ed3ff23 100644
--- a/OpenSim/Framework/Servers/CheckSumServer.cs
+++ b/OpenSim/Services/Interfaces/IHyperlink.cs
@@ -24,3 +24,26 @@
  * (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 OpenSim.Framework;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IHyperlinkService
+    {
+        GridRegion TryLinkRegion(IClientAPI client, string regionDescriptor); 
+        GridRegion GetHyperlinkRegion(ulong handle);
+        ulong FindRegionHandle(ulong handle);
+
+        bool SendUserInformation(GridRegion region, AgentCircuitData aCircuit);
+        void AdjustUserInformation(AgentCircuitData aCircuit);
+
+        bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome);
+        void AcceptUser(ForeignUserProfileData user, GridRegion home);
+
+        bool IsLocalUser(UUID userID);
+    }
+}
diff --git a/OpenSim/Services/Interfaces/INeighbourService.cs b/OpenSim/Services/Interfaces/INeighbourService.cs
index 3944486..960e13d 100644
--- a/OpenSim/Services/Interfaces/INeighbourService.cs
+++ b/OpenSim/Services/Interfaces/INeighbourService.cs
@@ -28,11 +28,12 @@
 using System;
 using OpenSim.Framework;
 using OpenMetaverse;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Services.Interfaces
 {
     public interface INeighbourService
     {
-        bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion);
+        GridRegion HelloNeighbour(ulong regionHandle, RegionInfo otherRegion);
     }
 }
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index b98e256..70c55a5 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Services.InventoryService
 
             m_log.DebugFormat("[INVENTORY SERVICE]: Found {0} items and {1} folders in folder {2}", items.Count, folders.Count, folderID);
 
-            return invCollection;            
+            return invCollection;
         }
 
         public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs
new file mode 100644
index 0000000..8798c5e
--- /dev/null
+++ b/OpenSim/Tests/Clients/Grid/GridClient.cs
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 System.Text;
+using System.Reflection;
+
+using OpenMetaverse;
+using log4net;
+using log4net.Appender;
+using log4net.Layout;
+
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Services.Connectors;
+
+namespace OpenSim.Tests.Clients.GridClient
+{
+    public class GridClient
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public static void Main(string[] args)
+        {
+            ConsoleAppender consoleAppender = new ConsoleAppender();
+            consoleAppender.Layout =
+                new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline");
+            log4net.Config.BasicConfigurator.Configure(consoleAppender);
+
+            string serverURI = "http://127.0.0.1:8001";
+            GridServicesConnector m_Connector = new GridServicesConnector(serverURI);
+
+            GridRegion r1 = CreateRegion("Test Region 1", 1000, 1000);
+            GridRegion r2 = CreateRegion("Test Region 2", 1001, 1000);
+            GridRegion r3 = CreateRegion("Test Region 3", 1005, 1000);
+
+            Console.WriteLine("[GRID CLIENT]: *** Registering region 1"); 
+            bool success = m_Connector.RegisterRegion(UUID.Zero, r1);
+            if (success)
+                Console.WriteLine("[GRID CLIENT]: Successfully registered region 1");
+            else
+                Console.WriteLine("[GRID CLIENT]: region 1 failed to register");
+
+            Console.WriteLine("[GRID CLIENT]: *** Registering region 2");
+            success = m_Connector.RegisterRegion(UUID.Zero, r2);
+            if (success)
+                Console.WriteLine("[GRID CLIENT]: Successfully registered region 2");
+            else
+                Console.WriteLine("[GRID CLIENT]: region 2 failed to register");
+
+            Console.WriteLine("[GRID CLIENT]: *** Registering region 3");
+            success = m_Connector.RegisterRegion(UUID.Zero, r3);
+            if (success)
+                Console.WriteLine("[GRID CLIENT]: Successfully registered region 3");
+            else
+                Console.WriteLine("[GRID CLIENT]: region 3 failed to register");
+
+
+            Console.WriteLine("[GRID CLIENT]: *** Deregistering region 3");
+            success = m_Connector.DeregisterRegion(r3.RegionID);
+            if (success)
+                Console.WriteLine("[GRID CLIENT]: Successfully deregistered region 3");
+            else
+                Console.WriteLine("[GRID CLIENT]: region 3 failed to deregister");
+            Console.WriteLine("[GRID CLIENT]: *** Registering region 3 again");
+            success = m_Connector.RegisterRegion(UUID.Zero, r3);
+            if (success)
+                Console.WriteLine("[GRID CLIENT]: Successfully registered region 3");
+            else
+                Console.WriteLine("[GRID CLIENT]: region 3 failed to register");
+
+            Console.WriteLine("[GRID CLIENT]: *** GetNeighbours of region 1");
+            List<GridRegion> regions = m_Connector.GetNeighbours(UUID.Zero, r1.RegionID);
+            if (regions == null)
+                Console.WriteLine("[GRID CLIENT]: GetNeighbours of region 1 failed");
+            else if (regions.Count > 0)
+            {
+                if (regions.Count != 1)
+                    Console.WriteLine("[GRID CLIENT]: GetNeighbours of region 1 returned more neighbours than expected: " + regions.Count);
+                else
+                    Console.WriteLine("[GRID CLIENT]: GetNeighbours of region 1 returned the right neighbour " + regions[0].RegionName);
+            }
+            else
+                Console.WriteLine("[GRID CLIENT]: GetNeighbours of region 1 returned 0 neighbours");
+
+
+            Console.WriteLine("[GRID CLIENT]: *** GetRegionByUUID of region 2 (this should succeed)");
+            GridRegion region = m_Connector.GetRegionByUUID(UUID.Zero, r2.RegionID);
+            if (region == null)
+                Console.WriteLine("[GRID CLIENT]: GetRegionByUUID returned null");
+            else
+                Console.WriteLine("[GRID CLIENT]: GetRegionByUUID returned region " + region.RegionName);
+
+            Console.WriteLine("[GRID CLIENT]: *** GetRegionByUUID of non-existent region (this should fail)");
+            region = m_Connector.GetRegionByUUID(UUID.Zero, UUID.Random());
+            if (region == null)
+                Console.WriteLine("[GRID CLIENT]: GetRegionByUUID returned null");
+            else
+                Console.WriteLine("[GRID CLIENT]: GetRegionByUUID returned region " + region.RegionName);
+
+            Console.WriteLine("[GRID CLIENT]: *** GetRegionByName of region 3 (this should succeed)");
+            region = m_Connector.GetRegionByName(UUID.Zero, r3.RegionName);
+            if (region == null)
+                Console.WriteLine("[GRID CLIENT]: GetRegionByName returned null");
+            else
+                Console.WriteLine("[GRID CLIENT]: GetRegionByName returned region " + region.RegionName);
+
+            Console.WriteLine("[GRID CLIENT]: *** GetRegionByName of non-existent region (this should fail)");
+            region = m_Connector.GetRegionByName(UUID.Zero, "Foo");
+            if (region == null)
+                Console.WriteLine("[GRID CLIENT]: GetRegionByName returned null");
+            else
+                Console.WriteLine("[GRID CLIENT]: GetRegionByName returned region " + region.RegionName);
+
+            Console.WriteLine("[GRID CLIENT]: *** GetRegionsByName (this should return 3 regions)");
+            regions = m_Connector.GetRegionsByName(UUID.Zero, "Test", 10);
+            if (regions == null)
+                Console.WriteLine("[GRID CLIENT]: GetRegionsByName returned null");
+            else
+                Console.WriteLine("[GRID CLIENT]: GetRegionsByName returned " + regions.Count + " regions");
+
+            Console.WriteLine("[GRID CLIENT]: *** GetRegionRange (this should return 2 regions)");
+            regions = m_Connector.GetRegionRange(UUID.Zero, 
+                900 * (int)Constants.RegionSize, 1002 * (int) Constants.RegionSize,
+                900 * (int)Constants.RegionSize, 1002 * (int) Constants.RegionSize);
+            if (regions == null)
+                Console.WriteLine("[GRID CLIENT]: GetRegionRange returned null");
+            else
+                Console.WriteLine("[GRID CLIENT]: GetRegionRange returned " + regions.Count + " regions");
+            Console.WriteLine("[GRID CLIENT]: *** GetRegionRange (this should return 0 regions)");
+            regions = m_Connector.GetRegionRange(UUID.Zero,
+                900 * (int)Constants.RegionSize, 950 * (int)Constants.RegionSize,
+                900 * (int)Constants.RegionSize, 950 * (int)Constants.RegionSize);
+            if (regions == null)
+                Console.WriteLine("[GRID CLIENT]: GetRegionRange returned null");
+            else
+                Console.WriteLine("[GRID CLIENT]: GetRegionRange returned " + regions.Count + " regions");
+
+            Console.Write("Proceed to deregister? Press enter...");
+            Console.ReadLine();
+
+            // Deregister them all
+            Console.WriteLine("[GRID CLIENT]: *** Deregistering region 1");
+            success = m_Connector.DeregisterRegion(r1.RegionID);
+            if (success)
+                Console.WriteLine("[GRID CLIENT]: Successfully deregistered region 1");
+            else
+                Console.WriteLine("[GRID CLIENT]: region 1 failed to deregister");
+            Console.WriteLine("[GRID CLIENT]: *** Deregistering region 2");
+            success = m_Connector.DeregisterRegion(r2.RegionID);
+            if (success)
+                Console.WriteLine("[GRID CLIENT]: Successfully deregistered region 2");
+            else
+                Console.WriteLine("[GRID CLIENT]: region 2 failed to deregister");
+            Console.WriteLine("[GRID CLIENT]: *** Deregistering region 3");
+            success = m_Connector.DeregisterRegion(r3.RegionID);
+            if (success)
+                Console.WriteLine("[GRID CLIENT]: Successfully deregistered region 3");
+            else
+                Console.WriteLine("[GRID CLIENT]: region 3 failed to deregister");
+
+        }
+
+        private static GridRegion CreateRegion(string name, uint xcell, uint ycell)
+        {
+            GridRegion region = new GridRegion(xcell, ycell);
+            region.RegionName = name;
+            region.RegionID = UUID.Random();
+            region.ExternalHostName = "127.0.0.1";
+            region.HttpPort = 9000;
+            region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 9000);
+          
+            return region;
+        }
+    }
+}
diff --git a/OpenSim/Tests/Clients/Grid/GridForm.html b/OpenSim/Tests/Clients/Grid/GridForm.html
new file mode 100644
index 0000000..252920f
--- /dev/null
+++ b/OpenSim/Tests/Clients/Grid/GridForm.html
@@ -0,0 +1,11 @@
+<html>
+
+<form name="input" action="http://127.0.0.1:8002/grid" method="post">
+xmin:<input type="text" name="XMIN" value="0">
+xmax:<input type="text" name="XMAX" value="0">
+ymin:<input type="text" name="YMIN" value="0">
+ymax:<input type="text" name="YMAX" value="0">
+<input type="hidden" name="METHOD" value="get_region_range">
+<input type="submit" value="Submit" />
+</form>
+</html>
diff --git a/OpenSim/Tests/Common/LongRunningAttribute.cs b/OpenSim/Tests/Common/LongRunningAttribute.cs
index 37cbbcd..9831ea8 100644
--- a/OpenSim/Tests/Common/LongRunningAttribute.cs
+++ b/OpenSim/Tests/Common/LongRunningAttribute.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common
         }
 
         protected LongRunningAttribute(string category) : base(category)
-        {            
+        {
         }
     }
 }
diff --git a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
index 3981fe9..20ea18f 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Tests.Common.Mock
     /// tests are single threaded.
     /// </summary>
     public class TestAssetDataPlugin : BaseAssetRepository, IAssetDataPlugin
-    {        
+    {
         public string Version { get { return "0"; } }
         public string Name { get { return "TestAssetDataPlugin"; } }
 
@@ -59,6 +59,6 @@ namespace OpenSim.Tests.Common.Mock
             assets.Add(asset);
         }
 
-        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }        
+        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/TestAssetService.cs
index 81f123a..317ec06 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetService.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetService.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Tests.Common.Mock
             if (Assets.ContainsKey(id))
                 asset = Assets[id];
             else
-                asset = null;            
+                asset = null;
             
             return asset;
         }
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Mock
         }
 
         public bool Get(string id, object sender, AssetRetrieved handler)
-        {            
+        {
             handler(id, sender, Get(id));
             
             return true;
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index 4313c96..013462e 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Tests.Common.Mock
 
         public TestCommunicationsManager(NetworkServersInfo serversInfo)
             : base(serversInfo, null)
-        {                        
+        {
 
             LocalUserServices lus = new LocalUserServices(991, 992, this);
             lus.AddPlugin(new TemporaryUserProfilePlugin());
@@ -65,8 +65,6 @@ namespace OpenSim.Tests.Common.Mock
             m_userService = lus;
             m_userAdminService = lus;
 
-            LocalBackEndServices gs = new LocalBackEndServices();
-            m_gridService = gs;
         }
     }
 }
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index daef38b..0c7ebca 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Tests.Common.Mock
         //// <value>
         /// Inventory items
         /// </value>
-        private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>();        
+        private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>();
 
         /// <value>
         /// User root folders
@@ -120,7 +120,7 @@ namespace OpenSim.Tests.Common.Mock
             }
 
             return folders;
-        }        
+        }
 
         public InventoryFolderBase getInventoryFolder(UUID folderId)
         {
@@ -191,7 +191,7 @@ namespace OpenSim.Tests.Common.Mock
         public InventoryItemBase queryInventoryItem(UUID item)
         {
             return null;
-        }        
+        }
 
         public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; }
     }
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index f7eda68..01b5203 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Tests.Common.Mock
-{       
+{
     /// <summary>
     /// Land channel for test purposes
     /// </summary>
@@ -40,7 +40,7 @@ namespace OpenSim.Tests.Common.Mock
         public List<ILandObject> ParcelsNearPoint(Vector3 position) { return null; }
         public List<ILandObject> AllParcels() { return null; }
         public ILandObject GetLandObject(int x, int y) { return null; }
-        public ILandObject GetLandObject(int localID) { return null; }        
+        public ILandObject GetLandObject(int localID) { return null; }
         public ILandObject GetLandObject(float x, float y) { return null; }
         public bool IsLandPrimCountTainted() { return false; }
         public bool IsForcefulBansAllowed() { return false; }
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 3fc22ba..22cfa2c 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -35,9 +35,9 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Tests.Common.Mock
-{        
+{
     public class TestScene : Scene
-    {        
+    {
         public TestScene(
             RegionInfo regInfo, AgentCircuitManager authen,
             CommunicationsManager commsMan, SceneCommunicationService sceneGridService, StorageManager storeManager,
@@ -60,7 +60,7 @@ namespace OpenSim.Tests.Common.Mock
         {
             reason = String.Empty;
             return true;
-        }        
+        }
             
         public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
         {
diff --git a/OpenSim/Tests/Common/Setup/BaseRequestHandlerTestHelper.cs b/OpenSim/Tests/Common/Setup/BaseRequestHandlerTestHelper.cs
new file mode 100644
index 0000000..eaf8b39
--- /dev/null
+++ b/OpenSim/Tests/Common/Setup/BaseRequestHandlerTestHelper.cs
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 System.Text;
+using NUnit.Framework;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Tests.Common.Setup
+{
+    public class BaseRequestHandlerTestHelper
+    {
+        private static string[] m_emptyStringArray = new string[] { };
+
+        public static void BaseTestGetParams(BaseRequestHandler handler, string assetsPath)
+        {
+            Assert.AreEqual(String.Empty, handler.GetParam(null), "Failed on null path.");
+            Assert.AreEqual(String.Empty, handler.GetParam(""), "Failed on empty path.");
+            Assert.AreEqual(String.Empty, handler.GetParam("s"), "Failed on short url.");
+            Assert.AreEqual(String.Empty, handler.GetParam("corruptUrl"), "Failed on corruptUrl.");
+
+            Assert.AreEqual(String.Empty, handler.GetParam(assetsPath));
+            Assert.AreEqual("/", handler.GetParam(assetsPath + "/"));
+            Assert.AreEqual("/a", handler.GetParam(assetsPath + "/a"));
+            Assert.AreEqual("/b/", handler.GetParam(assetsPath + "/b/"));
+            Assert.AreEqual("/c/d", handler.GetParam(assetsPath + "/c/d"));
+            Assert.AreEqual("/e/f/", handler.GetParam(assetsPath + "/e/f/"));
+        }
+
+        public static void BaseTestSplitParams(BaseRequestHandler handler, string assetsPath)
+        {
+            Assert.AreEqual(m_emptyStringArray, handler.SplitParams(null), "Failed on null.");
+            Assert.AreEqual(m_emptyStringArray, handler.SplitParams(""), "Failed on empty path.");
+            Assert.AreEqual(m_emptyStringArray, handler.SplitParams("corruptUrl"), "Failed on corrupt url.");
+ 
+            Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath), "Failed on empty params.");
+            Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath + "/"), "Failed on single slash.");
+
+            Assert.AreEqual(new string[] { "a" }, handler.SplitParams(assetsPath + "/a"), "Failed on first segment.");
+            Assert.AreEqual(new string[] { "b" }, handler.SplitParams(assetsPath + "/b/"), "Failed on second slash.");
+            Assert.AreEqual(new string[] { "c", "d" }, handler.SplitParams(assetsPath + "/c/d"), "Failed on second segment.");
+            Assert.AreEqual(new string[] { "e", "f" }, handler.SplitParams(assetsPath + "/e/f/"), "Failed on trailing slash.");
+        }
+
+        public static byte[] EmptyByteArray = new byte[] {};
+
+    }
+}
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 0d8baad..53f24d9 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -44,6 +44,7 @@ using OpenSim.Region.CoreModules.Agent.Capabilities;
 using OpenSim.Region.CoreModules.Avatar.Gods;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common.Mock;
 
@@ -58,6 +59,7 @@ namespace OpenSim.Tests.Common.Setup
         // CommunicationsManager. 
         private static ISharedRegionModule m_assetService = null;
         private static ISharedRegionModule m_inventoryService = null;
+        private static ISharedRegionModule m_gridService = null;
         private static TestCommunicationsManager commsManager = null;
 
         /// <summary>
@@ -110,6 +112,7 @@ namespace OpenSim.Tests.Common.Setup
             return SetupScene(name, id, x, y, cm, "");
         }
 
+
         /// <summary>
         /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions
         /// or a different, to get a brand new scene with new shared region modules.
@@ -176,6 +179,9 @@ namespace OpenSim.Tests.Common.Setup
                     StartInventoryService(testScene, true);
                 else
                     StartInventoryService(testScene, false);
+                if (realServices.Contains("grid"))
+                    StartGridService(testScene, true);
+
             }
             // If not, make sure the shared module gets references to this new scene
             else
@@ -241,6 +247,29 @@ namespace OpenSim.Tests.Common.Setup
             m_inventoryService = inventoryService;
         }
 
+        private static void StartGridService(Scene testScene, bool real)
+        {
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.AddConfig("GridService");
+            config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
+            config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
+            if (real)
+                config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
+            if (m_gridService == null)
+            {
+                ISharedRegionModule gridService = new LocalGridServicesConnector();
+                gridService.Initialise(config);
+                m_gridService = gridService;
+            }
+            //else
+            //    config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService");
+            m_gridService.AddRegion(testScene);
+            m_gridService.RegionLoaded(testScene);
+            //testScene.AddRegionModule(m_gridService.Name, m_gridService);
+        }
+
+
         /// <summary>
         /// Setup modules for a scene using their default settings.
         /// </summary>
diff --git a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
index 3528072..7e0c567 100644
--- a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
@@ -31,10 +31,10 @@ using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Tests.Common
-{       
+{
     /// <summary>
     /// Utility functions for carrying out user inventory related tests.
-    /// </summary>        
+    /// </summary>
     public static class UserInventoryTestUtils
     {
         public static readonly string PATH_DELIMITER = "/";
@@ -78,7 +78,7 @@ namespace OpenSim.Tests.Common
         /// </param>
         /// <returns>
         /// The folder created.  If the path contains multiple folders then the last one created is returned.
-        /// </returns>        
+        /// </returns>
         public static InventoryFolderBase CreateInventoryFolder(
             IInventoryService inventoryService, InventoryFolderBase parentFolder, string path)
         {
@@ -91,7 +91,7 @@ namespace OpenSim.Tests.Common
             if (components.Length > 1)
                 return CreateInventoryFolder(inventoryService, newFolder, components[1]);
             else
-                return newFolder;            
+                return newFolder;
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index 4ad9926..3ca44a1 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -31,12 +31,12 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
 
 namespace OpenSim.Tests.Common.Setup
-{    
+{
     /// <summary>
     /// Utility functions for carrying out user profile related tests.
     /// </summary>
     public static class UserProfileTestUtils
-    {           
+    {
         /// <summary>
         /// Create a test user with a standard inventory
         /// </summary>
@@ -51,7 +51,7 @@ namespace OpenSim.Tests.Common.Setup
         {
             UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
             return CreateUserWithInventory(commsManager, userId, callback);
-        }        
+        }
         
         /// <summary>
         /// Create a test user with a standard inventory
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Setup
         /// <returns></returns>
         public static CachedUserInfo CreateUserWithInventory(
             CommunicationsManager commsManager, UUID userId, OnInventoryReceivedDelegate callback)
-        {                                    
+        {
             return CreateUserWithInventory(commsManager, "Bill", "Bailey", userId, callback);
         }
 
@@ -84,8 +84,8 @@ namespace OpenSim.Tests.Common.Setup
         public static CachedUserInfo CreateUserWithInventory(
             CommunicationsManager commsManager, string firstName, string lastName, 
             UUID userId, OnInventoryReceivedDelegate callback)
-        {                        
-            LocalUserServices lus = (LocalUserServices)commsManager.UserService;           
+        {
+            LocalUserServices lus = (LocalUserServices)commsManager.UserService;
             lus.AddUser(firstName, lastName, "troll", "bill@bailey.com", 1000, 1000, userId);
             
             CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
@@ -93,6 +93,6 @@ namespace OpenSim.Tests.Common.Setup
             userInfo.FetchInventory();
             
             return userInfo;
-        }        
+        }
     }
 }
diff --git a/OpenSim/Tools/Compiler/Program.cs b/OpenSim/Tools/Compiler/Program.cs
index 0141f48..b18e029 100644
--- a/OpenSim/Tools/Compiler/Program.cs
+++ b/OpenSim/Tools/Compiler/Program.cs
@@ -1,3 +1,29 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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;
@@ -11,19 +37,19 @@ namespace OpenSim.Tools.LSL.Compiler
     class Program
     {
         private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; 
-                private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
+        private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
 
         static void Main(string[] args)
         {
-                         string source = null;
+             string source = null;
 
-             if(args.Length == 0)
+             if (args.Length == 0)
              {
                  Console.WriteLine("No input file specified");
                  Environment.Exit(1);
              }
 
-             if(!File.Exists(args[0]))
+             if (!File.Exists(args[0]))
              {
                  Console.WriteLine("Input file does not exist");
                  Environment.Exit(1);
@@ -110,11 +136,7 @@ namespace OpenSim.Tools.LSL.Compiler
                 string errtext = String.Empty;
                 foreach (CompilerError CompErr in results.Errors)
                 {
-                    string severity = "Error";
-                    if ( CompErr.IsWarning )
-                    {
-                        severity = "Warning";
-                    }
+                    string severity = CompErr.IsWarning ? "Warning" : "Error";
 
                     KeyValuePair<int, int> lslPos;
 
@@ -127,8 +149,8 @@ namespace OpenSim.Tools.LSL.Compiler
                     // The Second Life viewer's script editor begins
                     // countingn lines and columns at 0, so we subtract 1.
                     errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
-                            lslPos.Key - 1, lslPos.Value - 1,
-                            CompErr.ErrorNumber, text, severity);
+                                             lslPos.Key - 1, lslPos.Value - 1,
+                                             CompErr.ErrorNumber, text, severity);
                 }
                 
                 disp = "Completed with errors";
@@ -211,20 +233,20 @@ namespace OpenSim.Tools.LSL.Compiler
         private static string ReplaceTypes(string message)
         {
             message = message.Replace(
-                    "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString",
-                    "string");
+                "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString",
+                "string");
 
             message = message.Replace(
-                    "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger",
-                    "integer");
+                "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger",
+                "integer");
 
             message = message.Replace(
-                    "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat",
-                    "float");
+                "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat",
+                "float");
 
             message = message.Replace(
-                    "OpenSim.Region.ScriptEngine.Shared.LSL_Types.list",
-                    "list");
+                "OpenSim.Region.ScriptEngine.Shared.LSL_Types.list",
+                "list");
 
             return message;
         }
@@ -237,7 +259,7 @@ namespace OpenSim.Tools.LSL.Compiler
         private class kvpSorter : IComparer<KeyValuePair<int,int>>
         {
             public int Compare(KeyValuePair<int,int> a,
-                    KeyValuePair<int,int> b)
+                               KeyValuePair<int,int> b)
             {
                 return a.Key.CompareTo(b.Key);
             }
diff --git a/bin/OpenSim.Example.xml b/bin/OpenSim.Example.xml
deleted file mode 100644
index 12133e6..0000000
--- a/bin/OpenSim.Example.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Nini>
-  <Section Name="Startup">
-    <Key Name="gridmode" Value="False" />
-    <Key Name="physics" Value="basicphysics" />
-    <Key Name="physical_prim" Value="True" />
-    <Key Name="see_into_this_sim_from_neighbor" Value="True" />
-    <Key Name="serverside_object_permissions" Value="False" />
-    <Key Name="storage_plugin" Value="OpenSim.Data.SQLite.dll" />
-    <Key Name="storage_connection_string" Value="URI=file:OpenSim.db,version=3" />
-    <Key Name="storage_prim_inventories" Value="True" />
-    <Key Name="startup_console_commands_file" Value="" />
-    <Key Name="shutdown_console_commands_file" Value="" />
-    <Key Name="script_engine" Value="OpenSim.Region.ScriptEngine.DotNetEngine.dll" />
-    <Key Name="asset_database" Value="sqlite" />
-    <Key Name="clientstack_plugin" Value="OpenSim.Region.ClientStack.LindenUDP.dll" />
-  </Section>
-  <Section Name="StandAlone">
-    <Key Name="accounts_authenticate" Value="False" />
-    <Key Name="welcome_message" Value="Welcome to OpenSimulator" />
-    <Key Name="inventory_plugin" Value="OpenSim.Data.SQLite.dll" />
-    <Key Name="inventory_source" Value="" />
-    <Key Name="userDatabase_plugin" Value="OpenSim.Data.SQLite.dll" />
-    <Key Name="user_source" Value="" />
-    <Key Name="asset_plugin" Value="OpenSim.Data.SQLite.dll" />
-    <Key Name="asset_source" Value="" />
-    <Key Name="dump_assets_to_file" Value="False" />
-  </Section>
-  <Section Name="Network">
-    <Key Name="default_location_x" Value="1000" />
-    <Key Name="default_location_y" Value="1000" />
-    <Key Name="http_listener_port" Value="9000" />
-    <Key Name="remoting_listener_port" Value="8895" />
-    <Key Name="grid_server_url" Value="http://127.0.0.1:8001" />
-    <Key Name="grid_send_key" Value="null" />
-    <Key Name="grid_recv_key" Value="null" />
-    <Key Name="user_server_url" Value="http://127.0.0.1:8002" />
-    <Key Name="user_send_key" Value="null" />
-    <Key Name="user_recv_key" Value="null" />
-    <Key Name="asset_server_url" Value="http://127.0.0.1:8003" />
-    <Key Name="inventory_server_url" Value="http://127.0.0.1:8004" />
-  </Section>
-  <Section Name="RemoteAdmin">
-    <Key Name="enabled" Value="false" />
-  </Section>
-  <Section Name="Voice">
-    <Key Name="enabled" Value="false" />
-  </Section>
-</Nini>
\ No newline at end of file
diff --git a/bin/OpenSim.Grid.AssetServer.exe.config b/bin/OpenSim.Grid.AssetServer.exe.config
deleted file mode 100644
index 58404fd..0000000
--- a/bin/OpenSim.Grid.AssetServer.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.Grid.AssetServer.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSim.Grid.InventoryServer.exe.config b/bin/OpenSim.Grid.InventoryServer.exe.config
deleted file mode 100644
index b1315c1..0000000
--- a/bin/OpenSim.Grid.InventoryServer.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.Grid.InventoryServer.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSim.GridServer.ini.example b/bin/OpenSim.GridServer.ini.example
new file mode 100644
index 0000000..8bd126f
--- /dev/null
+++ b/bin/OpenSim.GridServer.ini.example
@@ -0,0 +1,35 @@
+; * The startup section lists all the connectors to start up in this server
+; * instance. This may be only one, or it may be the entire server suite.
+; * Multiple connectors should be seaprated by commas.
+; *
+; * These are the IN connectors the server uses, the in connectors
+; * read this config file and load the needed OUT and database connectors
+; *
+; *
+[Startup]
+        ServiceConnectors = "OpenSim.Server.Handlers.dll:GridServiceConnector"
+
+; * This is common for all services, it's the network setup for the entire
+; * server instance
+; *
+[Network]
+        port = 8001
+
+; * The following are for the remote console
+; * They have no effect for the local or basic console types
+; * Leave commented to diable logins to the console
+;ConsoleUser = Test
+;ConsolePass = secret
+
+; * As an example, the below configuration precisely mimicks the legacy
+; * asset server. It is read by the asset IN connector (defined above)
+; * and it then loads the OUT connector (a local database module). That,
+; * in turn, reads the asset loader and database connection information
+; *
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+        ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+        ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+        Realm = "regions"
+
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 5696f07..635ba1e 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -9,7 +9,7 @@
 ; * enable the experimental authentication service
 ; *
 [Startup]
-ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
+ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance
@@ -70,3 +70,12 @@ StorageProvider = "OpenSim.Data.MySQL.dll"
 ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
 ; Realm = "users"
 
+; * This is the new style grid service.
+; * "Realm" is the table that is used for user lookup.
+; * It defaults to "regions", which uses the legacy tables
+; *
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+        ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
+        Realm = "regions"
diff --git a/bin/OpenSim.Services.ini.example b/bin/OpenSim.Services.ini.example
deleted file mode 100644
index b2e0f96..0000000
--- a/bin/OpenSim.Services.ini.example
+++ /dev/null
@@ -1,19 +0,0 @@
-[Startup]
-; These are also available as command line options
-
-; console = "local" ; Use "basic" to use this on a pipe
-; inifile = "OpenSim.Servers.AssetServer.ini"
-; logfile = "AssetServer.log" ; Also read from application config file
-
-; Connectors, comma separated
-ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector"
-
-[Network]
-port = 8003
-
-[AssetService]
-LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim;"
-DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-AssetLoaderArgs = "assets/AssetSets.xml"
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1f42ef2..50198b3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -305,6 +305,10 @@
     http_listener_sslport = 9001 ; Use this port for SSL connections
     http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
 
+    ; Hostname to use in llRequestURL/llRequestSecureURL
+    ; if not defined - default machine name is being used 
+    ; (on Windows this mean NETBIOS name - useably only inside local network)
+    ; ExternalHostNameForLSL=127.0.0.1
     ; Uncomment below to enable llRemoteData/remote channels
     ; remoteDataPort = 20800
 
@@ -322,7 +326,7 @@
 
     ; The MessagingServer is a companion of the UserServer. It uses
     ; user_send_key and user_recv_key, too
-    messaging_server_url = "http://127.0.0.1:8006"
+    ;messaging_server_url = "http://127.0.0.1:8006"
 
     ; What is reported as the "X-Secondlife-Shard"
     ; Defaults to the user server url if not set
@@ -1307,7 +1311,7 @@
     ;NoticesEnabled   = true
 
     ; This makes the Groups modules very chatty on the console.
-    ;DebugEnabled     = true
+    DebugEnabled     = false
 
     ; Specify which messaging module to use for groups messaging and if it's enabled
     ;MessagingModule = GroupsMessagingModule
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 10f7dbd..261c1b8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,5 +12,12 @@
     InventoryServices = "RemoteInventoryServicesConnector"
     AuthorizationServices = "RemoteAuthorizationServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "RemoteGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
+
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        ; for the LocalGridServicesConnector which is used by the Remote one
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    
\ No newline at end of file
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3a8ec35..e9d3728 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -15,6 +15,11 @@
     ;
     InventoryServerURI = "http://myinventoryserver.com:8004"
 
+[GridService]
+    ;
+    ; change this to your grid-wide inventory server
+    ;
+    GridServerURI = "http://mygridserver.com:8001"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8b65ab8..f5aa603 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,13 +7,17 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
 
+[Startup]
+        hypergrid = true
+
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "HGGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
-
+    HypergridServiceInConnector = true
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -22,3 +26,11 @@
 [InventoryService]
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+
+[GridService]
+    ; for the HGGridServicesConnector to instantiate
+        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+        ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
+        ; which in turn uses this
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 24020b6..a6c089c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -12,6 +12,7 @@
     InventoryServices = "LocalInventoryServicesConnector"
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
+    GridServices = "LocalGridServicesConnector"
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,3 +22,7 @@
     
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
+
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    Realm = "regions"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bac7983..b0e2de3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -32,3 +32,10 @@
 [FreeswitchService]
     ;; Configuration for the freeswitch service goes here
     LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+
+[GridService]
+    ;; For in-memory region storage (default)
+        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    ;;--- For MySql region storage (alternative)
+        ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+        ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index aa122be..baff811 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -7,14 +7,21 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
 
+[Startup]
+        hypergrid = true
+        
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "LocalNeighbourServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
+    GridServices = "HGGridServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
+    HypergridServiceInConnector = true
+    NeighbourServiceInConnector = true
+
 
 [AssetService]
     ; For the AssetServiceInConnector
@@ -39,4 +46,9 @@
     ; For the HGAuthServiceInConnector
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
     
-    
\ No newline at end of file
+[GridService]
+    ; for the HGGridServicesConnector to instantiate
+        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
+        ; LocalGridServicesConnector needs this
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        Realm = "regions"
diff --git a/prebuild.xml b/prebuild.xml
index 70f5cfd..22ff3d7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -170,7 +170,9 @@
       <Reference name="OpenSim.Framework"/>
 
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude name="Tests" pattern="Tests"/>
+        </Match>
       </Files>
     </Project>
 
@@ -371,7 +373,6 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="OpenSim.Data"/>
-      <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Framework.Console"/>
@@ -956,7 +957,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer.Modules" path="OpenSim/Grid/UserServer.Modules" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -972,23 +973,17 @@
       <Reference name="System"/>
       <Reference name="System.Data"/>
       <Reference name="System.Xml"/>
-      <Reference name="System.Web"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Data"/>
-      <Reference name="OpenSim.Framework.Capabilities"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="OpenSim.Grid.Framework"/>
-      <Reference name="OpenSim.Grid.Communications.OGS1"/>
-      <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenMetaverseTypes.dll"/>
-      <Reference name="OpenMetaverse.StructuredData.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="log4net.dll"/>
-      <Reference name="DotNetOpenId.dll"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
@@ -996,7 +991,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
+    <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer" path="OpenSim/Grid/MessagingServer" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1012,31 +1007,26 @@
       <Reference name="System"/>
       <Reference name="System.Data"/>
       <Reference name="System.Xml"/>
-      <Reference name="System.Web"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
-      <Reference name="OpenSim.Grid.Communications.OGS1"/>
       <Reference name="OpenSim.Grid.Framework"/>
-      <Reference name="OpenSim.Grid.UserServer.Modules"/>
+      <Reference name="OpenSim.Grid.MessagingServer.Modules"/>
       <Reference name="OpenMetaverseTypes.dll"/>
-      <Reference name="OpenMetaverse.StructuredData.dll"/>
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="log4net.dll"/>
       <Reference name="Nini.dll"/>
-      <Reference name="DotNetOpenId.dll"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1050,18 +1040,14 @@
 
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
-      <Reference name="System.Data"/>
       <Reference name="System.Xml"/>
+      <Reference name="System.Web"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Data"/>
-      <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Grid.Framework"/>
-      <Reference name="OpenMetaverseTypes.dll"/>
-      <Reference name="OpenMetaverse.dll"/>
-      <Reference name="XMLRPC.dll"/>
+      <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
 
       <Files>
@@ -1069,8 +1055,7 @@
       </Files>
     </Project>
 
-
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer" path="OpenSim/Grid/MessagingServer" type="Exe">
+    <Project frameworkVersion="v3_5" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1084,28 +1069,20 @@
 
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
-      <Reference name="System.Data"/>
-      <Reference name="System.Xml"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Data"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Grid.Framework"/>
-      <Reference name="OpenSim.Grid.MessagingServer.Modules"/>
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
-      <Reference name="XMLRPC.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
-      <Reference name="Nini.dll"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Services.UserService" path="OpenSim/Services/UserService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1123,7 +1100,10 @@
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Services.Base"/>
+      <Reference name="OpenSim.Data"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
 
@@ -1132,7 +1112,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.UserService" path="OpenSim/Services/UserService" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1146,23 +1126,28 @@
 
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Drawing"/>
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenMetaverse.StructuredData.dll"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="OpenSim.Services.Base"/>
-      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Server.Base"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
+      <Reference name="XMLRPC.dll" />
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
+
+    <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer.Modules" path="OpenSim/Grid/UserServer.Modules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1176,25 +1161,75 @@
 
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
+      <Reference name="System.Data"/>
       <Reference name="System.Xml"/>
-      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="System.Web"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework.Capabilities"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Framework.Statistics"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Services.Connectors"/>
+      <Reference name="OpenSim.Grid.Framework"/>
+      <Reference name="OpenSim.Grid.Communications.OGS1"/>
       <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.StructuredData.dll"/>
-      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="XMLRPC.dll"/>
+      <Reference name="log4net.dll"/>
+      <Reference name="DotNetOpenId.dll"/>
+      <Reference name="Nini.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+
+    <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Web"/>
       <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="Nini.dll" />
+      <Reference name="OpenSim.Framework.Statistics"/>
+      <Reference name="OpenSim.Grid.Communications.OGS1"/>
+      <Reference name="OpenSim.Grid.Framework"/>
+      <Reference name="OpenSim.Grid.UserServer.Modules"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.StructuredData.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="XMLRPC.dll"/>
       <Reference name="log4net.dll"/>
-      <Reference name="XMLRPC.dll" />
+      <Reference name="Nini.dll"/>
+      <Reference name="DotNetOpenId.dll"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
 
-
     <Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -1319,7 +1354,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1336,7 +1371,6 @@
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Capabilities"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Services.Interfaces"/>
@@ -1351,7 +1385,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1365,13 +1399,16 @@
 
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Web"/>
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Capabilities"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Services.Base"/>
+      <Reference name="OpenSim.Services.Connectors"/>
+      <Reference name="OpenSim.Data"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
 
@@ -1380,6 +1417,7 @@
       </Files>
     </Project>
 
+
     <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -3134,7 +3172,7 @@
       </Files>
     </Project>
 
-    <Project name="lslc" path="OpenSim/Tools/Compiler" type="Exe">
+    <Project name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3189,6 +3227,35 @@
       </Files>
     </Project>
 
+    <!-- Test Clients -->
+    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Services.Interfaces" />
+      <Reference name="OpenSim.Services.Connectors" />
+      <Reference name="Nini.dll" />
+      <Reference name="log4net.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+
     <!-- Test assemblies -->
     <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
       <Configuration name="Debug">
@@ -3406,6 +3473,38 @@
       </Files>
     </Project>
 
+    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.StructuredData.dll"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Tests.Common"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Serialization"/>
+      <Reference name="OpenSim.Framework.Serialization.External"/>
+      <Reference name="log4net.dll"/>
+      <Reference name="nunit.framework.dll" />
+
+      <Files>
+        <Match pattern="*.cs" recurse="true">
+        </Match>
+      </Files>
+    </Project>
+
     <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -3531,6 +3630,7 @@
         <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true" />
         <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true" />
         <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true" />
+        <Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true" />
       </Files>
     </Project>
 
@@ -3564,6 +3664,7 @@
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
 
       <!-- Unit tests -->
       <!-- <Reference name="OpenSim.Tests.Common"/> -->
@@ -3617,6 +3718,7 @@
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
       <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="OpenSim.Tests.Common"/>
 
       <Files>