diff options
author | Charles Krinke | 2009-05-06 02:29:29 +0000 |
---|---|---|
committer | Charles Krinke | 2009-05-06 02:29:29 +0000 |
commit | c84abfa9b1412a13d00e95bf889353781aee2b12 (patch) | |
tree | ff1f183cf3ea21d840421d7f676682e42ed811d2 /OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | |
parent | Allow temp-on-rez prims to take part in physics (e.g. temp-on-rez bullets) (diff) | |
download | opensim-SC_OLD-c84abfa9b1412a13d00e95bf889353781aee2b12.zip opensim-SC_OLD-c84abfa9b1412a13d00e95bf889353781aee2b12.tar.gz opensim-SC_OLD-c84abfa9b1412a13d00e95bf889353781aee2b12.tar.bz2 opensim-SC_OLD-c84abfa9b1412a13d00e95bf889353781aee2b12.tar.xz |
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
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | 22 |
1 files changed, 17 insertions, 5 deletions
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 | |||
205 | if (part != null) | 205 | if (part != null) |
206 | { | 206 | { |
207 | ObjectRegionName = s.RegionInfo.RegionName; | 207 | ObjectRegionName = s.RegionInfo.RegionName; |
208 | uint localX = (s.RegionInfo.RegionLocX * 256); | ||
209 | uint localY = (s.RegionInfo.RegionLocY * 256); | ||
210 | ObjectRegionName = ObjectRegionName + " (" + localX + ", " + localY + ")"; | ||
208 | return part; | 211 | return part; |
209 | } | 212 | } |
210 | } | 213 | } |
@@ -216,15 +219,24 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
216 | private void resolveNamePositionRegionName(UUID objectID, out string ObjectName, out string ObjectAbsolutePosition, out string ObjectRegionName) | 219 | private void resolveNamePositionRegionName(UUID objectID, out string ObjectName, out string ObjectAbsolutePosition, out string ObjectRegionName) |
217 | { | 220 | { |
218 | string m_ObjectRegionName; | 221 | string m_ObjectRegionName; |
222 | int objectLocX; | ||
223 | int objectLocY; | ||
224 | int objectLocZ; | ||
219 | SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName); | 225 | SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName); |
220 | if (part != null) | 226 | if (part != null) |
221 | { | 227 | { |
222 | ObjectAbsolutePosition = part.AbsolutePosition.ToString(); | 228 | objectLocX = (int)part.AbsolutePosition.X; |
223 | ObjectName = part.Name; | 229 | objectLocY = (int)part.AbsolutePosition.Y; |
224 | ObjectRegionName = m_ObjectRegionName; | 230 | objectLocZ = (int)part.AbsolutePosition.Z; |
225 | return; | 231 | ObjectAbsolutePosition = "(" + objectLocX + ", " + objectLocY + ", " + objectLocZ + ")"; |
232 | ObjectName = part.Name; | ||
233 | ObjectRegionName = m_ObjectRegionName; | ||
234 | return; | ||
226 | } | 235 | } |
227 | ObjectAbsolutePosition = part.AbsolutePosition.ToString(); | 236 | objectLocX = (int)part.AbsolutePosition.X; |
237 | objectLocY = (int)part.AbsolutePosition.Y; | ||
238 | objectLocZ = (int)part.AbsolutePosition.Z; | ||
239 | ObjectAbsolutePosition = "(" + objectLocX + ", " + objectLocY + ", " + objectLocZ + ")"; | ||
228 | ObjectName = part.Name; | 240 | ObjectName = part.Name; |
229 | ObjectRegionName = m_ObjectRegionName; | 241 | ObjectRegionName = m_ObjectRegionName; |
230 | return; | 242 | return; |