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

Mantis#2104. Thank you kindly, Godfrey for a patch that: 

If the parcel pointed to by the landmark has nothing in the 
Description field (of the General tab in About Land...), a 
NullReferenceException is thrown and the client is logged out.
I added a check to the calls to Helpers.StringToField() in OpenSim.Region.ClientStack.LindenUDP.SendParcelInfo to avoid 
this issue.
0.6.0-stable
Charles Krinke 2008-09-05 23:04:20 +00:00
parent f5c82186c1
commit 24a95507d4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6441,8 +6441,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
reply.AgentData.AgentID = m_agentId; reply.AgentData.AgentID = m_agentId;
reply.Data.ParcelID = parcelID; reply.Data.ParcelID = parcelID;
reply.Data.OwnerID = land.OwnerID; reply.Data.OwnerID = land.OwnerID;
reply.Data.Name = Helpers.StringToField(land.Name); reply.Data.Name = Helpers.StringToField(land.Name != null ? land.Name : "");
reply.Data.Desc = Helpers.StringToField(land.Description); reply.Data.Desc = Helpers.StringToField(land.Description != null ? land.Description : "");
reply.Data.ActualArea = land.Area; reply.Data.ActualArea = land.Area;
reply.Data.BillableArea = land.Area; // TODO: what is this? reply.Data.BillableArea = land.Area; // TODO: what is this?
@ -6459,7 +6459,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
reply.Data.GlobalX = info.RegionLocX * Constants.RegionSize + x; reply.Data.GlobalX = info.RegionLocX * Constants.RegionSize + x;
reply.Data.GlobalY = info.RegionLocY * Constants.RegionSize + y; reply.Data.GlobalY = info.RegionLocY * Constants.RegionSize + y;
reply.Data.GlobalZ = pos.Z; reply.Data.GlobalZ = pos.Z;
reply.Data.SimName = Helpers.StringToField(info.RegionName); reply.Data.SimName = Helpers.StringToField(info.RegionName != null ? info.RegionName : "");
reply.Data.SnapshotID = land.SnapshotID; reply.Data.SnapshotID = land.SnapshotID;
reply.Data.Dwell = 0; // TODO: not implemented yet reply.Data.Dwell = 0; // TODO: not implemented yet
reply.Data.SalePrice = land.SalePrice; reply.Data.SalePrice = land.SalePrice;