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

* Fixed two major unhandled exceptions discovered during the Pub Quiz on friday.

0.6.0-stable
Adam Frisby 2008-10-12 00:11:22 +00:00
parent acce65457c
commit d10a578096
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@ -274,14 +274,30 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
message = (string)requestData["message"]; message = (string)requestData["message"];
// Bytes don't transfer well over XMLRPC, so, we Base64 Encode them. // Bytes don't transfer well over XMLRPC, so, we Base64 Encode them.
byte[] dialogdata = Convert.FromBase64String((string)requestData["dialog"]); string requestData1 = (string)requestData["dialog"];
dialog = dialogdata[0]; if (string.IsNullOrEmpty(requestData1))
{
dialog = 0;
}
else
{
byte[] dialogdata = Convert.FromBase64String(requestData1);
dialog = dialogdata[0];
}
if ((string)requestData["from_group"] == "TRUE") if ((string)requestData["from_group"] == "TRUE")
fromGroup = true; fromGroup = true;
byte[] offlinedata = Convert.FromBase64String((string)requestData["offline"]); string requestData2 = (string)requestData["offline"];
offline = offlinedata[0]; if (String.IsNullOrEmpty(requestData2))
{
offline = 0;
}
else
{
byte[] offlinedata = Convert.FromBase64String(requestData2);
offline = offlinedata[0];
}
# region ParentEstateID # region ParentEstateID
try try
@ -346,7 +362,16 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
# endregion # endregion
Position = new Vector3(pos_x, pos_y, pos_z); Position = new Vector3(pos_x, pos_y, pos_z);
binaryBucket = Convert.FromBase64String((string)requestData["binary_bucket"]);
string requestData3 = (string)requestData["binary_bucket"];
if (string.IsNullOrEmpty(requestData3))
{
binaryBucket = new byte[0];
}
else
{
binaryBucket = Convert.FromBase64String(requestData3);
}
// Create a New GridInstantMessageObject the the data // Create a New GridInstantMessageObject the the data
GridInstantMessage gim = new GridInstantMessage(); GridInstantMessage gim = new GridInstantMessage();

10
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -245,7 +245,15 @@ namespace OpenSim.Region.Environment.Scenes
public Vector3 Lookat public Vector3 Lookat
{ {
get { return Util.GetNormalizedVector(new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0)); } get
{
Vector3 a = new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0);
if(a == Vector3.Zero)
return a;
return Util.GetNormalizedVector(a);
}
} }
private readonly string m_firstname; private readonly string m_firstname;