aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-02 03:43:18 +0000
committerMelanie Thielker2008-09-02 03:43:18 +0000
commit61978649ec1642f1c0bf0a3aa6492cebefab85d3 (patch)
tree9310263acfcce74e72775baa97e094ed97d96195 /OpenSim/Region/Environment
parentY top shear accuracy improvements in circular path prim meshes (diff)
downloadopensim-SC_OLD-61978649ec1642f1c0bf0a3aa6492cebefab85d3.zip
opensim-SC_OLD-61978649ec1642f1c0bf0a3aa6492cebefab85d3.tar.gz
opensim-SC_OLD-61978649ec1642f1c0bf0a3aa6492cebefab85d3.tar.bz2
opensim-SC_OLD-61978649ec1642f1c0bf0a3aa6492cebefab85d3.tar.xz
Change some chat output functions so that text is truncated at
1000 chars to avoid the exception thrown by libomv at 1100 chars. Change string->int conversion so it copes with non-numeric chars after the number and no longer uses a float to parse the value.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
index f98633f..1493e32 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
@@ -161,6 +161,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
161 string message = e.Message; 161 string message = e.Message;
162 LLUUID fromID = e.SenderUUID; 162 LLUUID fromID = e.SenderUUID;
163 163
164 if(message.Length >= 1000) // libomv limit
165 message = message.Substring(0, 1000);
166
164 if (e.Sender != null) 167 if (e.Sender != null)
165 { 168 {
166 avatar = scene.GetScenePresence(e.Sender.AgentId); 169 avatar = scene.GetScenePresence(e.Sender.AgentId);
@@ -240,4 +243,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
240 fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully); 243 fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully);
241 } 244 }
242 } 245 }
243} \ No newline at end of file 246}