OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Limit the message length from llInstantMessage to 1024 characters http://wiki.secondlife.com/wiki/LlInstantMessage 

Also truncate messages that may exceed the limit set by the packet size. The limit in OpenMetaverse is 1100 bytes including a zero byte terminator.
Fixes Mantis #3244
0.6.4-rc1
idb 2009-03-07 14:16:26 +00:00
parent 23b247c519
commit aab1601642
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -1206,7 +1206,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
msg.MessageBlock.RegionID = UUID.Zero; msg.MessageBlock.RegionID = UUID.Zero;
msg.MessageBlock.Timestamp = timeStamp; msg.MessageBlock.Timestamp = timeStamp;
msg.MessageBlock.ToAgentID = toAgent; msg.MessageBlock.ToAgentID = toAgent;
msg.MessageBlock.Message = Utils.StringToBytes(message); // Cap the message length at 1099. There is a limit in ImprovedInstantMessagePacket
// the limit is 1100 but a 0 byte gets added to mark the end of the string
if (message != null && message.Length > 1099)
msg.MessageBlock.Message = Utils.StringToBytes(message.Substring(0, 1099));
else
msg.MessageBlock.Message = Utils.StringToBytes(message);
msg.MessageBlock.BinaryBucket = binaryBucket; msg.MessageBlock.BinaryBucket = binaryBucket;
if (message.StartsWith("[grouptest]")) if (message.StartsWith("[grouptest]"))

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -2717,7 +2717,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
//{ //{
// msg.fromAgentName = "(hippos)";// Added for posterity. This means that we can't figure out who sent it // msg.fromAgentName = "(hippos)";// Added for posterity. This means that we can't figure out who sent it
//} //}
msg.message = message; // Cap the message length at 1024.
if (message != null && message.Length > 1024)
msg.message = message.Substring(0, 1024);
else
msg.message = message;
msg.dialog = (byte)19; // messgage from script ??? // dialog; msg.dialog = (byte)19; // messgage from script ??? // dialog;
msg.fromGroup = false;// fromGroup; msg.fromGroup = false;// fromGroup;
msg.offline = (byte)0; //offline; msg.offline = (byte)0; //offline;