diff options
author | Teravus Ovares | 2008-09-05 16:54:31 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-05 16:54:31 +0000 |
commit | f5c82186c159149d7e4ef5570a93e3fc399e0761 (patch) | |
tree | 1fdecbe06f814e37ff4656cc7b1ba172ace012a3 /OpenSim/Region | |
parent | Replaced a lot of trig calls with lookup tables for common prim types in an a... (diff) | |
download | opensim-SC-f5c82186c159149d7e4ef5570a93e3fc399e0761.zip opensim-SC-f5c82186c159149d7e4ef5570a93e3fc399e0761.tar.gz opensim-SC-f5c82186c159149d7e4ef5570a93e3fc399e0761.tar.bz2 opensim-SC-f5c82186c159149d7e4ef5570a93e3fc399e0761.tar.xz |
* Adds configurable OGP Name prefix and suffix. See OpenSim.ini.example at the bottom for details. Defaults to an empty string for prefix and '_EXTERNAL' for suffix
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 7 |
1 files changed, 7 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 | |||
90 | 90 | ||
91 | private Dictionary<string, AgentCircuitData> CapsLoginID = new Dictionary<string, AgentCircuitData>(); | 91 | private Dictionary<string, AgentCircuitData> CapsLoginID = new Dictionary<string, AgentCircuitData>(); |
92 | private Dictionary<LLUUID, OGPState> m_OGPState = new Dictionary<LLUUID, OGPState>(); | 92 | private Dictionary<LLUUID, OGPState> m_OGPState = new Dictionary<LLUUID, OGPState>(); |
93 | private string LastNameSuffix = "_EXTERNAL"; | ||
94 | private string FirstNamePrefix = ""; | ||
93 | 95 | ||
94 | #region IRegionModule Members | 96 | #region IRegionModule Members |
95 | 97 | ||
@@ -107,6 +109,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
107 | if (cfg != null) | 109 | if (cfg != null) |
108 | { | 110 | { |
109 | enabled = cfg.GetBoolean("ogp_enabled", false); | 111 | enabled = cfg.GetBoolean("ogp_enabled", false); |
112 | LastNameSuffix = cfg.GetString("ogp_lastname_suffix", "_EXTERNAL"); | ||
113 | FirstNamePrefix = cfg.GetString("ogp_firstname_prefix", ""); | ||
110 | if (enabled) | 114 | if (enabled) |
111 | { | 115 | { |
112 | m_log.Warn("[OGP]: Open Grid Protocol is on, Listening for Clients on /agent/"); | 116 | m_log.Warn("[OGP]: Open Grid Protocol is on, Listening for Clients on /agent/"); |
@@ -235,6 +239,9 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
235 | string FirstName = requestMap["first_name"].AsString(); | 239 | string FirstName = requestMap["first_name"].AsString(); |
236 | string LastName = requestMap["last_name"].AsString(); | 240 | string LastName = requestMap["last_name"].AsString(); |
237 | 241 | ||
242 | FirstName = FirstNamePrefix + FirstName; | ||
243 | LastName = LastName + LastNameSuffix; | ||
244 | |||
238 | OGPState userState = GetOGPState(LocalAgentID); | 245 | OGPState userState = GetOGPState(LocalAgentID); |
239 | 246 | ||
240 | userState.first_name = requestMap["first_name"].AsString(); | 247 | userState.first_name = requestMap["first_name"].AsString(); |