aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-30 04:12:08 +0000
committerTeravus Ovares2007-12-30 04:12:08 +0000
commit14368d9a732d4e8f6508aec07a3c3c51e3e9f33e (patch)
tree5da643346e901222f8859baa861822acb056004e
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.
-rw-r--r--OpenSim/Framework/IClientAPI.cs18
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs13
-rw-r--r--OpenSim/Region/Environment/Modules/InstantMessageModule.cs10
3 files changed, 22 insertions, 19 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1154fba..61a713a 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -225,20 +225,10 @@ namespace OpenSim.Framework
225 225
226 public delegate void ImprovedInstantMessage( 226 public delegate void ImprovedInstantMessage(
227 LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp, 227 LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp,
228 string fromAgentName, string message, byte dialog); // Cut down from full list 228 string fromAgentName, string message, byte dialog, bool fromGroup, byte offline, uint ParentEstateID,
229 229 LLVector3 Position, LLUUID RegionID, byte[] binaryBucket); // This shouldn't be cut down...
230 //rezPacket.RezData.BypassRaycast; 230 // especially if we're ever going to implement groups, presence, estate message dialogs...
231 //rezPacket.RezData.RayEnd; 231
232 //rezPacket.RezData.RayEndIsIntersection;
233 //rezPacket.RezData.RayStart;
234 //rezPacket.RezData.RayTargetID;
235 //rezPacket.RezData.RemoveItem;
236 //rezPacket.RezData.RezSelected;
237 //rezPacket.RezData.FromTaskID;
238 //rezPacket.RezData.FromTaskID;
239 //rezPacket.RezData.EveryoneMask;
240 //rezPacket.RezData.GroupMask;
241 //rezPacket.RezData.NextOwnerMask;
242 public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, LLVector3 RayStart, 232 public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, LLVector3 RayStart,
243 LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 233 LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
244 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, 234 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 0d3c07e..932414d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2540,12 +2540,23 @@ namespace OpenSim.Region.ClientStack
2540 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket) Pack; 2540 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket) Pack;
2541 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); 2541 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
2542 string IMmessage = Helpers.FieldToUTF8String(msgpack.MessageBlock.Message); 2542 string IMmessage = Helpers.FieldToUTF8String(msgpack.MessageBlock.Message);
2543 //byte[] msgpack.MessageBlock.BinaryBucket;
2544 //bool msgpack.MessageBlock.FromGroup;
2545
2546 //byte msgpack.MessageBlock.Offline;
2547 //uint msgpack.MessageBlock.ParentEstateID;
2548 //LLVector3 msgpack.MessageBlock.Position;
2549 //LLUUID msgpack.MessageBlock.RegionID;
2550
2543 if (OnInstantMessage != null) 2551 if (OnInstantMessage != null)
2544 { 2552 {
2545 OnInstantMessage(msgpack.AgentData.AgentID, msgpack.AgentData.SessionID, 2553 OnInstantMessage(msgpack.AgentData.AgentID, msgpack.AgentData.SessionID,
2546 msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID, 2554 msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID,
2547 msgpack.MessageBlock.Timestamp, IMfromName, IMmessage, 2555 msgpack.MessageBlock.Timestamp, IMfromName, IMmessage,
2548 msgpack.MessageBlock.Dialog); 2556 msgpack.MessageBlock.Dialog, msgpack.MessageBlock.FromGroup,
2557 msgpack.MessageBlock.Offline, msgpack.MessageBlock.ParentEstateID,
2558 msgpack.MessageBlock.Position, msgpack.MessageBlock.RegionID,
2559 msgpack.MessageBlock.BinaryBucket);
2549 } 2560 }
2550 break; 2561 break;
2551 case PacketType.RezObject: 2562 case PacketType.RezObject:
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}