diff options
author | Justin Clarke Casey | 2008-10-15 20:24:44 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-15 20:24:44 +0000 |
commit | 98fdf504d9833dc8a58b141765378a1167d2c680 (patch) | |
tree | 63ad48dd1c5f902dd1d4e834126a79f290670405 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | * minor: comment out persisting prim inventory log messages (diff) | |
download | opensim-SC_OLD-98fdf504d9833dc8a58b141765378a1167d2c680.zip opensim-SC_OLD-98fdf504d9833dc8a58b141765378a1167d2c680.tar.gz opensim-SC_OLD-98fdf504d9833dc8a58b141765378a1167d2c680.tar.bz2 opensim-SC_OLD-98fdf504d9833dc8a58b141765378a1167d2c680.tar.xz |
* Truncate outgoing media and music urls to 254 characters.
* Hopefully this will resolve http://opensimulator.org/mantis/view.php?id=2383
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 198d660..2d6508a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2474,15 +2474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2474 | outPacket.ObjectData[0].FullID = objectID; | 2474 | outPacket.ObjectData[0].FullID = objectID; |
2475 | outPacket.ObjectData[0].OwnerID = ownerID; | 2475 | outPacket.ObjectData[0].OwnerID = ownerID; |
2476 | 2476 | ||
2477 | // Anything more than 254 will cause libsecondlife to barf | 2477 | outPacket.ObjectData[0].Text = LLUtil.StringToPacketBytes(text); |
2478 | // (libsl 1550) adds an \0 on the Utils.StringToBytes conversion if it isn't present | ||
2479 | if (text.Length > 254) | ||
2480 | { | ||
2481 | text = text.Remove(254); | ||
2482 | } | ||
2483 | |||
2484 | outPacket.ObjectData[0].Text = Utils.StringToBytes(text); | ||
2485 | |||
2486 | outPacket.ObjectData[0].TextColor[0] = color[0]; | 2478 | outPacket.ObjectData[0].TextColor[0] = color[0]; |
2487 | outPacket.ObjectData[0].TextColor[1] = color[1]; | 2479 | outPacket.ObjectData[0].TextColor[1] = color[1]; |
2488 | outPacket.ObjectData[0].TextColor[2] = color[2]; | 2480 | outPacket.ObjectData[0].TextColor[2] = color[2]; |
@@ -2943,6 +2935,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2943 | updatePacket.ParcelData.IsGroupOwned = landData.IsGroupOwned; | 2935 | updatePacket.ParcelData.IsGroupOwned = landData.IsGroupOwned; |
2944 | updatePacket.ParcelData.LandingType = (byte)landData.LandingType; | 2936 | updatePacket.ParcelData.LandingType = (byte)landData.LandingType; |
2945 | updatePacket.ParcelData.LocalID = landData.LocalID; | 2937 | updatePacket.ParcelData.LocalID = landData.LocalID; |
2938 | |||
2946 | if (landData.Area > 0) | 2939 | if (landData.Area > 0) |
2947 | { | 2940 | { |
2948 | updatePacket.ParcelData.MaxPrims = parcelObjectCapacity; | 2941 | updatePacket.ParcelData.MaxPrims = parcelObjectCapacity; |
@@ -2951,10 +2944,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2951 | { | 2944 | { |
2952 | updatePacket.ParcelData.MaxPrims = 0; | 2945 | updatePacket.ParcelData.MaxPrims = 0; |
2953 | } | 2946 | } |
2947 | |||
2954 | updatePacket.ParcelData.MediaAutoScale = landData.MediaAutoScale; | 2948 | updatePacket.ParcelData.MediaAutoScale = landData.MediaAutoScale; |
2955 | updatePacket.ParcelData.MediaID = landData.MediaID; | 2949 | updatePacket.ParcelData.MediaID = landData.MediaID; |
2956 | updatePacket.ParcelData.MediaURL = Utils.StringToBytes(landData.MediaURL); | 2950 | updatePacket.ParcelData.MediaURL = LLUtil.StringToPacketBytes(landData.MediaURL); |
2957 | updatePacket.ParcelData.MusicURL = Utils.StringToBytes(landData.MusicURL); | 2951 | updatePacket.ParcelData.MusicURL = LLUtil.StringToPacketBytes(landData.MusicURL); |
2958 | updatePacket.ParcelData.Name = Utils.StringToBytes(landData.Name); | 2952 | updatePacket.ParcelData.Name = Utils.StringToBytes(landData.Name); |
2959 | updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented | 2953 | updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented |
2960 | updatePacket.ParcelData.OtherCount = 0; //unemplemented | 2954 | updatePacket.ParcelData.OtherCount = 0; //unemplemented |