aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-16 00:47:21 +0000
committerMelanie Thielker2008-11-16 00:47:21 +0000
commit27e557eb9857ccc34ae3588c4e0ff43bd5e6644a (patch)
tree742ab8738481d93ebc03fe94c80b6333c65631b0 /OpenSim/Framework
parentChanged sculpted prim texture scaling method to bilinear to reduce scaling ar... (diff)
downloadopensim-SC_OLD-27e557eb9857ccc34ae3588c4e0ff43bd5e6644a.zip
opensim-SC_OLD-27e557eb9857ccc34ae3588c4e0ff43bd5e6644a.tar.gz
opensim-SC_OLD-27e557eb9857ccc34ae3588c4e0ff43bd5e6644a.tar.bz2
opensim-SC_OLD-27e557eb9857ccc34ae3588c4e0ff43bd5e6644a.tar.xz
Introduces the message transfer module. It splits the transfer mechanics off
the IM module and makes it into a module of it's own, which can be used by all other modules. Removes some ugly hacks. Refer to the IM module to see how it's used. Also fixes the persistence issue (Mantis #2598)
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/GridInstantMessage.cs50
1 files changed, 42 insertions, 8 deletions
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 037f110..4ca4e67 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -33,27 +33,61 @@ namespace OpenSim.Framework
33 [Serializable] 33 [Serializable]
34 public class GridInstantMessage 34 public class GridInstantMessage
35 { 35 {
36 public byte[] binaryBucket;
37 public byte dialog;
38 public Guid fromAgentID; 36 public Guid fromAgentID;
39 public string fromAgentName; 37 public string fromAgentName;
40 public Guid fromAgentSession; 38 public Guid fromAgentSession;
39 public Guid toAgentID;
40 public byte dialog;
41 public bool fromGroup; 41 public bool fromGroup;
42 public Guid imSessionID;
43
44 public string message; 42 public string message;
43 public Guid imSessionID;
45 public byte offline; 44 public byte offline;
46
47 public uint ParentEstateID;
48
49 public Vector3 Position; 45 public Vector3 Position;
46 public byte[] binaryBucket;
47
50 48
49 public uint ParentEstateID;
51 public Guid RegionID; 50 public Guid RegionID;
52 public uint timestamp; 51 public uint timestamp;
53 public Guid toAgentID;
54 52
55 public GridInstantMessage() 53 public GridInstantMessage()
56 { 54 {
55 binaryBucket = new byte[0];
56 }
57
58 public GridInstantMessage(IScene scene, UUID _fromAgentID,
59 string _fromAgentName, UUID _fromAgentSession, UUID _toAgentID,
60 byte _dialog, bool _fromGroup, string _message,
61 UUID _imSessionID, bool _offline, Vector3 _position,
62 byte[] _binaryBucket)
63 {
64 fromAgentID = _fromAgentID.Guid;
65 fromAgentName = _fromAgentName;
66 fromAgentSession = _fromAgentSession.Guid;
67 toAgentID = _toAgentID.Guid;
68 dialog = _dialog;
69 fromGroup = _fromGroup;
70 message = _message;
71 imSessionID = _imSessionID.Guid;
72 if (_offline)
73 offline = 1;
74 else
75 offline = 0;
76 Position = _position;
77 binaryBucket = _binaryBucket;
78
79 ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID;
80 RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid;
81 timestamp = (uint)Util.UnixTimeSinceEpoch();
82 }
83
84 public GridInstantMessage(IScene scene, UUID _fromAgentID,
85 string _fromAgentName, UUID _toAgentID, byte _dialog,
86 string _message, bool _offline,
87 Vector3 _position) : this(scene, _fromAgentID, _fromAgentName,
88 UUID.Zero, _toAgentID, _dialog, false, _message,
89 _fromAgentID ^ _toAgentID, _offline, _position, new byte[0])
90 {
57 } 91 }
58 } 92 }
59} 93}