aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorDiva Canto2009-08-17 15:28:16 -0700
committerDiva Canto2009-08-17 15:28:16 -0700
commitd7aa622050637541840a07fd6192a79915d1bc72 (patch)
tree7913af77e553511cda7d5cc94ae202d2e981972c /OpenSim/Region/CoreModules/Avatar
parentCommented out one IAR test, because it's failing and needs attention from jus... (diff)
parentDid I say that i don't like git? Remove some stuff that shouldn't have (diff)
downloadopensim-SC_OLD-d7aa622050637541840a07fd6192a79915d1bc72.zip
opensim-SC_OLD-d7aa622050637541840a07fd6192a79915d1bc72.tar.gz
opensim-SC_OLD-d7aa622050637541840a07fd6192a79915d1bc72.tar.bz2
opensim-SC_OLD-d7aa622050637541840a07fd6192a79915d1bc72.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs13
1 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 2426393..fcc2673 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
48 private int m_saydistance = 30; 48 private int m_saydistance = 30;
49 private int m_shoutdistance = 100; 49 private int m_shoutdistance = 100;
50 private int m_whisperdistance = 10; 50 private int m_whisperdistance = 10;
51 private string m_adminprefix = String.Empty;
52 private List<Scene> m_scenes = new List<Scene>(); 51 private List<Scene> m_scenes = new List<Scene>();
53 52
54 internal object m_syncy = new object(); 53 internal object m_syncy = new object();
@@ -77,7 +76,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
77 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); 76 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
78 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); 77 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
79 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); 78 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
80 m_adminprefix = config.Configs["Chat"].GetString("admin_prefix", m_adminprefix);
81 } 79 }
82 80
83 public virtual void AddRegion(Scene scene) 81 public virtual void AddRegion(Scene scene)
@@ -209,8 +207,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
209 fromPos = avatar.AbsolutePosition; 207 fromPos = avatar.AbsolutePosition;
210 fromName = avatar.Name; 208 fromName = avatar.Name;
211 fromID = c.Sender.AgentId; 209 fromID = c.Sender.AgentId;
212 if (avatar.GodLevel > 100)
213 fromName = m_adminprefix + fromName;
214 210
215 break; 211 break;
216 212
@@ -259,23 +255,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
259 string fromName = c.From; 255 string fromName = c.From;
260 256
261 UUID fromID = UUID.Zero; 257 UUID fromID = UUID.Zero;
262 UUID ownerID = UUID.Zero;
263 ChatSourceType sourceType = ChatSourceType.Object; 258 ChatSourceType sourceType = ChatSourceType.Object;
264 if (null != c.Sender) 259 if (null != c.Sender)
265 { 260 {
266 ScenePresence avatar = (c.Scene as Scene).GetScenePresence(c.Sender.AgentId); 261 ScenePresence avatar = (c.Scene as Scene).GetScenePresence(c.Sender.AgentId);
267 fromID = c.Sender.AgentId; 262 fromID = c.Sender.AgentId;
268 ownerID = c.Sender.AgentId;
269 fromName = avatar.Name; 263 fromName = avatar.Name;
270 sourceType = ChatSourceType.Agent; 264 sourceType = ChatSourceType.Agent;
271 } 265 }
272 if (c.SenderObject != null)
273 {
274 SceneObjectPart senderObject = (SceneObjectPart)c.SenderObject;
275 fromID = senderObject.UUID;
276 ownerID = senderObject.OwnerID;
277 fromName = senderObject.Name;
278 }
279 266
280 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); 267 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
281 268