diff options
| author | Justin Clark-Casey (justincc) | 2010-06-11 21:18:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-06-11 21:18:53 +0100 |
| commit | 8531da37d44e11e295f7c738c721285722745e45 (patch) | |
| tree | d3b564300cefb0de632fa0eadfaed57772c2832e /OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |
| parent | create inactive test for iar folders/items merged with existing paths (diff) | |
| parent | Reinstated the check on im.binaryBucket.Length, this time on the local handle... (diff) | |
| download | opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.zip opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.tar.gz opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.tar.bz2 opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 5d20e63..83209fc 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
| @@ -268,6 +268,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 268 | 268 | ||
| 269 | fromAgentName = (string)requestData["from_agent_name"]; | 269 | fromAgentName = (string)requestData["from_agent_name"]; |
| 270 | message = (string)requestData["message"]; | 270 | message = (string)requestData["message"]; |
| 271 | if (message == null) | ||
| 272 | message = string.Empty; | ||
| 271 | 273 | ||
| 272 | // Bytes don't transfer well over XMLRPC, so, we Base64 Encode them. | 274 | // Bytes don't transfer well over XMLRPC, so, we Base64 Encode them. |
| 273 | string requestData1 = (string)requestData["dialog"]; | 275 | string requestData1 = (string)requestData["dialog"]; |