* Truncate outgoing media and music urls to 254 characters.

* Hopefully this will resolve http://opensimulator.org/mantis/view.php?id=2383

3 files changed, 58 insertions, 52 deletions

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 28c818a..0f0aa47 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -733,46 +733,6 @@ namespace OpenSim.Framework
             }
         }
 
-/* 2008-08-28-tyre: Obsolete (see LocalLoginService UserLoginService)
-        public static string[] ParseStartLocationRequest(string startLocationRequest)
-        {
-            string[] returnstring = new string[4];
-            // format uri:RegionName&X&Y&Z
-            returnstring[0] = "last";
-            returnstring[1] = "127";
-            returnstring[2] = "127";
-            returnstring[3] = "0";
-            // This is the crappy way of doing it.
-
-            if (startLocationRequest.Contains(":") && startLocationRequest.Contains("&"))
-            {
-                //System.Console.WriteLine("StartLocationRequest Contains proper elements");
-
-                string[] splitstr = startLocationRequest.Split(':'); //,2,StringSplitOptions.RemoveEmptyEntries);
-
-                //System.Console.WriteLine("Found " + splitstr.GetLength(0) + " elements in 1st split result");
-
-                if (splitstr.GetLength(0) == 2)
-                {
-                    string[] splitstr2 = splitstr[1].Split('&'); //, 4, StringSplitOptions.RemoveEmptyEntries);
-
-                    //System.Console.WriteLine("Found " + splitstr2.GetLength(0) + " elements in 2nd split result");
-
-                    int len = Math.Min(splitstr2.GetLength(0), 4);
-
-                    for (int i = 0; i < 4; ++i)
-                    {
-                        if (len > i)
-                        {
-                            returnstring[i] = splitstr2[i];
-                        }
-                    }
-                }
-            }
-            return returnstring;
-        }
-*/
-
         public static XmlRpcResponse XmlRpcCommand(string url, string methodName, params object[] args)
         {
             return SendXmlRpcCommand(url, methodName, args);
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
             outPacket.ObjectData[0].FullID = objectID;
             outPacket.ObjectData[0].OwnerID = ownerID;
 
-            // Anything more than 254 will cause libsecondlife to barf
-            // (libsl 1550) adds an \0 on the Utils.StringToBytes conversion if it isn't present
-            if (text.Length > 254)
-            {
-                text = text.Remove(254);
-            }
-
-            outPacket.ObjectData[0].Text = Utils.StringToBytes(text);
-
+            outPacket.ObjectData[0].Text = LLUtil.StringToPacketBytes(text);
             outPacket.ObjectData[0].TextColor[0] = color[0];
             outPacket.ObjectData[0].TextColor[1] = color[1];
             outPacket.ObjectData[0].TextColor[2] = color[2];
@@ -2943,6 +2935,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             updatePacket.ParcelData.IsGroupOwned = landData.IsGroupOwned;
             updatePacket.ParcelData.LandingType = (byte)landData.LandingType;
             updatePacket.ParcelData.LocalID = landData.LocalID;
+            
             if (landData.Area > 0)
             {
                 updatePacket.ParcelData.MaxPrims = parcelObjectCapacity;
@@ -2951,10 +2944,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 updatePacket.ParcelData.MaxPrims = 0;
             }
+            
             updatePacket.ParcelData.MediaAutoScale = landData.MediaAutoScale;
-            updatePacket.ParcelData.MediaID = landData.MediaID;
-            updatePacket.ParcelData.MediaURL = Utils.StringToBytes(landData.MediaURL);
-            updatePacket.ParcelData.MusicURL = Utils.StringToBytes(landData.MusicURL);
+            updatePacket.ParcelData.MediaID = landData.MediaID;           
+            updatePacket.ParcelData.MediaURL = LLUtil.StringToPacketBytes(landData.MediaURL);          
+            updatePacket.ParcelData.MusicURL = LLUtil.StringToPacketBytes(landData.MusicURL);
             updatePacket.ParcelData.Name = Utils.StringToBytes(landData.Name);
             updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
             updatePacket.ParcelData.OtherCount = 0; //unemplemented
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
new file mode 100644
index 0000000..d704967
--- /dev/null
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenMetaverse;
+using System;
+
+namespace OpenSim.Region.ClientStack.LindenUDP
+{        
+    public class LLUtil
+    {
+        /// <summary>
+        /// Convert a string to bytes suitable for use in an LL UDP packet.
+        /// </summary>
+        /// <param name="s">Truncated to 254 characters if necessary</param>
+        /// <returns></returns>
+        public static byte[] StringToPacketBytes(string s)
+        {
+            // Anything more than 254 will cause libsecondlife to barf
+            // (libsl 1550) adds an \0 on the Utils.StringToBytes conversion if it isn't present
+            if (s.Length > 254)
+            {
+                s = s.Remove(254);
+            } 
+            
+            return Utils.StringToBytes(s);
+        }
+    }
+}