aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-07-12 15:16:19 +0000
committerMW2007-07-12 15:16:19 +0000
commit20a77a6d4b05ee15b7b04a81920d19462e6e542a (patch)
tree93c10bd7724a62ccb3bec9697439e0db42fcd281 /OpenSim/Framework
parentCleaning up some of the CAPS functions, Asset uploads now use the new LLSDStr... (diff)
downloadopensim-SC_OLD-20a77a6d4b05ee15b7b04a81920d19462e6e542a.zip
opensim-SC_OLD-20a77a6d4b05ee15b7b04a81920d19462e6e542a.tar.gz
opensim-SC_OLD-20a77a6d4b05ee15b7b04a81920d19462e6e542a.tar.bz2
opensim-SC_OLD-20a77a6d4b05ee15b7b04a81920d19462e6e542a.tar.xz
Fixed a number of bugs in the local InstantMessage handling, sending InstantMessages will no longer crash the server. But they still aren't really working correctly, you can't type replies to received messages.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/IGridServices.cs2
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs2
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index c296209..d2e5ab6 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -31,8 +31,6 @@ using OpenSim.Framework.Types;
31 31
32namespace OpenSim.Framework.Communications 32namespace OpenSim.Framework.Communications
33{ 33{
34
35
36 public interface IGridServices 34 public interface IGridServices
37 { 35 {
38 RegionCommsListener RegisterRegion(RegionInfo regionInfos); 36 RegionCommsListener RegisterRegion(RegionInfo regionInfos);
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index d409ebe..9079ca5 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Interfaces
154 void SendRegionHandshake(RegionInfo regionInfo); 154 void SendRegionHandshake(RegionInfo regionInfo);
155 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 155 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
156 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 156 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
157 void SendInstantMessage(string message, LLUUID target); 157 void SendInstantMessage(string message, LLUUID target, string fromName, LLUUID id);
158 void SendLayerData(float[] map); 158 void SendLayerData(float[] map);
159 void SendLayerData(int px, int py, float[] map); 159 void SendLayerData(int px, int py, float[] map);
160 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); 160 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);