Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

3 files changed, 27 insertions, 28 deletions

diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
index c5ae0c0..41361ab 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors.Friends
             IConfig gridConfig = source.Configs["FriendsService"];
             if (gridConfig == null)
             {
-                m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini");
+                m_log.Error("[FRIENDS SERVICE CONNECTOR]: FriendsService missing from OpenSim.ini");
                 throw new Exception("Friends connector init error");
             }
 
@@ -76,7 +76,7 @@ namespace OpenSim.Services.Connectors.Friends
 
             if (serviceURI == String.Empty)
             {
-                m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService");
+                m_log.Error("[FRIENDS SERVICE CONNECTOR]: No Server URI named in section FriendsService");
                 throw new Exception("Friends connector init error");
             }
             m_ServerURI = serviceURI;
@@ -127,7 +127,7 @@ namespace OpenSim.Services.Connectors.Friends
 
                         List<FriendInfo> finfos = new List<FriendInfo>();
                         Dictionary<string, object>.ValueCollection finfosList = replyData.Values;
-                        //m_log.DebugFormat("[FRIENDS CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count);
+                        //m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count);
                         foreach (object f in finfosList)
                         {
                             if (f is Dictionary<string, object>)
@@ -136,7 +136,7 @@ namespace OpenSim.Services.Connectors.Friends
                                 finfos.Add(finfo);
                             }
                             else
-                                m_log.DebugFormat("[FRIENDS CONNECTOR]: GetFriends {0} received invalid response type {1}",
+                                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: GetFriends {0} received invalid response type {1}",
                                     PrincipalID, f.GetType());
                         }
 
@@ -145,14 +145,14 @@ namespace OpenSim.Services.Connectors.Friends
                     }
                 
                     else
-                        m_log.DebugFormat("[FRIENDS CONNECTOR]: GetFriends {0} received null response",
+                        m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: GetFriends {0} received null response",
                             PrincipalID);
 
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
+                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
             }
 
             return new FriendInfo[0];
@@ -175,7 +175,7 @@ namespace OpenSim.Services.Connectors.Friends
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
+                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
                 return false;
             }
 
@@ -190,11 +190,11 @@ namespace OpenSim.Services.Connectors.Friends
                     return success;
                 }
                 else
-                    m_log.DebugFormat("[FRIENDS CONNECTOR]: StoreFriend {0} {1} received null response",
+                    m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: StoreFriend {0} {1} received null response",
                         PrincipalID, Friend);
             }
             else
-                m_log.DebugFormat("[FRIENDS CONNECTOR]: StoreFriend received null reply");
+                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: StoreFriend received null reply");
 
             return false;
 
@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Friends
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
+                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
                 return false;
             }
 
@@ -246,11 +246,11 @@ namespace OpenSim.Services.Connectors.Friends
                     return success;
                 }
                 else
-                    m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend {0} {1} received null response",
+                    m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: DeleteFriend {0} {1} received null response",
                         PrincipalID, Friend);
             }
             else
-                m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend received null reply");
+                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: DeleteFriend received null reply");
 
             return false;
         }
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index 4ffa68c..d0a20fc 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -134,11 +134,11 @@ namespace OpenSim.Services.Connectors.Friends
         private bool Call(GridRegion region, Dictionary<string, object> sendData)
         {
             string reqString = ServerUtils.BuildQueryString(sendData);
-            //m_log.DebugFormat("[FRIENDS CONNECTOR]: queryString = {0}", reqString);
+            //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString);
             if (region == null)
                 return false;
 
-            m_log.DebugFormat("[FRIENDS CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort);
+            m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort);
             try
             {
                 string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
@@ -157,15 +157,15 @@ namespace OpenSim.Services.Connectors.Friends
                             return false;
                     }
                     else
-                        m_log.DebugFormat("[FRIENDS CONNECTOR]: reply data does not contain result field");
+                        m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field");
 
                 }
                 else
-                    m_log.DebugFormat("[FRIENDS CONNECTOR]: received empty reply");
+                    m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply");
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting remote sim: {0}", e.ToString());
+                m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim: {0}", e.ToString());
             }
 
             return false;
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 9385b8d..e26383f 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -335,22 +335,21 @@ namespace OpenSim.Services.HypergridService
             }
 
             if (userURL == m_ExternalName)
+            {
                 return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
+            }
             else
             {
-//                Object[] args = new Object[] { userURL };
                 IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); 
-                if (userAgentService != null)
+
+                try
                 {
-                    try
-                    {
-                        return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
-                    }
-                    catch
-                    {
-                        m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
-                        return false;
-                    }
+                    return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
+                }
+                catch
+                {
+                    m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
+                    return false;
                 }
             }