diff options
author | Charles Krinke | 2008-09-05 23:04:20 +0000 |
---|---|---|
committer | Charles Krinke | 2008-09-05 23:04:20 +0000 |
commit | 24a95507d4507abe343c321d7a77f76add41b433 (patch) | |
tree | adf005c1bf86ffb2f71771302504f545e62a4c68 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | * Adds configurable OGP Name prefix and suffix. See OpenSim.ini.example at t... (diff) | |
download | opensim-SC_OLD-24a95507d4507abe343c321d7a77f76add41b433.zip opensim-SC_OLD-24a95507d4507abe343c321d7a77f76add41b433.tar.gz opensim-SC_OLD-24a95507d4507abe343c321d7a77f76add41b433.tar.bz2 opensim-SC_OLD-24a95507d4507abe343c321d7a77f76add41b433.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 6e37e0c..2a0190b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -6441,8 +6441,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6441 | reply.AgentData.AgentID = m_agentId; | 6441 | reply.AgentData.AgentID = m_agentId; |
6442 | reply.Data.ParcelID = parcelID; | 6442 | reply.Data.ParcelID = parcelID; |
6443 | reply.Data.OwnerID = land.OwnerID; | 6443 | reply.Data.OwnerID = land.OwnerID; |
6444 | reply.Data.Name = Helpers.StringToField(land.Name); | 6444 | reply.Data.Name = Helpers.StringToField(land.Name != null ? land.Name : ""); |
6445 | reply.Data.Desc = Helpers.StringToField(land.Description); | 6445 | reply.Data.Desc = Helpers.StringToField(land.Description != null ? land.Description : ""); |
6446 | reply.Data.ActualArea = land.Area; | 6446 | reply.Data.ActualArea = land.Area; |
6447 | reply.Data.BillableArea = land.Area; // TODO: what is this? | 6447 | reply.Data.BillableArea = land.Area; // TODO: what is this? |
6448 | 6448 | ||
@@ -6459,7 +6459,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6459 | reply.Data.GlobalX = info.RegionLocX * Constants.RegionSize + x; | 6459 | reply.Data.GlobalX = info.RegionLocX * Constants.RegionSize + x; |
6460 | reply.Data.GlobalY = info.RegionLocY * Constants.RegionSize + y; | 6460 | reply.Data.GlobalY = info.RegionLocY * Constants.RegionSize + y; |
6461 | reply.Data.GlobalZ = pos.Z; | 6461 | reply.Data.GlobalZ = pos.Z; |
6462 | reply.Data.SimName = Helpers.StringToField(info.RegionName); | 6462 | reply.Data.SimName = Helpers.StringToField(info.RegionName != null ? info.RegionName : ""); |
6463 | reply.Data.SnapshotID = land.SnapshotID; | 6463 | reply.Data.SnapshotID = land.SnapshotID; |
6464 | reply.Data.Dwell = 0; // TODO: not implemented yet | 6464 | reply.Data.Dwell = 0; // TODO: not implemented yet |
6465 | reply.Data.SalePrice = land.SalePrice; | 6465 | reply.Data.SalePrice = land.SalePrice; |