From 0631151e08174fffbc5bf3f646ef32e16e2c5145 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 28 Dec 2007 23:19:03 +0000
Subject: * Patch from Melanie provides Util.CleanString and uses it on the
 prim name and description.  Thanks Melanie.

---
 OpenSim/Region/Environment/Scenes/InnerScene.cs       | 4 ++--
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 5ad5646..794cdae 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -749,7 +749,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (PermissionsMngr.CanEditObject(remoteClient.AgentId, group.UUID))
                 {
-                    group.SetPartName(name, primLocalID);
+                    group.SetPartName(Util.CleanString(name), primLocalID);
                 }
             }
         }
@@ -766,7 +766,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (PermissionsMngr.CanEditObject(remoteClient.AgentId, group.UUID))
                 {
-                    group.SetPartDescription(description.Replace("\0",""), primLocalID);
+                    group.SetPartDescription(Util.CleanString(description), primLocalID);
                 }
             }
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index d3f5454..0f8ce0b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1086,7 +1086,6 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="name"></param>
         public void SetPartName(string name, uint localID)
         {
-            name = name.Remove(name.Length - 1, 1);
             SceneObjectPart part = GetChildPart(localID);
             if (part != null)
             {
-- 
cgit v1.1