diff options
| author | Melanie | 2012-01-30 16:44:26 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-30 16:44:26 +0000 |
| commit | ad02e01e771cbc301e067f8e4cb1ecda27296a22 (patch) | |
| tree | 07c57b734756ca42cc6e08be9b50daf8357a1541 /OpenSim/Region/ClientStack | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add the ability to abort a pending restart using the viewer UI or a (diff) | |
| download | opensim-SC_OLD-ad02e01e771cbc301e067f8e4cb1ecda27296a22.zip opensim-SC_OLD-ad02e01e771cbc301e067f8e4cb1ecda27296a22.tar.gz opensim-SC_OLD-ad02e01e771cbc301e067f8e4cb1ecda27296a22.tar.bz2 opensim-SC_OLD-ad02e01e771cbc301e067f8e4cb1ecda27296a22.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index bbaa08e..a50a61d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -2766,7 +2766,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 2766 | reply.Data.ParcelID = parcelID; | 2766 | reply.Data.ParcelID = parcelID; |
| 2767 | reply.Data.OwnerID = land.OwnerID; | 2767 | reply.Data.OwnerID = land.OwnerID; |
| 2768 | reply.Data.Name = Utils.StringToBytes(land.Name); | 2768 | reply.Data.Name = Utils.StringToBytes(land.Name); |
| 2769 | reply.Data.Desc = Utils.StringToBytes(land.Description); | 2769 | reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length)); |
| 2770 | reply.Data.ActualArea = land.Area; | 2770 | reply.Data.ActualArea = land.Area; |
| 2771 | reply.Data.BillableArea = land.Area; // TODO: what is this? | 2771 | reply.Data.BillableArea = land.Area; // TODO: what is this? |
| 2772 | 2772 | ||