Formatting cleanup. Minor refactoring.

3 files changed, 95 insertions, 111 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 8cc1312..de891a2 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -212,6 +212,7 @@ namespace OpenSim.Region.Communications.Local
             }
             return mapBlocks;
         }
+
         public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
@@ -245,7 +246,7 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-        // This function Is only here to keep this class in line with the Grid Interface.
+        // 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()
         {
@@ -291,14 +292,15 @@ namespace OpenSim.Region.Communications.Local
             }
             return false;
         }
-        /// <summary> 
+
+        /// <summary>
+        /// 
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="agentData"></param>
         /// <returns></returns>
-        /// 
         public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
-            //should change from agentCircuitData
+            // TODO: should change from agentCircuitData
         {
             //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
             //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname);
@@ -352,8 +354,6 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-       
-
         public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index eff597e..dca8e65 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.Communications.Local
             authUsers = authenticate;
         }
 
-
         public override UserProfileData GetTheUser(string firstname, string lastname)
         {
             UserProfileData profile = m_userManager.GetUserProfile(firstname, lastname);
@@ -189,6 +188,7 @@ namespace OpenSim.Region.Communications.Local
                 m_log.Warn("[LOGIN]: Not found region " + currentRegion);
             }
         }
+
         private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL)
         {
             LoginResponse.BuddyList buddylistreturn = new LoginResponse.BuddyList();
@@ -199,10 +199,10 @@ namespace OpenSim.Region.Communications.Local
                 buddyitem.BuddyRightsHave = (int)fl.FriendListOwnerPerms;
                 buddyitem.BuddyRightsGiven = (int)fl.FriendPerms;
                 buddylistreturn.AddNewBuddy(buddyitem);
-
             }
             return buddylistreturn;
         }
+
         protected override InventoryData CreateInventoryData(LLUUID userID)
         {
             List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index b7fae65..f324886 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -134,7 +134,8 @@ namespace OpenSim.Region.Communications.OGS1
             {
                 GridReq = new XmlRpcRequest("simulator_login", SendParams);
                 GridResp = GridReq.Send(serversInfo.GridURL, 16000);
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 m_log.Error("Unable to connect to grid. Grid server not running?");
                 throw(ex);
@@ -182,7 +183,8 @@ namespace OpenSim.Region.Communications.OGS1
             Hashtable griddatahash = GridRespData;
 
             // Process Response
-            if (GridRespData.ContainsKey("error")) {
+            if (GridRespData.ContainsKey("error"))
+            {
                 string errorstring = (string)GridRespData["error"];
                 m_log.Error("Unable to connect to grid: " + errorstring);
                 return false;
@@ -202,7 +204,6 @@ namespace OpenSim.Region.Communications.OGS1
                     returnGridSettings.Add(Dictkey, m_queuedGridSettings[Dictkey]);
                 }
 
-
                 m_queuedGridSettings.Clear();
             }
 
@@ -308,10 +309,7 @@ namespace OpenSim.Region.Communications.OGS1
                 return regionInfo;
             }
 
-            if (m_remoteRegionInfoCache.TryGetValue(regionHandle, out regionInfo))
-            {
-            }
-            else
+            if (!m_remoteRegionInfoCache.TryGetValue(regionHandle, out regionInfo))
             {
                 try
                 {
@@ -366,54 +364,51 @@ namespace OpenSim.Region.Communications.OGS1
             // Don't use this method.  It's only for SLURLS and Logins
             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 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;
+                Hashtable responseData = (Hashtable) GridResp.Value;
 
-                    if (responseData.ContainsKey("error"))
-                    {
-                        m_log.Error("[OGS1 GRID SERVICES]: Error received from grid server" + responseData["error"]);
-                        return null;
-                    }
+                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 internalIpStr = (string) responseData["sim_ip"];
-                    uint port = Convert.ToUInt32(responseData["sim_port"]);
-                    string externalUri = (string) responseData["sim_uri"];
+                uint regX = Convert.ToUInt32((string) responseData["region_locx"]);
+                uint regY = Convert.ToUInt32((string) responseData["region_locy"]);
+                string internalIpStr = (string) responseData["sim_ip"];
+                uint port = Convert.ToUInt32(responseData["sim_port"]);
+                string externalUri = (string) responseData["sim_uri"];
 
-                    IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
-                    string neighbourExternalUri = externalUri;
-                    regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
+                IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
+                string neighbourExternalUri = externalUri;
+                regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
 
-                    regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
-                    regionInfo.RemotingAddress = internalIpStr;
+                regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
+                regionInfo.RemotingAddress = internalIpStr;
 
-                    regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]);
-                    regionInfo.RegionName = (string) responseData["region_name"];
+                regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]);
+                regionInfo.RegionName = (string) responseData["region_name"];
 
-                    m_remoteRegionInfoCache.Add(regionInfo.RegionHandle, regionInfo);
-                }
-                catch (WebException)
-                {
-                    m_log.Error("[OGS1 GRID SERVICES]: " +
-                                "Region lookup failed for: " + regionName +
-                                " - Is the GridServer down?");
-                }
-            
+                m_remoteRegionInfoCache.Add(regionInfo.RegionHandle, regionInfo);
+            }
+            catch (WebException)
+            {
+                m_log.Error("[OGS1 GRID SERVICES]: " +
+                            "Region lookup failed for: " + regionName +
+                            " - Is the GridServer down?");
+            }
 
             return regionInfo;
-            
         }
 
-
         /// <summary>
         /// 
         /// </summary>
@@ -465,9 +460,6 @@ namespace OpenSim.Region.Communications.OGS1
             return neighbours;
         }
 
-
-        
-
         /// <summary>
         /// Performs a XML-RPC query against the grid server returning mapblock information in the specified coordinates
         /// </summary>
@@ -519,7 +511,6 @@ namespace OpenSim.Region.Communications.OGS1
             return response;
         }
 
-
         // Grid Request Processing
         /// <summary>
         /// Received from the user server when a user starts logging in.  This call allows
@@ -596,7 +587,6 @@ namespace OpenSim.Region.Communications.OGS1
             InterRegionSingleton.Instance.OnRegionUp += TriggerRegionUp;
             InterRegionSingleton.Instance.OnChildAgentUpdate += TriggerChildAgentUpdate;
             InterRegionSingleton.Instance.OnTellRegionToCloseChildConnection += TriggerTellRegionToCloseChildConnection;
-            
         }
 
         #region Methods called by regions in this instance
@@ -629,10 +619,10 @@ namespace OpenSim.Region.Communications.OGS1
 
 
                         OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
-                                                                                          typeof(OGS1InterRegionRemoting),
-                                                                                          "tcp://" + regInfo.RemotingAddress +
-                                                                                          ":" + regInfo.RemotingPort +
-                                                                                          "/InterRegions");
+                            typeof(OGS1InterRegionRemoting),
+                            "tcp://" + regInfo.RemotingAddress +
+                            ":" + regInfo.RemotingPort +
+                            "/InterRegions");
 
                         if (remObject != null)
                         {
@@ -738,29 +728,27 @@ namespace OpenSim.Region.Communications.OGS1
                     //don't want to be creating a new link to the remote instance every time like we are here
                     bool retValue = false;
 
+                    OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
+                        typeof(OGS1InterRegionRemoting),
+                        "tcp://" + regInfo.RemotingAddress +
+                        ":" + regInfo.RemotingPort +
+                        "/InterRegions");
 
-                        OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
-                                                                                          typeof(OGS1InterRegionRemoting),
-                                                                                          "tcp://" + regInfo.RemotingAddress +
-                                                                                          ":" + regInfo.RemotingPort +
-                                                                                          "/InterRegions");
-
-                        if (remObject != null)
-                        {
-                            retValue = remObject.InformRegionOfChildAgent(regionHandle, new sAgentCircuitData(agentData));
-                        }
-                        else
-                        {
-                            m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found");
-                        }
-                        remObject = null;
-                        m_log.Info("[OGS1 GRID SERVICES]: " +
-                                   gdebugRegionName + ": OGS1 tried to InformRegionOfChildAgent for " +
-                                   agentData.firstname + " " + agentData.lastname + " and got " +
-                                   retValue.ToString());
-
-                        return retValue;
+                    if (remObject != null)
+                    {
+                        retValue = remObject.InformRegionOfChildAgent(regionHandle, new sAgentCircuitData(agentData));
+                    }
+                    else
+                    {
+                        m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found");
+                    }
+                    remObject = null;
+                    m_log.Info("[OGS1 GRID SERVICES]: " +
+                               gdebugRegionName + ": OGS1 tried to InformRegionOfChildAgent for " +
+                               agentData.firstname + " " + agentData.lastname + " and got " +
+                               retValue.ToString());
 
+                    return retValue;
                 }
                 NoteDeadRegion(regionHandle);
                 return false;
@@ -849,14 +837,12 @@ namespace OpenSim.Region.Communications.OGS1
                         //don't want to be creating a new link to the remote instance every time like we are here
                         bool retValue = false;
 
-
                         OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting) Activator.GetObject(
-                                                                                          typeof (
-                                                                                              OGS1InterRegionRemoting),
-                                                                                          "tcp://" +
-                                                                                          regInfo.RemotingAddress +
-                                                                                          ":" + regInfo.RemotingPort +
-                                                                                          "/InterRegions");
+                            typeof(OGS1InterRegionRemoting),
+                            "tcp://" +
+                            regInfo.RemotingAddress +
+                            ":" + regInfo.RemotingPort +
+                            "/InterRegions");
 
                         if (remObject != null)
                         {
@@ -939,7 +925,7 @@ namespace OpenSim.Region.Communications.OGS1
         /// <returns></returns>
         public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
         {
-             int failures = 0;
+            int failures = 0;
             lock (m_deadRegionCache)
             {
                 if (m_deadRegionCache.ContainsKey(regionHandle))
@@ -963,12 +949,11 @@ namespace OpenSim.Region.Communications.OGS1
                         //don't want to be creating a new link to the remote instance every time like we are here
                         bool retValue = false;
 
-
                         OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
-                                                                                          typeof(OGS1InterRegionRemoting),
-                                                                                          "tcp://" + regInfo.RemotingAddress +
-                                                                                          ":" + regInfo.RemotingPort +
-                                                                                          "/InterRegions");
+                            typeof(OGS1InterRegionRemoting),
+                            "tcp://" + regInfo.RemotingAddress +
+                            ":" + regInfo.RemotingPort +
+                            "/InterRegions");
 
                         if (remObject != null)
                         {
@@ -980,7 +965,6 @@ namespace OpenSim.Region.Communications.OGS1
                         }
                         remObject = null;
 
-
                         return retValue;
                     }
                     NoteDeadRegion(regionHandle);
@@ -1050,10 +1034,11 @@ namespace OpenSim.Region.Communications.OGS1
                 {
                     bool retValue = false;
                     OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting) Activator.GetObject(
-                                                                                      typeof (OGS1InterRegionRemoting),
-                                                                                      "tcp://" + regInfo.RemotingAddress +
-                                                                                      ":" + regInfo.RemotingPort +
-                                                                                      "/InterRegions");
+                        typeof (OGS1InterRegionRemoting),
+                        "tcp://" + regInfo.RemotingAddress +
+                        ":" + regInfo.RemotingPort +
+                        "/InterRegions");
+
                     if (remObject != null)
                     {
                         retValue =
@@ -1106,10 +1091,11 @@ namespace OpenSim.Region.Communications.OGS1
                 {
                     bool retValue = false;
                     OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting) Activator.GetObject(
-                                                                                      typeof (OGS1InterRegionRemoting),
-                                                                                      "tcp://" + regInfo.RemotingAddress +
-                                                                                      ":" + regInfo.RemotingPort +
-                                                                                      "/InterRegions");
+                        typeof (OGS1InterRegionRemoting),
+                        "tcp://" + regInfo.RemotingAddress +
+                        ":" + regInfo.RemotingPort +
+                        "/InterRegions");
+
                     if (remObject != null)
                     {
                         retValue =
@@ -1181,10 +1167,11 @@ namespace OpenSim.Region.Communications.OGS1
                 {
                     bool retValue = false;
                     OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
-                                                                                      typeof(OGS1InterRegionRemoting),
-                                                                                      "tcp://" + regInfo.RemotingAddress +
-                                                                                      ":" + regInfo.RemotingPort +
-                                                                                      "/InterRegions");
+                        typeof(OGS1InterRegionRemoting),
+                        "tcp://" + regInfo.RemotingAddress +
+                        ":" + regInfo.RemotingPort +
+                        "/InterRegions");
+
                     if (remObject != null)
                     {
                         retValue =
@@ -1211,7 +1198,6 @@ namespace OpenSim.Region.Communications.OGS1
                 //m_log.Debug(e.ToString());
                 return false;
             }
-            
             catch (SocketException e)
             {
                 NoteDeadRegion(regionHandle);
@@ -1312,7 +1298,6 @@ namespace OpenSim.Region.Communications.OGS1
                 {
                     if (m_deadRegionCache.ContainsKey(regionData.RegionHandle))
                     {
-                        
                         m_deadRegionCache.Remove(regionData.RegionHandle);
                     }
                 }
@@ -1356,7 +1341,6 @@ namespace OpenSim.Region.Communications.OGS1
                 m_localBackend.TriggerExpectPrim(regionHandle, primID, objData);
                 return true;
                 //m_localBackend.
-
             }
             catch (RemotingException e)
             {