diff options
author | Teravus Ovares | 2007-12-28 23:19:03 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-28 23:19:03 +0000 |
commit | 0631151e08174fffbc5bf3f646ef32e16e2c5145 (patch) | |
tree | cd5c03148d599fbe9c9929ff98b5894c5a4cdd43 /OpenSim/Region | |
parent | Add System.Xml back into AssetServer and into AssetLoader for the first time.... (diff) | |
download | opensim-SC-0631151e08174fffbc5bf3f646ef32e16e2c5145.zip opensim-SC-0631151e08174fffbc5bf3f646ef32e16e2c5145.tar.gz opensim-SC-0631151e08174fffbc5bf3f646ef32e16e2c5145.tar.bz2 opensim-SC-0631151e08174fffbc5bf3f646ef32e16e2c5145.tar.xz |
* Patch from Melanie provides Util.CleanString and uses it on the prim name and description. Thanks Melanie.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 1 |
2 files changed, 2 insertions, 3 deletions
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 | |||
749 | { | 749 | { |
750 | if (PermissionsMngr.CanEditObject(remoteClient.AgentId, group.UUID)) | 750 | if (PermissionsMngr.CanEditObject(remoteClient.AgentId, group.UUID)) |
751 | { | 751 | { |
752 | group.SetPartName(name, primLocalID); | 752 | group.SetPartName(Util.CleanString(name), primLocalID); |
753 | } | 753 | } |
754 | } | 754 | } |
755 | } | 755 | } |
@@ -766,7 +766,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
766 | { | 766 | { |
767 | if (PermissionsMngr.CanEditObject(remoteClient.AgentId, group.UUID)) | 767 | if (PermissionsMngr.CanEditObject(remoteClient.AgentId, group.UUID)) |
768 | { | 768 | { |
769 | group.SetPartDescription(description.Replace("\0",""), primLocalID); | 769 | group.SetPartDescription(Util.CleanString(description), primLocalID); |
770 | } | 770 | } |
771 | } | 771 | } |
772 | } | 772 | } |
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 | |||
1086 | /// <param name="name"></param> | 1086 | /// <param name="name"></param> |
1087 | public void SetPartName(string name, uint localID) | 1087 | public void SetPartName(string name, uint localID) |
1088 | { | 1088 | { |
1089 | name = name.Remove(name.Length - 1, 1); | ||
1090 | SceneObjectPart part = GetChildPart(localID); | 1089 | SceneObjectPart part = GetChildPart(localID); |
1091 | if (part != null) | 1090 | if (part != null) |
1092 | { | 1091 | { |