diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 24 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index bcef137..7535049 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -100,6 +100,30 @@ namespace OpenSim.Region.Environment.Scenes | |||
100 | /// <summary> | 100 | /// <summary> |
101 | /// | 101 | /// |
102 | /// </summary> | 102 | /// </summary> |
103 | /// <remarks>Inefficient. TODO: Fixme</remarks> | ||
104 | /// <param name="fromAgentID"></param> | ||
105 | /// <param name="toAgentID"></param> | ||
106 | /// <param name="timestamp"></param> | ||
107 | /// <param name="fromAgentName"></param> | ||
108 | /// <param name="message"></param> | ||
109 | public void InstantMessage(LLUUID fromAgentID, LLUUID toAgentID, uint timestamp, string fromAgentName, string message) | ||
110 | { | ||
111 | if (this.Avatars.ContainsKey(toAgentID)) | ||
112 | { | ||
113 | // Local sim message | ||
114 | ScenePresence avatar = this.Avatars[toAgentID]; | ||
115 | |||
116 | |||
117 | } | ||
118 | else | ||
119 | { | ||
120 | // Grid message | ||
121 | } | ||
122 | } | ||
123 | |||
124 | /// <summary> | ||
125 | /// | ||
126 | /// </summary> | ||
103 | /// <param name="message"></param> | 127 | /// <param name="message"></param> |
104 | /// <param name="type"></param> | 128 | /// <param name="type"></param> |
105 | /// <param name="fromPos"></param> | 129 | /// <param name="fromPos"></param> |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1f370c4..fdf3cc8 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -450,6 +450,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
450 | client.OnRegionHandShakeReply += this.SendLayerData; | 450 | client.OnRegionHandShakeReply += this.SendLayerData; |
451 | //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims); | 451 | //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims); |
452 | client.OnChatFromViewer += this.SimChat; | 452 | client.OnChatFromViewer += this.SimChat; |
453 | client.OnInstantMessage += this.InstantMessage; | ||
453 | client.OnRequestWearables += this.InformClientOfNeighbours; | 454 | client.OnRequestWearables += this.InformClientOfNeighbours; |
454 | client.OnAddPrim += this.AddNewPrim; | 455 | client.OnAddPrim += this.AddNewPrim; |
455 | client.OnUpdatePrimPosition += this.UpdatePrimPosition; | 456 | client.OnUpdatePrimPosition += this.UpdatePrimPosition; |