Merge branch 'master' into vehicles

5 files changed, 39 insertions, 21 deletions

diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
index acdf558..02f2b79 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Services.Connectors
             sendData["METHOD"] = "register";
 
             string reqString = ServerUtils.BuildQueryString(sendData);
-            //m_log.DebugFormat("[GRID CONNECTOR]: queryString = {0}", reqString);
+            // m_log.DebugFormat("[GRID CONNECTOR]: queryString = {0}", reqString);
             try
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 5443891..e047f71 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -416,13 +416,6 @@ namespace OpenSim.Services.Connectors
                      e.Source, e.Message);
             }
 
-            foreach (InventoryItemBase item in items)
-            {
-                InventoryItemBase itm = this.QueryItem(userID, item, sessionID);
-                itm.Name = item.Name;
-                itm.Folder = item.Folder;
-                this.UpdateItem(userID, itm, sessionID);
-            }
         }
 
         private void MoveItemsCompleted(IAsyncResult iar)
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
index 145f212..0a982f8 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
@@ -76,10 +76,12 @@ namespace OpenSim.Services.Connectors
                 // Don't remote-call this instance; that's a startup hickup
                 !((regInfo.ExternalHostName == thisRegion.ExternalHostName) && (regInfo.HttpPort == thisRegion.HttpPort)))
             {
-                DoHelloNeighbourCall(regInfo, thisRegion);
+                if (!DoHelloNeighbourCall(regInfo, thisRegion))
+                    return null;
             }
-            //else
-            //    m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
+            else
+                return null;
+
             return regInfo;
         }
 
@@ -102,6 +104,7 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.Debug("[REST COMMS]: PackRegionInfoData failed with exception: " + e.Message);
+                return false;
             }
             // Add the regionhandle of the destination region
             args["destination_handle"] = OSD.FromString(region.RegionHandle.ToString());
@@ -118,7 +121,7 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of HelloNeighbour: {0}", e.Message);
-                // ignore. buffer will be empty, caller should check.
+                return false;
             }
 
             Stream os = null;
@@ -127,20 +130,23 @@ namespace OpenSim.Services.Connectors
                 HelloNeighbourRequest.ContentLength = buffer.Length;   //Count bytes to send
                 os = HelloNeighbourRequest.GetRequestStream();
                 os.Write(buffer, 0, strBuffer.Length);         //Send it
-                os.Close();
                 //m_log.InfoFormat("[REST COMMS]: Posted HelloNeighbour request to remote sim {0}", uri);
             }
-            //catch (WebException ex)
-            catch
+            catch (Exception ex)
             {
-                //m_log.InfoFormat("[REST COMMS]: Bad send on HelloNeighbour {0}", ex.Message);
-
+                m_log.InfoFormat("[REST COMMS]: Unable to send HelloNeighbour to {0}: {1}", region.RegionName, ex.Message);
                 return false;
             }
+            finally
+            {
+                if (os != null)
+                    os.Close();
+            }
 
             // Let's wait for the response
             //m_log.Info("[REST COMMS]: Waiting for a reply after DoHelloNeighbourCall");
 
+            StreamReader sr = null;
             try
             {
                 WebResponse webResponse = HelloNeighbourRequest.GetResponse();
@@ -149,17 +155,21 @@ namespace OpenSim.Services.Connectors
                     m_log.Info("[REST COMMS]: Null reply on DoHelloNeighbourCall post");
                 }
 
-                StreamReader sr = new StreamReader(webResponse.GetResponseStream());
+                sr = new StreamReader(webResponse.GetResponseStream());
                 //reply = sr.ReadToEnd().Trim();
                 sr.ReadToEnd().Trim();
-                sr.Close();
                 //m_log.InfoFormat("[REST COMMS]: DoHelloNeighbourCall reply was {0} ", reply);
 
             }
-            catch (WebException ex)
+            catch (Exception ex)
             {
                 m_log.InfoFormat("[REST COMMS]: exception on reply of DoHelloNeighbourCall {0}", ex.Message);
-                // ignore, really
+                return false;
+            }
+            finally
+            {
+                if (sr != null)
+                    sr.Close();
             }
 
             return true;
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index a2e4771..86815e5 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -200,6 +200,7 @@ namespace OpenSim.Services.GridService
             rdata.RegionName = rinfo.RegionName;
             rdata.Data = rinfo.ToKeyValuePairs();
             rdata.Data["regionHandle"] = Utils.UIntsToLong((uint)rdata.posX, (uint)rdata.posY);
+            rdata.Data["owner_uuid"] = rinfo.EstateOwner.ToString();
             return rdata;
         }
 
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 2290530..14560b1 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -140,6 +140,14 @@ namespace OpenSim.Services.Interfaces
         }
         protected int m_regionLocY;
 
+        protected UUID m_estateOwner;
+
+        public UUID EstateOwner
+        {
+            get { return m_estateOwner; }
+            set { m_estateOwner = value; }
+        }
+
         public UUID RegionID = UUID.Zero;
         public UUID ScopeID = UUID.Zero;
 
@@ -191,6 +199,7 @@ namespace OpenSim.Services.Interfaces
             Access = ConvertFrom.AccessLevel;
             Maturity = ConvertFrom.RegionSettings.Maturity;
             RegionSecret = ConvertFrom.regionSecret;
+            EstateOwner = ConvertFrom.EstateSettings.EstateOwner;
         }
 
         public GridRegion(GridRegion ConvertFrom)
@@ -207,6 +216,7 @@ namespace OpenSim.Services.Interfaces
             Access = ConvertFrom.Access;
             Maturity = ConvertFrom.Maturity;
             RegionSecret = ConvertFrom.RegionSecret;
+            EstateOwner = ConvertFrom.EstateOwner;
         }
 
         /// <value>
@@ -291,6 +301,7 @@ namespace OpenSim.Services.Interfaces
             kvp["regionMapTexture"] = TerrainImage.ToString();
             kvp["access"] = Access.ToString();
             kvp["regionSecret"] = RegionSecret;
+            kvp["owner_uuid"] = EstateOwner.ToString();
             // Maturity doesn't seem to exist in the DB
             return kvp;
         }
@@ -345,6 +356,9 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("regionSecret"))
                 RegionSecret =(string)kvp["regionSecret"];
 
+            if (kvp.ContainsKey("owner_uuid"))
+                EstateOwner = new UUID(kvp["owner_uuid"].ToString());
+
         }
     }