aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-30 04:12:08 +0000
committerTeravus Ovares2007-12-30 04:12:08 +0000
commit14368d9a732d4e8f6508aec07a3c3c51e3e9f33e (patch)
tree5da643346e901222f8859baa861822acb056004e /OpenSim/Region/Environment
parent* Extracted out old RezObject method placing at absolute pos without the rayt... (diff)
downloadopensim-SC_OLD-14368d9a732d4e8f6508aec07a3c3c51e3e9f33e.zip
opensim-SC_OLD-14368d9a732d4e8f6508aec07a3c3c51e3e9f33e.tar.gz
opensim-SC_OLD-14368d9a732d4e8f6508aec07a3c3c51e3e9f33e.tar.bz2
opensim-SC_OLD-14368d9a732d4e8f6508aec07a3c3c51e3e9f33e.tar.xz
* Applied Melanie's same instance IM fix. This will make IMs work within the same OpenSim Instance.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/InstantMessageModule.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
index cf6a94d..1e1d236 100644
--- a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
@@ -63,7 +63,9 @@ namespace OpenSim.Region.Environment.Modules
63 private void OnInstantMessage(LLUUID fromAgentID, 63 private void OnInstantMessage(LLUUID fromAgentID,
64 LLUUID fromAgentSession, LLUUID toAgentID, 64 LLUUID fromAgentSession, LLUUID toAgentID,
65 LLUUID imSessionID, uint timestamp, string fromAgentName, 65 LLUUID imSessionID, uint timestamp, string fromAgentName,
66 string message, byte dialog) 66 string message, byte dialog, bool fromGroup, byte offline,
67 uint ParentEstateID, LLVector3 Position, LLUUID RegionID,
68 byte[] binaryBucket)
67 { 69 {
68 foreach (Scene scene in m_scenes) 70 foreach (Scene scene in m_scenes)
69 { 71 {
@@ -76,9 +78,9 @@ namespace OpenSim.Region.Environment.Modules
76 user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, 78 user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message,
77 toAgentID, imSessionID, fromAgentName, dialog, 79 toAgentID, imSessionID, fromAgentName, dialog,
78 timestamp); 80 timestamp);
81 // Message sent
82 return;
79 } 83 }
80 // Message sent
81 return;
82 } 84 }
83 } 85 }
84 86
@@ -104,4 +106,4 @@ namespace OpenSim.Region.Environment.Modules
104 get { return true; } 106 get { return true; }
105 } 107 }
106 } 108 }
107} \ No newline at end of file 109}