From 46cdd442a8daebe5b1573f09cd5cef51c0b17874 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 1 Jun 2011 18:18:31 -0700
Subject: [Profiles] --> [Profile]

---
 OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index e04fff6..079e1b6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -57,9 +57,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
 
         public void Initialise(IConfigSource config)
         {
-            if (config.Configs["Profiles"] != null)
+            if (config.Configs["Profile"] != null)
             {
-                if (config.Configs["Profiles"].GetString("Module", string.Empty) != "BasicProfileModule")
+                if (config.Configs["Profile"].GetString("Module", string.Empty) != "BasicProfileModule")
                     return;
             }
 
-- 
cgit v1.1


From 4696a9c95eaf87e5cb43cdba008d3f41a949d629 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 2 Jun 2011 08:13:54 -0700
Subject: Bug fix on HG IM.

---
 .../CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index e0c404b..4de197e 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -187,12 +187,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             // Is the user a local user?
             UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, toAgentID);
             string url = string.Empty;
+            bool foreigner = false;
             if (account == null) // foreign user
+            {
                 url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI");
+                foreigner = true;
+            }
 
             Util.FireAndForget(delegate
             {
-                bool success = m_IMService.OutgoingInstantMessage(im, url);
+                bool success = m_IMService.OutgoingInstantMessage(im, url, foreigner);
                 if (!success && account == null)
                 {
                     // One last chance
@@ -203,7 +207,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         UUID id; string u = string.Empty, first = string.Empty, last = string.Empty, secret = string.Empty;
                         if (Util.ParseUniversalUserIdentifier(recipientUUI, out id, out u, out first, out last, out secret))
                         {
-                            success = m_IMService.OutgoingInstantMessage(im, u);
+                            success = m_IMService.OutgoingInstantMessage(im, u, true);
                             if (success)
                                 UserManagementModule.AddUser(toAgentID, u + ";" + first + " " + last);
                         }
-- 
cgit v1.1