1 files changed, 22 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 85a3d96..b89a5f2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -812,17 +812,32 @@ namespace OpenSim.Region.Framework.Scenes
 
                         if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
                         {
-                            capsPath 
-                                = "http://" 
-                                    + reg.ExternalHostName 
-                                    + ":" 
-                                    + reg.HttpPort 
-                                    + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
+                            #region IP Translation for NAT
+                            IClientIPEndpoint ipepClient;
+                            if (avatar.ClientView.TryGet(out ipepClient))
+                            {
+                                capsPath
+                                    = "http://"
+                                      + NetworkUtil.GetHostFor(ipepClient.EndPoint, reg.ExternalHostName)
+                                      + ":"
+                                      + reg.HttpPort
+                                      + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
+                            }
+                            else
+                            {
+                                capsPath
+                                    = "http://"
+                                      + reg.ExternalHostName
+                                      + ":"
+                                      + reg.HttpPort
+                                      + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
+                            }
+                            #endregion
 
                             if (eq != null)
                             {
                                 #region IP Translation for NAT
-                                IClientIPEndpoint ipepClient;
+                                // Uses ipepClient above
                                 if (avatar.ClientView.TryGet(out ipepClient))
                                 {
                                     endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);