From c84abfa9b1412a13d00e95bf889353781aee2b12 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Wed, 6 May 2009 02:29:29 +0000
Subject: Thank you kindly, Fly-Man- for a patch that: Adding more SL likeness
 for Email module in CORE. I've added some SL likeness to the Email module so
 that it looks more like emails going out in the same standard as SL uses

---
 .../Scripting/EMailModules/EmailModule.cs          | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index b28df8d..d2dd3d5 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -205,6 +205,9 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
                     if (part != null)
                     {
                         ObjectRegionName = s.RegionInfo.RegionName;
+                        uint localX = (s.RegionInfo.RegionLocX * 256);
+                        uint localY = (s.RegionInfo.RegionLocY * 256);
+                        ObjectRegionName = ObjectRegionName + " (" + localX + ", " + localY + ")";
                         return part;
                     }
                 }
@@ -216,15 +219,24 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
         private void resolveNamePositionRegionName(UUID objectID, out string ObjectName, out string ObjectAbsolutePosition, out string ObjectRegionName)
         {
             string m_ObjectRegionName;
+            int objectLocX;
+            int objectLocY;
+            int objectLocZ;
             SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName);
             if (part != null)
             {
-                 ObjectAbsolutePosition = part.AbsolutePosition.ToString();
-                 ObjectName = part.Name;
-                 ObjectRegionName = m_ObjectRegionName;
-                 return;
+                objectLocX = (int)part.AbsolutePosition.X;
+                objectLocY = (int)part.AbsolutePosition.Y;
+                objectLocZ = (int)part.AbsolutePosition.Z;
+                ObjectAbsolutePosition = "(" + objectLocX + ", " + objectLocY + ", " + objectLocZ + ")";
+                ObjectName = part.Name;
+                ObjectRegionName = m_ObjectRegionName;
+                return;
             }
-            ObjectAbsolutePosition = part.AbsolutePosition.ToString();
+            objectLocX = (int)part.AbsolutePosition.X;
+            objectLocY = (int)part.AbsolutePosition.Y;
+            objectLocZ = (int)part.AbsolutePosition.Z;
+            ObjectAbsolutePosition = "(" + objectLocX + ", " + objectLocY + ", " + objectLocZ + ")";
             ObjectName = part.Name;
             ObjectRegionName = m_ObjectRegionName;
             return;
-- 
cgit v1.1