Force the group tag of NPCs to "- NPC -" unless the name is completely blank.

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 86bfbf0..28367b8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2100,10 +2100,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         private LSL_Key NpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, bool owned)
         {
+            string groupTitle = String.Empty;
+
             if (firstname != String.Empty || lastname != String.Empty)
             {
                 if (firstname != "Shown outfit:")
-                    firstname = "NPC: " + firstname;
+                    groupTitle = "- NPC -";
             }
 
             INPCModule module = World.RequestModuleInterface<INPCModule>();
@@ -2143,6 +2145,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                           ownerID,
                                           World,appearance);
 
+                ScenePresence sp;
+                if (World.TryGetScenePresence(x, out sp))
+                {
+                    sp.Grouptitle = groupTitle;
+                    sp.SendAvatarDataToAllAgents();
+                }
                 return new LSL_Key(x.ToString());
             }