Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-06-11 20:35:00 +01:00
3 changed files with 34 additions and 99 deletions

View File

@@ -268,6 +268,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
fromAgentName = (string)requestData["from_agent_name"];
message = (string)requestData["message"];
if (message == null)
message = string.Empty;
// Bytes don't transfer well over XMLRPC, so, we Base64 Encode them.
string requestData1 = (string)requestData["dialog"];