2 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index dbe045a..8fad62f 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -90,6 +90,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
 
         private Dictionary<string, AgentCircuitData> CapsLoginID = new Dictionary<string, AgentCircuitData>();
         private Dictionary<LLUUID, OGPState> m_OGPState = new Dictionary<LLUUID, OGPState>();
+        private string LastNameSuffix = "_EXTERNAL";
+        private string FirstNamePrefix = "";
 
         #region IRegionModule Members
 
@@ -107,6 +109,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
             if (cfg != null)
             {
                 enabled = cfg.GetBoolean("ogp_enabled", false);
+                LastNameSuffix = cfg.GetString("ogp_lastname_suffix", "_EXTERNAL");
+                FirstNamePrefix = cfg.GetString("ogp_firstname_prefix", "");
                 if (enabled)
                 {
                     m_log.Warn("[OGP]: Open Grid Protocol is on, Listening for Clients on /agent/");
@@ -235,6 +239,9 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
             string FirstName = requestMap["first_name"].AsString();
             string LastName = requestMap["last_name"].AsString();
 
+            FirstName = FirstNamePrefix + FirstName;
+            LastName = LastName + LastNameSuffix;
+
             OGPState userState = GetOGPState(LocalAgentID);
 
             userState.first_name = requestMap["first_name"].AsString();
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 20a2339..5005741 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -715,3 +715,7 @@ password = http://127.0.0.1/password
 [OpenGridProtocol]
 ;On/true or Off/false
 ogp_enabled=false
+
+;Name Prefix/suffix when using OGP
+ogp_firstname_prefix=""
+ogp_lastname_suffix="_EXTERNAL"